Index: /soft/giet_vm/Makefile
===================================================================
--- /soft/giet_vm/Makefile	(revision 444)
+++ /soft/giet_vm/Makefile	(revision 445)
@@ -26,7 +26,5 @@
 DRIVERS_OBJS = build/drivers/dma_driver.o \
                build/drivers/cma_driver.o \
-               build/drivers/fbf_driver.o \
                build/drivers/xcu_driver.o \
-               build/drivers/icu_driver.o \
                build/drivers/ioc_driver.o \
                build/drivers/bdv_driver.o \
@@ -44,13 +42,14 @@
 
 ### Objects to be linked for kernel.elf
-KERNEL_OBJS  = build/common/utils.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 \
+KERNEL_OBJS  = build/common/utils.o        \
+               build/kernel/kernel_utils.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/kernel/kernel_init.o
 
@@ -218,18 +217,6 @@
 	$(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
-build/drivers/fbf_driver.o: giet_drivers/fbf_driver.c  \
-                            giet_drivers/fbf_driver.h  \
-                            hard_config.h              \
-                            giet_config.h
-	$(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
-
 build/drivers/xcu_driver.o: giet_drivers/xcu_driver.c  \
                             giet_drivers/xcu_driver.h  \
-                            hard_config.h              \
-                            giet_config.h
-	$(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
-
-build/drivers/icu_driver.o: giet_drivers/icu_driver.c  \
-                            giet_drivers/icu_driver.h  \
                             hard_config.h              \
                             giet_config.h
@@ -441,5 +428,5 @@
 	$(DU) -D $@ > $@.txt
 
-build/display/main.o: applications/display/main_cma.c
+build/display/main.o: applications/display/main.c
 	$(CC) $(USER_INCLUDE) $(CFLAGS)  -c -o $@ $<
 
Index: /soft/giet_vm/giet_config.h
===================================================================
--- /soft/giet_vm/giet_config.h	(revision 444)
+++ /soft/giet_vm/giet_config.h	(revision 445)
@@ -30,5 +30,5 @@
 #define GIET_DEBUG_TTY_DRIVER    0          /* trace TTY accesses */
 #define GIET_DEBUG_DMA_DRIVER    0          /* trace DMA accesses */
-#define GIET_DEBUG_FBF_DRIVER    0          /* trace FBF accesses */
+#define GIET_DEBUG_FBF_CMA       0          /* trace FBF_CMA accesses */
 #define GIET_DEBUG_MALLOC        0          /* trace remote_malloc library */
 #define GIET_DEBUG_BARRIER       0          /* trace barrier library */
@@ -45,4 +45,5 @@
 #define GIET_USE_IOMMU           0          /* IOMMU activated when non zero */
 #define GIET_NO_HARD_CC          0          /* No hard cache coherence when non zero */
+#define GIET_CHBUF_NBUFS         16         /* Number of buffer in a kernel chained buffer */
 
 #endif