Index: soft/giet_vm/mappings/4c_1p_iob.xml
===================================================================
--- soft/giet_vm/mappings/4c_1p_iob.xml	(revision 252)
+++ soft/giet_vm/mappings/4c_1p_iob.xml	(revision 253)
@@ -5,5 +5,6 @@
               cluster_x    = "2" 
               cluster_y    = "2" 
-              vspaces      = "4">
+              vspaces      = "4"
+              increment    = "0x10000" >
 
 *** This first section describes an instance of the "tsar_generic_iob" architecture
@@ -14,5 +15,5 @@
         <cluster index = "0" >
             <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x0000000000" length = "0x0010000000" />
-            <pseg name = "PSEG_XICU" type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
             <pseg name = "PSEG_DMA"  type = "PERI" base = "0x00B1000000" length = "0x0000008000" />
             <pseg name = "PSEG_MMC"  type = "PERI" base = "0x00B2000000" length = "0x0000001000" />
@@ -50,5 +51,5 @@
 
             <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4"  /> 
-            <periph type = "XICU" psegname = "PSEG_XICU" channels = "18" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "18" />
             <periph type = "MMC"  psegname = "PSEG_MMC" channels = "1"  />
             <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1"  /> 
@@ -63,5 +64,5 @@
         <cluster index = "1" >
             <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x4000000000" length = "0x0010000000" />
-            <pseg name = "PSEG_XICU" type = "PERI" base = "0x40B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x40B0000000" length = "0x0000002000" />
             <pseg name = "PSEG_DMA"  type = "PERI" base = "0x40B1000000" length = "0x0000008000" />
             <pseg name = "PSEG_MMC"  type = "PERI" base = "0x40B2000000" length = "0x0000001000" />
@@ -73,5 +74,5 @@
 
             <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
-            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "2" />
             <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
         </cluster>
@@ -79,5 +80,5 @@
         <cluster index = "2" >
             <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x8000000000" length = "0x0010000000" />
-            <pseg name = "PSEG_XICU" type = "PERI" base = "0x80B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x80B0000000" length = "0x0000002000" />
             <pseg name = "PSEG_DMA"  type = "PERI" base = "0x80B1000000" length = "0x0000008000" />
             <pseg name = "PSEG_MMC"  type = "PERI" base = "0x80B2000000" length = "0x0000001000" />
@@ -89,5 +90,5 @@
 
             <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
-            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "2" />
             <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
         </cluster>
@@ -95,5 +96,5 @@
         <cluster index = "3" >
             <pseg name = "PSEG_RAM"  type = "RAM"  base = "0xC000000000" length = "0x0010000000" />
-            <pseg name = "PSEG_XICU" type = "PERI" base = "0xC0B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0xC0B0000000" length = "0x0000002000" />
             <pseg name = "PSEG_DMA"  type = "PERI" base = "0xC0B1000000" length = "0x0000008000" />
             <pseg name = "PSEG_MMC"  type = "PERI" base = "0xC0B2000000" length = "0x0000001000" />
@@ -105,5 +106,5 @@
 
             <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
-            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "2" />
             <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
         </cluster>
@@ -163,61 +164,61 @@
         </vseg>
 
-*** segments for replicated ICUS / A[31:28] = 0xE / Increment = 0x100000             
-
-        <vseg name = "seg_icu_0"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XICU" > 
+*** segments for replicated ICUS / A[31:28] = 0xE / Increment = 0x10000             
+
+        <vseg name = "seg_icu_0"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XCU"  > 
             <vobj name = "icu_0"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_1"          vbase = "0xE0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_XICU" > 
+        <vseg name = "seg_icu_1"          vbase = "0xE0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_XCU"  > 
             <vobj name = "icu_1"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_2"          vbase = "0xE0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_XICU" > 
+        <vseg name = "seg_icu_2"          vbase = "0xE0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_XCU"  > 
             <vobj name = "icu_2"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_3"          vbase = "0xE0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_XICU" > 
+        <vseg name = "seg_icu_3"          vbase = "0xE0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_XCU"  > 
             <vobj name = "icu_3"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
 
-*** segments for replicated DMAs / A[31:28] = 0xD / Increment = 0x100000
+*** segments for replicated DMAs / A[31:28] = 0xD / Increment = 0x10000
 
         <vseg name = "seg_dma_0"          vbase = "0xD0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_DMA" >
             <vobj name = "dma_0"          type = "PERI" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_dma_1"          vbase = "0xD0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
+        <vseg name = "seg_dma_1"          vbase = "0xD0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
             <vobj name = "dma_1"          type = "PERI" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_dma_2"          vbase = "0xD0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
+        <vseg name = "seg_dma_2"          vbase = "0xD0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
             <vobj name = "dma_2"          type = "PERI" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_dma_3"          vbase = "0xD0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
+        <vseg name = "seg_dma_3"          vbase = "0xD0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
             <vobj name = "dma_3"          type = "PERI" length  = "0x00008000" />
         </vseg>
 
-*** segments for replicated MMC / A[31:28] = 0xC / Increment = 0x100000
+*** segments for replicated MMC / A[31:28] = 0xC / Increment = 0x10000
 
         <vseg name = "seg_memc_0"         vbase = "0xC0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_MMC" >
             <vobj name = "memc_0"         type = "PERI" length  = "0x00001000" />
         </vseg>
-        <vseg name = "seg_memc_1"         vbase = "0xC0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_MMC" >
+        <vseg name = "seg_memc_1"         vbase = "0xC0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_MMC" >
             <vobj name = "memc_1"         type = "PERI" length  = "0x00001000" />
         </vseg>
-        <vseg name = "seg_memc_2"         vbase = "0xC0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_MMC" >
+        <vseg name = "seg_memc_2"         vbase = "0xC0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_MMC" >
             <vobj name = "memc_2"         type = "PERI" length  = "0x00001000" />
         </vseg>
-        <vseg name = "seg_memc_3"         vbase = "0xC0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_MMC" >
+        <vseg name = "seg_memc_3"         vbase = "0xC0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_MMC" >
             <vobj name = "memc_3"         type = "PERI" length  = "0x00001000" />
         </vseg>
 
-*** segments for replicated schedulers / A[31:28] = 0xF / Increment = 0x100000
+*** segments for replicated schedulers / A[31:28] = 0xF / Increment = 0x10000
 
         <vseg name = "seg_sched_0"        vbase = "0xF0000000" mode = "C_W_" clusterid = "0" psegname = "PSEG_RAM" >
             <vobj name = "sched_0"        type = "SCHED" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_sched_1"        vbase = "0xF0100000" mode = "C_W_" clusterid = "1" psegname = "PSEG_RAM" >
+        <vseg name = "seg_sched_1"        vbase = "0xF0010000" mode = "C_W_" clusterid = "1" psegname = "PSEG_RAM" >
             <vobj name = "sched_1"        type = "SCHED" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_sched_2"        vbase = "0xF0200000" mode = "C_W_" clusterid = "2" psegname = "PSEG_RAM" >
+        <vseg name = "seg_sched_2"        vbase = "0xF0020000" mode = "C_W_" clusterid = "2" psegname = "PSEG_RAM" >
             <vobj name = "sched_2"        type = "SCHED" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_sched_3"        vbase = "0xF0300000" mode = "C_W_" clusterid = "3" psegname = "PSEG_RAM" >
+        <vseg name = "seg_sched_3"        vbase = "0xF0030000" mode = "C_W_" clusterid = "3" psegname = "PSEG_RAM" >
             <vobj name = "sched_3"        type = "SCHED" length  = "0x00008000" />
         </vseg>
@@ -314,5 +315,5 @@
             </vseg>
 
-            <task name = "main_display" clusterid = "3" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" usedma = "1" />
+            <task name = "main_display" clusterid = "3" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" usecma = "1" />
         </vspace>
     </vspaceset>
