Changeset 364 for soft/giet_vm

Timestamp:

Jul 23, 2014, 11:02:57 AM (10 years ago)

Author:

alain

Message:

Increase the size of the "reserved" section in the disk image
from 256 Kbytes to 1 Mbytes. This section contains the boot record,
and the boot.elf file (starting at lba = 2).

Location:

soft/giet_vm

Files:

• Makefile (modified) (7 diffs)
• create_dmg (modified) (1 diff)
• giet_config.h (modified) (2 diffs)

soft/giet_vm/Makefile

@@ -8 +8 @@
 
 ARCH ?= ../tsar-trunk-svn-2013/platforms/tsar_generic_iob
-X    ?= 4
-Y    ?= 4
-P    ?= 4
+X    ?= 2
+Y    ?= 2
+P    ?= 2
 APP  ?= convol
 
@@ -119 +119 @@
                build/libs/barrier.o
 
-                           CFLAGS = -Wall -ffreestanding -mno-gpopt -mips32 -g
+CFLAGS = -Wall -ffreestanding -mno-gpopt -mips32 -g -O2
 
 GIET_INCLUDE = -Igiet_boot    \
@@ -136 +136 @@
 DISK_IMAGE  := hdd/virt_hdd.dmg
 
-### Copy executable and miscellaneous files into disk image
-### Copy bootloader into sector 2 of disk image
 all: map.bin                         \
      hard_config.h                   \
@@ -154 +152 @@
      $(DISK_IMAGE)                   
          
+### Copy always all files into disk image
         mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/build/kernel
         mcopy -o -i $(DISK_IMAGE) build/display/display.elf ::/build/display
@@ -167 +166 @@
         mcopy -o -i $(DISK_IMAGE) convol/philips_image.raw ::/misc
         mcopy -o -i $(DISK_IMAGE) map.bin ::/
+### Copy bootloader into sector 2 of disk image
         dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
-
-### Disk image generation
+### Checking root directory
+        mdir -i $(DISK_IMAGE) ::/
+
+### Disk image generation (no files in this step)
 ### This requires the generic LINUX/MacOS script "create_dmg" script 
 ### written by C.Fuguet. (should be installed in GIET-VM root directory).
@@ -476 +478 @@
 
 build/convol/main.o: convol/main.c
-        $(CC) $(USER_INCLUDE) $(CFLAGS)  -c -o $@ $<
+        $(CC) $(USER_INCLUDE) $(CFLAGS) -O0 -c -o $@ $<
 
 ### clean 
@@ -498 +500 @@
         rm -rf build/transpose/*
         rm -rf build/convol/*
-
-distclean: clean
         rm -rf hdd/virt_hdd.dmg

soft/giet_vm/create_dmg

@@ -6 +6 @@
 sector_size=512
 sectors_per_cluster=8
-reserved_sectors=512
+reserved_sectors=2048
 
 # FAT32 SPEC: The first two clusters are not present in the data region but

soft/giet_vm/giet_config.h

@@ -15 +15 @@
 /* Debug parameters */
 
-#define BOOT_DEBUG_MAPPING       0                      /* trace map_info checking */
-#define BOOT_DEBUG_PT                0                  /* trace page tables initialisation */
-#define BOOT_DEBUG_VOBJS             0                  /* trace vobjs initialisation */
-#define BOOT_DEBUG_SCHED             0                  /* trace schedulers initialisation */
-#define BOOT_DEBUG_PERI          0                      /* trace peripherals initialisation */
+#define BOOT_DEBUG_MAPPING       0          /* trace map_info checking */
+#define BOOT_DEBUG_PT                0          /* trace page tables initialisation */
+#define BOOT_DEBUG_VOBJS             0          /* trace vobjs initialisation */
+#define BOOT_DEBUG_SCHED             0          /* trace schedulers initialisation */
+#define BOOT_DEBUG_PERI          0          /* trace peripherals initialisation */
 #define BOOT_DEBUG_ELF           0          /* trace .elf files loading */
 
-#define GIET_DEBUG_INIT              0                  /* trace kernel initialisation */
-#define GIET_DEBUG_FAT           0          /* trace fat accesses */ 
-#define GIET_DEBUG_SWITCH            0          /* trace context switchs  */
-#define GIET_DEBUG_IRQS          0              /* trace interrupts */
+#define GIET_DEBUG_INIT              0          /* trace kernel initialisation */
+#define GIET_DEBUG_FAT           2          /* trace fat accesses */ 
+#define GIET_DEBUG_SWITCH            0          /* trace context switchs  */
+#define GIET_DEBUG_IRQS          0          /* trace interrupts */
 #define GIET_DEBUG_IOC_DRIVER    0          /* trace IOC accesses */
 #define GIET_DEBUG_TTY_DRIVER    0          /* trace TTY accesses */
@@ -35 +35 @@
 /* software parameters */
 
+#define GIET_ELF_BUFFER_SIZE     0x60000    /* Temporary buffer for .elf files */
 #define GIET_IDLE_TASK_PERIOD    0xFFFFFFFF /* Idle Task message period */
 #define GIET_MAX_ELF_FILES       20         /* max .elf files loaded by boot-loader */
 #define GIET_OPEN_FILES_MAX      16         /* max simultaneously open files */
-#define GIET_NB_VSPACE_MAX           64                 /* max number of virtual spaces */
+#define GIET_NB_VSPACE_MAX           64         /* max number of virtual spaces */
 #define GIET_TICK_VALUE          0x00008000 /* context switch period (number of cycles) */
 #define GIET_USE_IOMMU           0          /* IOMMU activated when non zero */