Changeset 482 for soft/giet_vm/Makefile

Timestamp:

Jan 1, 2015, 8:35:26 PM (9 years ago)

Author:

alain

Message:

The GIET_NIC_BUFSIZE, GIET_NIC_NBUFS, and GIET_NIC_TIMEOUT have been removed from the hiet_config.h file.

File:

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

soft/giet_vm/Makefile

@@ -10 +10 @@
 # Parameters definition
 ARCH      ?= ../tsar-trunk-svn-2013/platforms/tsar_generic_iob
-X_SIZE    ?= 1
-Y_SIZE    ?= 1
-NB_PROCS  ?= 4
+X_SIZE    ?= 8
+Y_SIZE    ?= 4
+NB_PROCS  ?= 2
 NB_TTYS   ?= 1
 FBF_WIDTH ?= 128
@@ -44 +44 @@
 
 ### Objects to be linked for kernel.elf
-KERNEL_OBJS  = build/common/utils.o        \
-               build/common/locks.o        \
+KERNEL_OBJS  = build/common/utils.o         \
+               build/common/locks.o         \
                build/common/tty0.o          \
-               build/common/vmem.o         \
-               build/fat32/fat32.o         \
-               build/kernel/giet.o         \
-               build/kernel/switch.o       \
-               build/kernel/ctx_handler.o  \
-               build/kernel/exc_handler.o  \
-               build/kernel/sys_handler.o  \
-               build/kernel/irq_handler.o  \
+               build/common/vmem.o          \
+               build/common/kernel_malloc.o \
+               build/fat32/fat32.o          \
+               build/kernel/giet.o          \
+               build/kernel/switch.o        \
+               build/kernel/ctx_handler.o   \
+               build/kernel/exc_handler.o   \
+               build/kernel/sys_handler.o   \
+               build/kernel/irq_handler.o   \
                build/kernel/kernel_init.o
 
 ### Objects to be linked for boot.elf
-BOOT_OBJS    = build/common/utils.o        \
-               build/common/locks.o        \
+BOOT_OBJS    = build/common/utils.o         \
+               build/common/locks.o         \
                build/common/tty0.o          \
-               build/common/pmem.o         \
-               build/common/vmem.o         \
-               build/fat32/fat32.o         \
-               build/kernel/ctx_handler.o  \
-               build/kernel/switch.o       \
-               build/boot/boot.o           \
+               build/common/pmem.o          \
+               build/common/vmem.o          \
+               build/common/kernel_malloc.o \
+               build/fat32/fat32.o          \
+               build/kernel/ctx_handler.o   \
+               build/kernel/switch.o        \
+               build/boot/boot.o            \
                build/boot/boot_entry.o
 
@@ -363 +365 @@
         $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
+build/common/kernel_malloc.o: giet_common/kernel_malloc.c \
+                     giet_common/kernel_malloc.h \
+                     hard_config.h      \
+                     giet_config.h
+        $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
+
 ########################
 ### boot compilation