Changeset 249 for soft/giet_vm/boot

Timestamp:

Jul 18, 2013, 6:33:38 PM (11 years ago)

Author:

alain

Message:

Various modifications to support IO Bridge,
and MEMC configuration interface.

Location:

soft/giet_vm/boot

Files:

• boot_init.c (modified) (4 diffs)
• reset.S (modified) (1 diff)

soft/giet_vm/boot/boot_init.c

@@ -109 +109 @@
 { [0 ... GIET_NB_VSPACE_MAX - 1] = 0 };
 
+// lock protecting TTY0
+__attribute__((section (".wdata"))) 
+unsigned int boot_tty0_lock = 0;
+
 
 //////////////////////////////////////////////////////////////////////////////
@@ -504 +508 @@
             boot_puts("\n[BOOT ERROR] in boot_add_pte() function\n");
             boot_puts("the length of the ptab vobj is too small\n");
+
+            boot_puts(" max_pt2 = ");
+            boot_putd( max_pt2 );
+            boot_puts("\n");
+            boot_puts(" pt2_id  = ");
+            boot_putd( pt2_id );
+            boot_puts("\n");
+            
             boot_exit();
         }
@@ -899 +911 @@
             if (periph[periph_id].type == PERIPH_TYPE_DMA) 
             {
-                if (periph[periph_id].channels != NB_DMA_CHANNELS) 
+                if (periph[periph_id].channels > NB_DMA_CHANNELS) 
                 {
                     boot_puts("\n[BOOT ERROR] Too much DMA channels in cluster ");
@@ -1328 +1340 @@
                 break;
                 case PERIPH_TYPE_IOB:    // vci_io_bridge component
-                    if (IOMMU_ACTIVE) 
+                    if (USE_IOB) 
                     {
                         // TODO

soft/giet_vm/boot/reset.S

@@ -220 +220 @@
 boot_lf_string:         .asciiz "\n"
 
-boot_tty0_lock:         .word   0
-
         .set    reorder