Changeset 215 for soft/giet_vm/giet_config.h

Timestamp:

Sep 17, 2012, 10:47:46 AM (12 years ago)

Author:

karaoui

Message:

New components are now mandotory in the XML description:

• Timer/Icu? or Xicu
• Dma

The files giet_vsegs.ld and hard_config.h are now autogenerated by the xml2bin tool.

File:

• soft/giet_vm/giet_config.h (modified) (2 diffs)

soft/giet_vm/giet_config.h

@@ -10 +10 @@
 #define _CONFIG_H
 
+/* hardware parameters */
+#include "hard_config.h"
+
+
 /* Debug parameters */
 
@@ -15 +19 @@
 #define BOOT_DEBUG_PT           0                       /* trace page tables initialisation on TTY0 */
 #define BOOT_DEBUG_VOBJS        0                       /* trace vobjs initialisation on TTY0 */
-#define BOOT_DEBUG_SCHED        0                       /* trace schedulers initialisation on TTY0 */
+#define BOOT_DEBUG_SCHED        1                       /* trace schedulers initialisation on TTY0 */
 
 #define GIET_DEBUG_INIT         0                       /* trace parallel kernel initialisation on TTY0 */
 #define GIET_DEBUG_SWITCH       0                       /* trace context switchs on TTY0 */
 
-
 #define CONFIG_SRL_VERBOSITY TRACE 
-
-/* hardware parameters */
-
-#define NB_CLUSTERS             4                       /* number of clusters */
-#define CLUSTER_SIZE            0x40000000      /* address increment between clusters */
-#define CLUSTER_IO_ID       2                   /* cluster containing non replicated peripherals */
-        
-#define NB_PROCS_MAX        1                   /* max number of processors per cluster */
-#define NB_TIMERS_MAX           0                       /* max number of user timers per cluster */
-#define NB_DMAS_MAX                     1                       /* max number of DMA channels per cluster*/
-#define NB_TTYS                         8                       /* total number of TTY channels */
-#define NB_IOCS                         1                       /* total number of IOC channels */
-#define NB_NICS                         8                       /* total number of NIC channels */
 
 /* software parameters */
 
-#define GIET_NB_VSPACE_MAX      4                       /* max number of virtual spaces */
+#define GIET_NB_VSPACE_MAX      64                      /* max number of virtual spaces */
 #define GIET_TICK_VALUE     0x4000              /* context switch period (number of cycles) */
-#define GIET_IOMMU_ACTIVE   0                   /* The IOMMU vspace is defined */
-#define GIET_USE_XICU       1                   /* Use the XICU interrupt controler */
 
 #endif