Changeset 611 for soft

Timestamp:

Jul 14, 2015, 5:29:05 PM (9 years ago)

Author:

alain

Message:

Rename the "build" directory to "bin" on the virtual disk.

File:

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

soft/giet_vm/Makefile

@@ -10 +10 @@
 
 # Defaults values for hardware parameters and applications
-# These parameters should be defined in the build.mk file
+# These parameters should be defined in the params.mk file
 ARCH      ?= pathname
 X_SIZE    ?= 1
@@ -18 +18 @@
 FBF_WIDTH ?= 256
 IOC_TYPE  ?= BDV
-APPLIS    ?= classif
+APPLIS    ?= shell
 
 # build the list of applications used as argument by genmap
@@ -176 +176 @@
         rm -rf build/boot/*
         rm -rf build/libs/*
-        $(MAKE) -C applications/classif     clean
-        $(MAKE) -C applications/convol      clean
-        $(MAKE) -C applications/coproc      clean
-        $(MAKE) -C applications/display     clean
-        $(MAKE) -C applications/dhrystone   clean
-        $(MAKE) -C applications/gameoflife  clean
-        cd applications/ocean && $(MAKE) clean && cd ../..
-        $(MAKE) -C applications/router      clean
-        $(MAKE) -C applications/shell       clean
-        $(MAKE) -C applications/sort        clean
-        $(MAKE) -C applications/transpose   clean
+        cd applications/classif      && $(MAKE) clean && cd ../..
+        cd applications/convol       && $(MAKE) clean && cd ../..
+        cd applications/coproc       && $(MAKE) clean && cd ../..
+        cd applications/display      && $(MAKE) clean && cd ../..
+        cd applications/dhrystone    && $(MAKE) clean && cd ../..
+        cd applications/gameoflife   && $(MAKE) clean && cd ../..
+        cd applications/ocean        && $(MAKE) clean && cd ../..
+        cd applications/router       && $(MAKE) clean && cd ../..
+        cd applications/shell        && $(MAKE) clean && cd ../..
+        cd applications/sort         && $(MAKE) clean && cd ../..
+        cd applications/transpose    && $(MAKE) clean && cd ../..
 
 ########################################
@@ -198 +198 @@
 ### store the images files into misc
 install-disk: $(DISK_IMAGE) build/kernel/kernel.elf $(APPLIS_ELF)
-        mmd -o -i $< ::/build               || true
-        mmd -o -i $< ::/build/kernel        || true
-        mmd -o -i $< ::/build/classif       || true
-        mmd -o -i $< ::/build/convol        || true
-        mmd -o -i $< ::/build/coproc        || true
-        mmd -o -i $< ::/build/dhrystone     || true
-        mmd -o -i $< ::/build/display       || true
-        mmd -o -i $< ::/build/gameoflife    || true
-        mmd -o -i $< ::/build/ocean         || true
-        mmd -o -i $< ::/build/router        || true
-        mmd -o -i $< ::/build/shell         || true
-        mmd -o -i $< ::/build/sort          || true
-        mmd -o -i $< ::/build/transpose     || true
-        mmd -o -i $< ::/misc                || true
-        mmd -o -i $< ::/home                || true
+        mmd -o -i $< ::/bin               || true
+        mmd -o -i $< ::/bin/kernel        || true
+        mmd -o -i $< ::/bin/classif       || true
+        mmd -o -i $< ::/bin/convol        || true
+        mmd -o -i $< ::/bin/coproc        || true
+        mmd -o -i $< ::/bin/dhrystone     || true
+        mmd -o -i $< ::/bin/display       || true
+        mmd -o -i $< ::/bin/gameoflife    || true
+        mmd -o -i $< ::/bin/ocean         || true
+        mmd -o -i $< ::/bin/router        || true
+        mmd -o -i $< ::/bin/shell         || true
+        mmd -o -i $< ::/bin/sort          || true
+        mmd -o -i $< ::/bin/transpose     || true
+        mmd -o -i $< ::/misc              || true
+        mmd -o -i $< ::/home              || true
         mcopy -o -i $< map.bin ::/
-        mcopy -o -i $< build/kernel/kernel.elf ::/build/kernel
-        mcopy -o -i $< applications/classif/appli.elf ::/build/classif          || true
-        mcopy -o -i $< applications/convol/appli.elf ::/build/convol            || true
-        mcopy -o -i $< applications/coproc/appli.elf ::/build/coproc            || true
-        mcopy -o -i $< applications/dhrystone/appli.elf ::/build/dhrystone      || true
-        mcopy -o -i $< applications/display/appli.elf ::/build/display          || true
-        mcopy -o -i $< applications/gameoflife/appli.elf ::/build/gameoflife    || true
-        mcopy -o -i $< applications/ocean/appli.elf ::/build/ocean              || true
-        mcopy -o -i $< applications/router/appli.elf ::/build/router            || true
-        mcopy -o -i $< applications/shell/appli.elf ::/build/shell              || true
-        mcopy -o -i $< applications/sort/appli.elf ::/build/sort                || true
-        mcopy -o -i $< applications/transpose/appli.elf ::/build/transpose      || true
+        mcopy -o -i $< build/kernel/kernel.elf ::/bin/kernel
+        mcopy -o -i $< applications/classif/appli.elf ::/bin/classif          || true
+        mcopy -o -i $< applications/convol/appli.elf ::/bin/convol            || true
+        mcopy -o -i $< applications/coproc/appli.elf ::/bin/coproc            || true
+        mcopy -o -i $< applications/dhrystone/appli.elf ::/bin/dhrystone      || true
+        mcopy -o -i $< applications/display/appli.elf ::/bin/display          || true
+        mcopy -o -i $< applications/gameoflife/appli.elf ::/bin/gameoflife    || true
+        mcopy -o -i $< applications/ocean/appli.elf ::/bin/ocean              || true
+        mcopy -o -i $< applications/router/appli.elf ::/bin/router            || true
+        mcopy -o -i $< applications/shell/appli.elf ::/bin/shell              || true
+        mcopy -o -i $< applications/sort/appli.elf ::/bin/sort                || true
+        mcopy -o -i $< applications/transpose/appli.elf ::/bin/transpose      || true
         mcopy -o -i $< images/images_128.raw ::/misc
         mcopy -o -i $< images/philips_1024.raw ::/misc