Changeset 366 for soft/giet_vm/Makefile

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

File:

• soft/giet_vm/Makefile (modified) (4 diffs)

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)