Changeset 304

Timestamp:

Apr 16, 2014, 3:14:32 PM (11 years ago)

Author:

alain

Message:

Improving Makefile to avoid systematic disk image creation
and to limit the disk image to 32 Mbytes.

File:

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

soft/giet_vm/Makefile

@@ -13 +13 @@
 ### partition sectors    = 524832 
 
-MAP_XML     ?= mappings/4c_1p_sort_leti.xml
+MAP_XML     ?= mappings/tsar_leti_2_2_4_sort.xml
 
 ### Objects to be linked for kernel.elf
@@ -144 +144 @@
      build/transpose/transpose.elf   \
          
-        mcopy -so -i $(DISK_IMAGE) build ::/
-        mcopy -so -i $(DISK_IMAGE) hdd/misc ::/
-        mcopy -so -i $(DISK_IMAGE) map.bin ::/
+        mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/build/kernel
+        mcopy -o -i $(DISK_IMAGE) build/display/display.elf ::/build/display
+        mcopy -o -i $(DISK_IMAGE) build/sort/sort.elf ::/build/sort
+        mcopy -o -i $(DISK_IMAGE) build/transpose/transpose.elf ::/build/transpose
+        mcopy -o -i $(DISK_IMAGE) build/hello/hello.elf ::/build/hello
+        mcopy -o -i $(DISK_IMAGE) build/pgcd/pgcd.elf ::/build/pgcd
+        mcopy -o -i $(DISK_IMAGE) build/router/router.elf ::/build/router
+        mcopy -o -i $(DISK_IMAGE) build/gameoflife/gameoflife.elf ::/build/gameoflife
+        mcopy -o -i $(DISK_IMAGE) build/dhrystone/dhrystone.elf ::/build/dhrystone
+        mcopy -o -i $(DISK_IMAGE) map.bin ::/
         dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
 
@@ -154 +161 @@
 $(DISK_IMAGE):
         ./create_dmg create $(basename $(DISK_IMAGE))
+        mmd -o -i $(DISK_IMAGE) ::/build
+        mmd -o -i $(DISK_IMAGE) ::/build/kernel
+        mmd -o -i $(DISK_IMAGE) ::/build/display
+        mmd -o -i $(DISK_IMAGE) ::/build/sort  
+        mmd -o -i $(DISK_IMAGE) ::/build/transpose
+        mmd -o -i $(DISK_IMAGE) ::/build/hello 
+        mmd -o -i $(DISK_IMAGE) ::/build/pgcd  
+        mmd -o -i $(DISK_IMAGE) ::/build/router
+        mmd -o -i $(DISK_IMAGE) ::/build/gameoflife
+        mmd -o -i $(DISK_IMAGE) ::/build/dhrystone
+        mmd -o -i $(DISK_IMAGE) ::/misc
+        dd if=$(DISK_IMAGE) of=temp.dmg count=65536
+        mv temp.dmg $(DISK_IMAGE)
 
 ### mapping compilation