Changeset 366 for soft/giet_vm

Timestamp:

Jul 23, 2014, 4:16:05 PM (10 years ago)

Author:

cfuguet

Message:

giet_boot: using boot_entry instead of boot_init as entry point

Location:

soft/giet_vm

Files:

• Makefile (modified) (4 diffs)
• giet_boot/boot.c (modified) (2 diffs)
• giet_boot/boot.ld (modified) (1 diff)
• giet_boot/boot_entry.S (moved) (moved from soft/giet_vm/giet_boot/boot.S) (1 diff)

soft/giet_vm/Makefile

@@ -69 +69 @@
                build/kernel/ctx_handler.o \
                build/kernel/switch.o      \
-               build/boot/boot.o 
+               build/boot/boot.o          \
+               build/boot/boot_entry.o
 
 ### Objects to be linked for display.elf
@@ -169 +170 @@
         dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
 ### Checking root directory
-        mdir -i $(DISK_IMAGE) ::/
+        mdir -/ -b -i $(DISK_IMAGE) ::/
 
 ### Disk image generation (no files in this step)
@@ -338 +339 @@
                    giet_drivers/ioc_driver.h \
                    hard_config.h             \
-                   giet_config.h             
+                   giet_config.h
+        $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
+
+build/boot/boot_entry.o: giet_boot/boot_entry.S \
+                         hard_config.h
         $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
@@ -500 +505 @@
         rm -rf build/transpose/*
         rm -rf build/convol/*
-        rm -rf hdd/virt_hdd.dmg
+        rm -rf $(DISK_IMAGE)

soft/giet_vm/giet_boot/boot.c

@@ -132 +132 @@
 ////////////////////////////////////////////////////////////////////////////
 
+extern void boot_entry();
+
 // This global variable is allocated in "fat32.c" file
 extern fat32_fs_t fat;
@@ -2510 +2512 @@
                 if ( (nprocs > 0) && ((clusterid != 0) || (p != 0)) )
                 {
-                    _xcu_send_wti( cluster_xy, p, (unsigned int)boot_init );
+                    _xcu_send_wti( cluster_xy, p, (unsigned int)boot_entry );
                 }
             }

soft/giet_vm/giet_boot/boot.ld

@@ -12 +12 @@
 /****************************************************************************/
 
-ENTRY(boot_init)
+ENTRY(boot_entry)
 
 /****************************************************************************/

soft/giet_vm/giet_boot/boot_entry.S

@@ -45 +45 @@
     /* (proc_id is a "continuous" index, while proc_xyl is a "fixed format" index */
 
-    mfc0   k0,      CP0_EBASE
+    mfc0   k0,      CP0_PROCID
     andi   k0,      k0,     0x3FF   /* k0 <= proc_xyl                             */
     la     t7,      NB_PROCS_MAX    /* t7 <= NBPROCS                              */