Changeset 302 for soft/giet_vm/Makefile

Timestamp:

Apr 14, 2014, 6:47:07 PM (11 years ago)

Author:

cfuguet

Message:

Optimization in disk image generation

When disk image exists, we dont need to recreate it, we only
copy new files in it

File:

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

soft/giet_vm/Makefile

@@ +1 @@
+-include build.mk
+
 export # export all variable to sub-Makefile
 CC = mipsel-unknown-elf-gcc
@@ -11 +13 @@
 ### partition sectors    = 524832 
 
-MAP_XML     ?= mappings/4c_1p_iob_sort.xml
+MAP_XML     ?= mappings/4c_1p_sort_leti.xml
 
 ### Objects to be linked for kernel.elf
@@ -123 +125 @@
                -I.
 
-all: map.bin                         \
+DISK_IMAGE  := hdd/virt_hdd.dmg
+
+### Copy executable and miscellaneous files into disk image
+### Copy bootloader into sector 2 of disk image
+all: $(DISK_IMAGE)                   \
+     $(MAP_XML)                      \
+     giet_config.h                   \
+     map.bin                         \
      build/boot/boot.elf             \
      build/kernel/kernel.elf         \
      build/display/display.elf       \
-     build/router/router.elf         \
      build/hello/hello.elf           \
      build/pgcd/pgcd.elf             \
+     build/router/router.elf         \
      build/dhrystone/dhrystone.elf   \
      build/gameoflife/gameoflife.elf \
      build/sort/sort.elf             \
      build/transpose/transpose.elf   \
-     hdd/virt_hdd.dmg
+         
+        mcopy -so -i $(DISK_IMAGE) build ::/
+        mcopy -so -i $(DISK_IMAGE) hdd/misc ::/
+        mcopy -so -i $(DISK_IMAGE) map.bin ::/
+        dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
 
 ### Disk image generation
 ### This requires the generic LINUX/MacOS script "create_dmg" script 
 ### written by C.Fuguet. (should be installed in GIET-VM root directory).
-hdd/virt_hdd.dmg: map.bin                \
-         build/boot/boot.elf             \
-         build/kernel/kernel.elf         \
-         build/display/display.elf       \
-         build/hello/hello.elf           \
-         build/pgcd/pgcd.elf             \
-         build/router/router.elf         \
-         build/dhrystone/dhrystone.elf   \
-         build/gameoflife/gameoflife.elf \
-         build/sort/sort.elf             \
-         build/transpose/transpose.elf 
-
-### remove all content of virtual disk virt_hdd
-        rm -rf hdd/virt_hdd/*
-### copy content to virtual disk from build, misc and map.bin
-### the boot.elf file is not copied on the virtual disk
-        cp -r build hdd/virt_hdd
-        rm -rf hdd/virt_hdd/build/boot
-        cp -r hdd/misc hdd/virt_hdd
-        cp map.bin  hdd/virt_hdd
-### create temporary partition image
-        ./create_dmg create hdd/virt_hdd $(basename $@)
-### copy boot.elf into virtual disk image (sector 2)
-        dd if=build/boot/boot.elf of=$@ seek=2 conv=notrunc
+$(DISK_IMAGE):
+        ./create_dmg create $(basename $(DISK_IMAGE))
 
 ### mapping compilation
@@ -455 +446 @@
         rm -rf build/transpose/*
         rm -rf build/map.bin
-        rm -rf hdd/virt_hdd/*
+
+distclean: clean
         rm -rf hdd/virt_hdd.dmg