Changeset 582 for soft

Timestamp:

Jul 2, 2015, 2:05:40 PM (9 years ago)

Author:

cfuguet

Message:

Export the MTOOLS_SKIP_CHECK variable to avoid that the mtools perform
sanity checks regarding the compatibility with MS-DOS.

File:

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

soft/giet_vm/Makefile

@@ -26 +26 @@
 ### partition_begin_lba  = 300
 ### sector_per_cluster   = 8
-### partition sectors    = 524832 
+### partition sectors    = 524832
 
 BUILD_DIRS = boot      \
@@ -119 +119 @@
                build/libs/mwmr_channel.o  \
                build/libs/user_lock.o     \
-               build/libs/stdio.o 
+               build/libs/stdio.o
 
 ### Objects to be linked for hello.elf
 HELLO_OBJS   = build/hello/main.o   \
-               build/libs/stdio.o         
+               build/libs/stdio.o
 
 ### Objects to be linked for pgcd.elf
 PGCD_OBJS    = build/pgcd/main.o \
-               build/libs/stdio.o 
+               build/libs/stdio.o
 
 ### Objects to be linked for game.elf
@@ -135 +135 @@
                   build/libs/malloc.o       \
                   build/libs/user_lock.o
-                 
 
 ### Objects to be linked for dhrystone.elf
@@ -145 +144 @@
                  build/libs/user_lock.o   \
                  build/libs/malloc.o
-        
+
 ### Objects to be linked for sort.elf
 SORT_OBJS   = build/sort/main.o          \
@@ -174 +173 @@
                 build/libs/user_barrier.o \
                 build/libs/malloc.o       \
-                build/libs/user_lock.o 
+                build/libs/user_lock.o
 
 ### Objects to be linked for coproc.elf
 COPROC_OBJS = build/coproc/main.o \
-              build/libs/stdio.o 
+              build/libs/stdio.o
 
 
@@ -189 +188 @@
               build/libs/user_barrier.o \
               build/libs/libmath.a
-              
 
 CFLAGS = -Wall -ffreestanding -mno-gpopt -mips32 -g -O2 \
@@ -208 +206 @@
 
 DISK_IMAGE  := hdd/virt_hdd.dmg
+
+### All the Mtools commands perform a few sanity checks before going ahead,
+### to make sure that the disk is indeed an MS-DOS disk. However, the size
+### of the disk image used by the Giet-VM is not MS-DOS compliant.
+### Setting this variable prevents these checks.
+MTOOLS_SKIP_CHECK := 1
 
 all: build                           \
@@ -226 +230 @@
      build/classif/classif.elf       \
      build/coproc/coproc.elf         \
-     build/ocean/ocean.elf           \
      $(DISK_IMAGE)
+#    build/ocean/ocean.elf           \
 ### Copy always all files into disk image
         mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/build/kernel
@@ -241 +245 @@
         mcopy -o -i $(DISK_IMAGE) build/classif/classif.elf ::/build/classif
         mcopy -o -i $(DISK_IMAGE) build/coproc/coproc.elf ::/build/coproc
-        mcopy -o -i $(DISK_IMAGE) build/ocean/ocean.elf ::/build/ocean
+#       mcopy -o -i $(DISK_IMAGE) build/ocean/ocean.elf ::/build/ocean
         mcopy -o -i $(DISK_IMAGE) applications/transpose/images.raw ::/misc
         mcopy -o -i $(DISK_IMAGE) applications/convol/philips_image.raw ::/misc
@@ -257 +261 @@
 
 ### Disk image generation (no files in this step)
-### This requires the generic LINUX/MacOS script "create_dmg" script 
+### This requires the generic LINUX/MacOS script "create_dmg" script
 ### written by C.Fuguet. (should be installed in GIET-VM root directory).
 ### create the three build / misc / home directories
-### store the images files into misc 
+### store the images files into misc
 $(DISK_IMAGE):
         ./create_dmg create $(basename $(DISK_IMAGE))
@@ -441 +445 @@
                      giet_boot/boot.ld       \
                      build/drivers/libdrivers.a | build/boot
-        $(LD) -o $@ -T giet_boot/boot.ld $(BOOT_OBJS) -Lbuild/drivers -ldrivers  
+        $(LD) -o $@ -T giet_boot/boot.ld $(BOOT_OBJS) -Lbuild/drivers -ldrivers
         $(DU) -D $@ > $@.txt
         dd if=$@ of=$(DISK_IMAGE) seek=2 conv=notrunc
@@ -463 +467 @@
                          giet_kernel/kernel.ld \
                          build/drivers/libdrivers.a
-        $(LD) -o $@ -T giet_kernel/kernel.ld $(KERNEL_OBJS) -Lbuild/drivers -ldrivers   
-        $(DU) -D $@ > $@.txt    
+        $(LD) -o $@ -T giet_kernel/kernel.ld $(KERNEL_OBJS) -Lbuild/drivers -ldrivers
+        $(DU) -D $@ > $@.txt
         mmd -o -i $(DISK_IMAGE) ::/build/kernel || true
 #       mcopy -o -i $(DISK_IMAGE) $@ ::/build/kernel
@@ -470 +474 @@
 build/kernel/%.o: giet_kernel/%.c    \
                   hard_config.h      \
-                  giet_config.h  
+                  giet_config.h
         $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
 build/kernel/%.o: giet_kernel/%.s    \
                   hard_config.h      \
-                  giet_config.h 
+                  giet_config.h
         $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
@@ -483 +487 @@
                     giet_libs/stdio.h \
                     hard_config.h     \
-                    giet_config.h  
+                    giet_config.h
         $(CC) $(CFLAGS) $(USER_INCLUDE) -c -o $@ $<
 
@@ -669 +673 @@
 
 ########################################
-### clean 
+### clean
 clean:
-        rm -f *.o *.elf *.bin *.txt core  
+        rm -f *.o *.elf *.bin *.txt core
         rm -f hard_config.h giet_vsegs.ld map.bin map.xml
         rm -rf build/
         cd applications/ocean && $(MAKE) clean
+
+clean-disk:
+        rm -f $(DISK_IMAGE)