Index: soft/giet_vm/map.xml
===================================================================
--- soft/giet_vm/map.xml	(revision 175)
+++ soft/giet_vm/map.xml	(revision 181)
@@ -11,45 +11,59 @@
 
         <clusterset>
-                <cluster index  = "0"
-                         procs  = "4" />
+                <cluster index  = "0" >
+                        <pseg    name   = "PSEG_ROM" 
+                                 type   = "ROM"
+                                 base   = "0xbfc00000" 
+                                 length = "0x00010000" />
+
+                        <pseg    name   = "PSEG_RAU" 
+                                 type   = "RAM"
+                                 base   = "0x00000000" 
+                                 length = "0x01000000" />
+
+                        <pseg    name   = "PSEG_RAK" 
+                                 type   = "RAM"
+                                 base   = "0x80000000" 
+                                 length = "0x00100000" />
+
+                        <pseg    name   = "PSEG_TTY"
+                                 type   = "PERI"
+                                 base   = "0x90000000" 
+                                 length = "0x00001000" />
+
+                        <pseg    name   = "PSEG_TIM" 
+                                 type   = "PERI"
+                                 base   = "0x91000000" 
+                                 length = "0x00001000" />
+
+                        <pseg    name   = "PSEG_IOC" 
+                                 type   = "PERI"
+                                 base   = "0x92000000" 
+                                 length = "0x00001000" />
+
+                        <pseg    name   = "PSEG_DMA" 
+                                 type   = "PERI"
+                                 base   = "0x93000000" 
+                                 length = "0x00001000" />
+
+                        <pseg    name   = "PSEG_FBF" 
+                                 type   = "PERI"
+                                 base   = "0x96000000" 
+                                 length = "0x00004000" />
+
+                        <pseg    name   = "PSEG_ICU" 
+                                 type   = "PERI"
+                                 base   = "0x9F000000" 
+                                 length = "0x00001000" />
+                         <proc    index  = "0" >
+                         </proc>
+                         <proc    index  = "1" >
+                         </proc>
+                         <proc    index  = "2" >
+                         </proc>
+                         <proc    index  = "3" >
+                         </proc>
+                </cluster>
         </clusterset>
-
-        <psegset>
-                <pseg    name   = "PSEG_ROM" 
-                         base   = "0xbfc00000" 
-                         length = "0x00010000" />
-
-                <pseg    name   = "PSEG_RAU" 
-                         base   = "0x00000000" 
-                         length = "0x01000000" />
-
-                <pseg    name   = "PSEG_RAK" 
-                         base   = "0x80000000" 
-                         length = "0x00100000" />
-
-                <pseg    name   = "PSEG_TTY"
-                         base   = "0x90000000" 
-                         length = "0x00001000" />
-
-                <pseg    name   = "PSEG_TIM" 
-                         base   = "0x91000000" 
-                         length = "0x00001000" />
-
-                <pseg    name   = "PSEG_IOC" 
-                         base   = "0x92000000" 
-                         length = "0x00001000" />
-
-                <pseg    name   = "PSEG_DMA" 
-                         base   = "0x93000000" 
-                         length = "0x00001000" />
-
-                <pseg    name   = "PSEG_FBF" 
-                         base   = "0x96000000" 
-                         length = "0x00004000" />
-
-                <pseg    name   = "PSEG_ICU" 
-                         base   = "0x9F000000" 
-                         length = "0x00001000" />
-        </psegset> 
 
         <globalset> 
@@ -57,4 +71,5 @@
                         vbase     = "0xbfc00000" 
                         mode      = "CX__" 
+						clusterid = "0"
                         psegname  = "PSEG_ROM" 
                         ident	  = "1" >
@@ -68,4 +83,5 @@
                         vbase     = "0xbfc08000" 
                         mode      = "C_W_"
+						clusterid = "0"
                         psegname  = "PSEG_ROM"
                         ident	  = "1" >
@@ -78,4 +94,5 @@
                         vbase     = "0xbfc0c000" 
                         mode      = "C_W_"
+						clusterid = "0"
                         psegname  = "PSEG_ROM"
                         ident	  = "1" >
@@ -89,4 +106,5 @@
                         vbase     = "0x80000000" 
                         mode      = "CX__" 
+						clusterid = "0"
                         psegname  = "PSEG_RAU"
                         ident	  = "0" >
@@ -101,4 +119,5 @@
                         vbase     = "0x80010000" 
                         mode      = "C_W_" 
+						clusterid = "0"
                         psegname  = "PSEG_RAU"
                         ident	  = "O" >
@@ -112,4 +131,5 @@
                         vbase     = "0x80080000" 
                         mode      = "__W_"
+						clusterid = "0"
                         psegname  = "PSEG_RAU"
                         ident	  = "0" >
@@ -123,4 +143,5 @@
                         vbase     = "0x80090000" 
                         mode      = "CX__"
+						clusterid = "0"
                         psegname  = "PSEG_RAU"
                         ident	  = "0" >
@@ -135,4 +156,5 @@
                         vbase     = "0x90000000" 
                         mode      = "__W_"
+						clusterid = "0"
                         psegname  = "PSEG_TTY"
                         ident	  = "1" >
@@ -145,4 +167,5 @@
                         vbase     = "0x91000000" 
                         mode      = "__W_"
+						clusterid = "0"
                         psegname  = "PSEG_TIM"
                         ident	  = "1" >
@@ -155,4 +178,5 @@
                         vbase     = "0x92000000" 
                         mode      = "__W_"
+						clusterid = "0"
                         psegname  = "PSEG_IOC"
                         ident	  = "1" >
@@ -165,4 +189,5 @@
                         vbase     = "0x93000000" 
                         mode      = "__W_"
+						clusterid = "0"
                         psegname  = "PSEG_DMA"
                         ident	  = "1" >
@@ -175,4 +200,5 @@
                         vbase     = "0x96000000" 
                         mode      = "__W_"
+						clusterid = "0"
                         psegname  = "PSEG_FBF"
                         ident	  = "1" >
@@ -185,4 +211,5 @@
                         vbase     = "0x9F000000" 
                         mode      = "__W_"
+						clusterid = "0"
                         psegname  = "PSEG_ICU"
                         ident	  = "1" >
@@ -200,4 +227,5 @@
                                 vbase     = "0x00800000" 
                                 mode      = "__WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "seg_data_router"
@@ -210,4 +238,5 @@
                                 vbase     = "0x00400000" 
                                 mode      = "CX_U"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "seg_code_router"
@@ -220,4 +249,5 @@
                                 vbase     = "0x00300000" 
                                 mode      = "C___"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
                                 <vobj   name	= "ptab_router"
@@ -230,4 +260,5 @@
 				                vbase     = "0x00010000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "stack_producer"
@@ -239,4 +270,5 @@
 				                vbase     = "0x00020000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "stack_consumer"
@@ -248,4 +280,5 @@
                 				vbase     = "0x00030000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "stack_router_A"
@@ -257,4 +290,5 @@
 				                vbase     = "0x00040000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "stack_router_B"
@@ -266,4 +300,5 @@
                                 vbase     = "0x00050000"
                                 mode      = "__WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "mwmr_in"
@@ -312,4 +347,5 @@
                                 vbase     = "0x00800000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "seg_data_hello"
@@ -322,4 +358,5 @@
                                 vbase     = "0x00400000" 
                                 mode      = "CX_U"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "seg_code_hello"
@@ -332,4 +369,5 @@
                                 vbase     = "0x00300000" 
                                 mode      = "C___"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
                                 <vobj   name	= "ptab"
@@ -342,4 +380,5 @@
                                 vbase     = "0x00000000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "stack"
@@ -363,4 +402,5 @@
                                 vbase     = "0x00800000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "seg_data_pgcd"
@@ -373,4 +413,5 @@
                                 vbase     = "0x00300000" 
                                 mode      = "C___"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
                                 <vobj   name	= "ptab"
@@ -383,4 +424,5 @@
                                 vbase     = "0x00400000" 
                                 mode      = "CX_U"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "seg_code_pgcd"
@@ -393,4 +435,5 @@
                                 vbase     = "0x00000000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "stack"
@@ -413,4 +456,5 @@
                                 vbase     = "0x00800000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "seg_data_display"
@@ -423,4 +467,5 @@
                                 vbase     = "0x00300000" 
                                 mode      = "C___"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
                                 <vobj   name	= "ptab"
@@ -433,4 +478,5 @@
                                 vbase     = "0x00400000" 
                                 mode      = "CX_U"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "seg_code_display"
@@ -443,4 +489,5 @@
                                 vbase     = "0x00000000" 
                                 mode      = "C_WU"
+								clusterid = "0"
                                 psegname  = "PSEG_RAU" >
 							    <vobj   name	= "stack_display"
