Changeset 253 for soft/giet_vm/mappings


Ignore:
Timestamp:
Aug 14, 2013, 11:19:29 PM (11 years ago)
Author:
alain
Message:

1/ introducing support to display images on the frame buffer
with the vci_chbuf_dma (in stdio.c and drivers.c)
2/ introducing support for mem_cache configuration segment
as the memory cache is considered as another addressable peripheral type
(in drivers.c)
3/ Introducing the new "increment" parameter in the mapping header.
This parameter define the virtual address increment for the vsegs
associated to the replicated peripherals (ICU, XICU, MDMA, TIMER, MMC).
This parameter is mandatory, and all map.xml files the "mappings"
directory have been updated.

Location:
soft/giet_vm/mappings
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • soft/giet_vm/mappings/1c_4p_four.xml

    r235 r253  
    11<?xml version="1.0"?>
    22
    3 <mapping_info   signature = "0xdeadbeef" name = "1c_4p_four" cluster_x = "1" cluster_y = "1" vspaces  = "4" >
     3<mapping_info   signature = "0xdeadbeef"
     4                name      = "1c_4p_four"
     5                cluster_x = "1"
     6                cluster_y = "1"
     7                vspaces   = "4"
     8                increment = "0x10000" >
    49
    510*** This section describes an instance of the "caba_vgsb_xicu_mmu" generic architecture
    … …  
    7075            <periph type = "TTY" psegname = "PSEG_TTY" channels  = "8" />
    7176            <periph type = "DMA" psegname = "PSEG_DMA" channels  = "1" />
    72             <periph type = "XICU" psegname = "PSEG_ICU" channels  = "5" />
     77            <periph type = "XCU" psegname = "PSEG_ICU" channels  = "5" />
    7378            <periph type = "FBF" psegname = "PSEG_FBF" />
    7479

  • soft/giet_vm/mappings/1c_4p_four_dhrystone.xml

    r241 r253  
    11<?xml version="1.0"?>
    22
    3 <mapping_info   signature = "0xdeadbeef" name = "1c_4p_four_dhrystone" cluster_x = "1" cluster_y = "1" vspaces  = "4" >
     3<mapping_info   signature = "0xdeadbeef"
     4                name      = "1c_4p_four_dhrystone"
     5                cluster_x = "1"
     6                cluster_y = "1"
     7                vspaces   = "4"
     8                increment = "0x10000" >
    49
    510    <clusterset>
    … …  
    914
    1015            <pseg name = "PSEG_RAM"  type  = "RAM"  base = "0x0000000000" length = "0x0010000000" />
    11             <pseg name = "PSEG_XICU" type  = "PERI" base = "0x00B0000000" length = "0x0000001000" />
     16            <pseg name = "PSEG_XCU" type  = "PERI" base = "0x00B0000000" length = "0x0000001000" />
    1217            <pseg name = "PSEG_DMA"  type  = "PERI" base = "0x00B1000000" length = "0x0000001000" />
    1318            <pseg name = "PSEG_FBF"  type  = "PERI" base = "0x00B2000000" length = "0x0000200000" />
    … …  
    6166            <periph type = "TTY" psegname = "PSEG_TTY" channels  = "8" />
    6267            <periph type = "DMA" psegname = "PSEG_DMA" channels  = "1" />
    63             <periph type = "XICU" psegname = "PSEG_XICU" channels  = "5" />
     68            <periph type = "XCU"  psegname = "PSEG_XCU" channels  = "5" />
    6469            <periph type = "FBF" psegname = "PSEG_FBF" />
    6570
    … …  
    103108
    104109*** XICU / A[31:28] = 0xE
    105         <vseg name = "seg_icu"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XICU" >
     110        <vseg name = "seg_icu"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XCU" >
    106111            <vobj name = "icu"          type = "PERI" length  = "0x00001000" />
    107112        </vseg>

  • soft/giet_vm/mappings/1c_4p_gameoflife.xml

    r251 r253  
    11<?xml version="1.0"?>
    22
    3 <mapping_info   signature = "0xdeadbeef" name = "1c_4p_gameoflife" cluster_x = "1" cluster_y = "1" vspaces  = "1" >
     3<mapping_info   signature = "0xdeadbeef"
     4                name      = "1c_4p_gameoflife"
     5                cluster_x = "1"
     6                cluster_y = "1"
     7                vspaces   = "1"
     8                increment = "0x10000 >
    49
    510    <clusterset>
    … …  
    914
    1015            <pseg name = "PSEG_RAM"  type  = "RAM"  base = "0x0000000000" length = "0x0010000000" />
    11             <pseg name = "PSEG_XICU" type  = "PERI" base = "0x00B0000000" length = "0x0000001000" />
     16            <pseg name = "PSEG_XCU" type  = "PERI" base = "0x00B0000000" length = "0x0000001000" />
    1217            <pseg name = "PSEG_DMA"  type  = "PERI" base = "0x00B1000000" length = "0x0000001000" />
    1318            <pseg name = "PSEG_FBF"  type  = "PERI" base = "0x00B2000000" length = "0x0000200000" />
    … …  
    6469            <periph type = "TTY" psegname = "PSEG_TTY" channels  = "2" />
    6570            <periph type = "DMA" psegname = "PSEG_DMA" channels  = "1" />
    66             <periph type = "XICU" psegname = "PSEG_XICU" channels  = "5" />
     71            <periph type = "XCU" psegname = "PSEG_XCU" channels  = "5" />
    6772            <periph type = "FBF" psegname = "PSEG_FBF" />
    6873
    … …  
    109114        </vseg>
    110115
    111 *** XICU / A[31:28] = 0xE
    112         <vseg name = "seg_icu"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XICU" >
     116*** XCU / A[31:28] = 0xE
     117        <vseg name = "seg_icu"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XCU" >
    113118            <vobj name = "icu"          type = "PERI" length  = "0x00001000" />
    114119        </vseg>

  • soft/giet_vm/mappings/4c_1p_40.xml

    r245 r253  
    55              cluster_x    = "2"
    66              cluster_y    = "2"
    7               vspaces      = "4">
     7              vspaces      = "4"
     8              increment    = "0x0010000" >
    89
    910*** This first section describes an instance of the "tsar_generic_xbar" architecture
    … …  
    1415        <cluster index = "0" >
    1516            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x0000000000" length = "0x0010000000" />
    16             <pseg name = "PSEG_XICU" type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
     17            <pseg name = "PSEG_XCU" type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
    1718            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x00B1000000" length = "0x0000008000" />
    1819
    … …  
    4546                <irq type = "HARD" icuid = "29" isr = "ISR_TTY" channel = "13" />
    4647                <irq type = "HARD" icuid = "30" isr = "ISR_TTY" channel = "14" />
    47                 <irq type = "HARD" icuid = "31" isr = "ISR_IOC" />
     48                <irq type = "HARD" icuid = "31" isr = "ISR_IOC" channel = "0" />
    4849            </proc>
    4950
    5051            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    51             <periph type = "XICU" psegname = "PSEG_XICU" channels = "18" />
     52            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
    5253            <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1" />
    5354            <periph type = "TTY"  psegname = "PSEG_TTY"  channels = "8" />
    … …  
    5859        <cluster index = "1" >
    5960            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x4000000000" length = "0x0010000000" />
    60             <pseg name = "PSEG_XICU" type = "PERI" base = "0x40B0000000" length = "0x0000002000" />
     61            <pseg name = "PSEG_XCU" type = "PERI" base = "0x40B0000000" length = "0x0000002000" />
    6162            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x40B1000000" length = "0x0000008000" />
    6263
    … …  
    6768
    6869            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    69             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     70            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "2" />
    7071        </cluster>
    7172
    7273        <cluster index = "2" >
    7374            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x8000000000" length = "0x0010000000" />
    74             <pseg name = "PSEG_XICU" type = "PERI" base = "0x80B0000000" length = "0x0000002000" />
     75            <pseg name = "PSEG_XCU" type = "PERI" base = "0x80B0000000" length = "0x0000002000" />
    7576            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x80B1000000" length = "0x0000008000" />
    7677
    … …  
    8182
    8283            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    83             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     84            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "2" />
    8485        </cluster>
    8586
    8687        <cluster index = "3" >
    8788            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0xC000000000" length = "0x0010000000" />
    88             <pseg name = "PSEG_XICU" type = "PERI" base = "0xC0B0000000" length = "0x0000002000" />
     89            <pseg name = "PSEG_XCU" type = "PERI" base = "0xC0B0000000" length = "0x0000002000" />
    8990            <pseg name = "PSEG_DMA"  type = "PERI" base = "0xC0B1000000" length = "0x0000008000" />
    9091
    … …  
    9596
    9697            <periph  type = "DMA" psegname = "PSEG_DMA"  channels = "4" />
    97             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     98            <periph  type = "XCU" psegname = "PSEG_XCU" channels = "2" />
    9899        </cluster>
    99100    </clusterset>
    100 
    101 
    102101
    103102    <globalset>
    … …  
    148147        </vseg>
    149148
    150 *** Replicated ICUS / A[31:28] = 0xE / Increment = 0x100000             
    151 
    152         <vseg name = "seg_icu_0"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XICU" >
     149*** Replicated ICUS / A[31:28] = 0xE / Increment = 0x10000             
     150
     151        <vseg name = "seg_icu_0"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XCU" >
    153152            <vobj name = "icu_0"          type = "PERI" length  = "0x00001000" />
    154153        </vseg>
    155         <vseg name = "seg_icu_1"          vbase = "0xE0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_XICU" >
     154        <vseg name = "seg_icu_1"          vbase = "0xE0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_XCU" >
    156155            <vobj name = "icu_1"          type = "PERI" length  = "0x00001000" />
    157156        </vseg>
    158         <vseg name = "seg_icu_2"          vbase = "0xE0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_XICU" >
     157        <vseg name = "seg_icu_2"          vbase = "0xE0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_XCU" >
    159158            <vobj name = "icu_2"          type = "PERI" length  = "0x00001000" />
    160159        </vseg>
    161         <vseg name = "seg_icu_3"          vbase = "0xE0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_XICU" >
     160        <vseg name = "seg_icu_3"          vbase = "0xE0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_XCU" >
    162161            <vobj name = "icu_3"          type = "PERI" length  = "0x00001000" />
    163162        </vseg>
    164163
    165 *** Replicated DMAs / A[31:28] = 0xD / Increment = 0x100000
     164*** Replicated DMAs / A[31:28] = 0xD / Increment = 0x10000
    166165
    167166        <vseg name = "seg_dma_0"          vbase = "0xD0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_DMA" >
    168167            <vobj name = "dma_0"          type = "PERI" length  = "0x00008000" />
    169168        </vseg>
    170         <vseg name = "seg_dma_1"          vbase = "0xD0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
     169        <vseg name = "seg_dma_1"          vbase = "0xD0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
    171170            <vobj name = "dma_1"          type = "PERI" length  = "0x00008000" />
    172171        </vseg>
    173         <vseg name = "seg_dma_2"          vbase = "0xD0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
     172        <vseg name = "seg_dma_2"          vbase = "0xD0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
    174173            <vobj name = "dma_2"          type = "PERI" length  = "0x00008000" />
    175174        </vseg>
    176         <vseg name = "seg_dma_3"          vbase = "0xD0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
     175        <vseg name = "seg_dma_3"          vbase = "0xD0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
    177176            <vobj name = "dma_3"          type = "PERI" length  = "0x00008000" />
    178177        </vseg>
    179178
    180 *** Replicated schedulers / A[31:28] = 0xF / Increment = 0x100000
     179*** Replicated schedulers / A[31:28] = 0xF / Increment = 0x10000
    181180
    182181        <vseg name = "seg_sched_0"        vbase = "0xF0000000" mode = "C_W_" clusterid = "0" psegname = "PSEG_RAM" >
    183182            <vobj name = "sched_0"        type = "SCHED" length  = "0x00008000" />
    184183        </vseg>
    185         <vseg name = "seg_sched_1"        vbase = "0xF0100000" mode = "C_W_" clusterid = "1" psegname = "PSEG_RAM" >
     184        <vseg name = "seg_sched_1"        vbase = "0xF0010000" mode = "C_W_" clusterid = "1" psegname = "PSEG_RAM" >
    186185            <vobj name = "sched_1"        type = "SCHED" length  = "0x00008000" />
    187186        </vseg>
    188         <vseg name = "seg_sched_2"        vbase = "0xF0200000" mode = "C_W_" clusterid = "2" psegname = "PSEG_RAM" >
     187        <vseg name = "seg_sched_2"        vbase = "0xF0020000" mode = "C_W_" clusterid = "2" psegname = "PSEG_RAM" >
    189188            <vobj name = "sched_2"        type = "SCHED" length  = "0x00008000" />
    190189        </vseg>
    191         <vseg name = "seg_sched_3"        vbase = "0xF0300000" mode = "C_W_" clusterid = "3" psegname = "PSEG_RAM" >
     190        <vseg name = "seg_sched_3"        vbase = "0xF0030000" mode = "C_W_" clusterid = "3" psegname = "PSEG_RAM" >
    192191            <vobj name = "sched_3"        type = "SCHED" length  = "0x00008000" />
    193192        </vseg>

  • soft/giet_vm/mappings/4c_1p_display.xml

    r249 r253  
    55              cluster_x    = "2"
    66              cluster_y    = "2"
    7               vspaces      = "1">
     7              vspaces      = "1"
     8              increment    = "0x10000 >
    89
    910*** This first section describes an instance of the "tsar_generic_iob" architecture
    … …  
    1415        <cluster index = "0" >
    1516            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x0000000000" length = "0x0010000000" />
    16             <pseg name = "PSEG_XICU" type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
     17            <pseg name = "PSEG_XCU" type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
    1718            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x00B1000000" length = "0x0000008000" />
    1819            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x00B2000000" length = "0x0000001000" />
    … …  
    5051
    5152            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4"  />
    52             <periph type = "XICU" psegname = "PSEG_XICU" channels = "18" />
     53            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "18" />
    5354            <periph type = "MMC"  psegname = "PSEG_MMC" channels = "1"  />
    5455            <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1"  />
    … …  
    6263        <cluster index = "1" >
    6364            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x4000000000" length = "0x0010000000" />
    64             <pseg name = "PSEG_XICU" type = "PERI" base = "0x40B0000000" length = "0x0000002000" />
     65            <pseg name = "PSEG_XCU" type = "PERI" base = "0x40B0000000" length = "0x0000002000" />
    6566            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x40B1000000" length = "0x0000008000" />
    6667            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x40B2000000" length = "0x0000001000" />
    … …  
    7273
    7374            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    74             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     75            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "2" />
    7576            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    7677        </cluster>
    … …  
    7879        <cluster index = "2" >
    7980            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x8000000000" length = "0x0010000000" />
    80             <pseg name = "PSEG_XICU" type = "PERI" base = "0x80B0000000" length = "0x0000002000" />
     81            <pseg name = "PSEG_XCU" type = "PERI" base = "0x80B0000000" length = "0x0000002000" />
    8182            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x80B1000000" length = "0x0000008000" />
    8283            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x80B2000000" length = "0x0000001000" />
    … …  
    8889
    8990            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    90             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     91            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "2" />
    9192            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    9293        </cluster>
    … …  
    9495        <cluster index = "3" >
    9596            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0xC000000000" length = "0x0010000000" />
    96             <pseg name = "PSEG_XICU" type = "PERI" base = "0xC0B0000000" length = "0x0000002000" />
     97            <pseg name = "PSEG_XCU" type = "PERI" base = "0xC0B0000000" length = "0x0000002000" />
    9798            <pseg name = "PSEG_DMA"  type = "PERI" base = "0xC0B1000000" length = "0x0000008000" />
    9899            <pseg name = "PSEG_MMC"  type = "PERI" base = "0xC0B2000000" length = "0x0000001000" />
    … …  
    104105
    105106            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    106             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     107            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "2" />
    107108            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    108109        </cluster>
    … …  
    163164        </vseg>
    164165
    165 *** segments for replicated ICUS / A[31:28] = 0xE / Increment = 0x100000             
    166 
    167         <vseg name = "seg_icu_0"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XICU" >
     166*** segments for replicated ICUS / A[31:28] = 0xE / Increment = 0x10000             
     167
     168        <vseg name = "seg_icu_0"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XCU" >
    168169            <vobj name = "icu_0"          type = "PERI" length  = "0x00001000" />
    169170        </vseg>
    170         <vseg name = "seg_icu_1"          vbase = "0xE0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_XICU" >
     171        <vseg name = "seg_icu_1"          vbase = "0xE0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_XCU" >
    171172            <vobj name = "icu_1"          type = "PERI" length  = "0x00001000" />
    172173        </vseg>
    173         <vseg name = "seg_icu_2"          vbase = "0xE0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_XICU" >
     174        <vseg name = "seg_icu_2"          vbase = "0xE0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_XCU" >
    174175            <vobj name = "icu_2"          type = "PERI" length  = "0x00001000" />
    175176        </vseg>
    176         <vseg name = "seg_icu_3"          vbase = "0xE0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_XICU" >
     177        <vseg name = "seg_icu_3"          vbase = "0xE0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_XCU" >
    177178            <vobj name = "icu_3"          type = "PERI" length  = "0x00001000" />
    178179        </vseg>
    179180
    180 *** segments for replicated DMAs / A[31:28] = 0xD / Increment = 0x100000
     181*** segments for replicated DMAs / A[31:28] = 0xD / Increment = 0x10000
    181182
    182183        <vseg name = "seg_dma_0"          vbase = "0xD0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_DMA" >
    183184            <vobj name = "dma_0"          type = "PERI" length  = "0x00008000" />
    184185        </vseg>
    185         <vseg name = "seg_dma_1"          vbase = "0xD0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
     186        <vseg name = "seg_dma_1"          vbase = "0xD0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
    186187            <vobj name = "dma_1"          type = "PERI" length  = "0x00008000" />
    187188        </vseg>
    188         <vseg name = "seg_dma_2"          vbase = "0xD0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
     189        <vseg name = "seg_dma_2"          vbase = "0xD0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
    189190            <vobj name = "dma_2"          type = "PERI" length  = "0x00008000" />
    190191        </vseg>
    191         <vseg name = "seg_dma_3"          vbase = "0xD0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
     192        <vseg name = "seg_dma_3"          vbase = "0xD0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
    192193            <vobj name = "dma_3"          type = "PERI" length  = "0x00008000" />
    193194        </vseg>
    194195
    195 *** segments for replicated MMC / A[31:28] = 0xC / Increment = 0x100000
     196*** segments for replicated MMC / A[31:28] = 0xC / Increment = 0x10000
    196197
    197198        <vseg name = "seg_memc_0"         vbase = "0xC0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_MMC" >
    198199            <vobj name = "memc_0"         type = "PERI" length  = "0x00001000" />
    199200        </vseg>
    200         <vseg name = "seg_memc_1"         vbase = "0xC0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_MMC" >
     201        <vseg name = "seg_memc_1"         vbase = "0xC0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_MMC" >
    201202            <vobj name = "memc_1"         type = "PERI" length  = "0x00001000" />
    202203        </vseg>
    203         <vseg name = "seg_memc_2"         vbase = "0xC0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_MMC" >
     204        <vseg name = "seg_memc_2"         vbase = "0xC0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_MMC" >
    204205            <vobj name = "memc_2"         type = "PERI" length  = "0x00001000" />
    205206        </vseg>
    206         <vseg name = "seg_memc_3"         vbase = "0xC0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_MMC" >
     207        <vseg name = "seg_memc_3"         vbase = "0xC0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_MMC" >
    207208            <vobj name = "memc_3"         type = "PERI" length  = "0x00001000" />
    208209        </vseg>
    209210
    210 *** segments for replicated schedulers / A[31:28] = 0xF / Increment = 0x100000
     211*** segments for replicated schedulers / A[31:28] = 0xF / Increment = 0x10000
    211212
    212213        <vseg name = "seg_sched_0"        vbase = "0xF0000000" mode = "C_W_" clusterid = "0" psegname = "PSEG_RAM" >
    213214            <vobj name = "sched_0"        type = "SCHED" length  = "0x00008000" />
    214215        </vseg>
    215         <vseg name = "seg_sched_1"        vbase = "0xF0100000" mode = "C_W_" clusterid = "1" psegname = "PSEG_RAM" >
     216        <vseg name = "seg_sched_1"        vbase = "0xF0010000" mode = "C_W_" clusterid = "1" psegname = "PSEG_RAM" >
    216217            <vobj name = "sched_1"        type = "SCHED" length  = "0x00008000" />
    217218        </vseg>
    218         <vseg name = "seg_sched_2"        vbase = "0xF0200000" mode = "C_W_" clusterid = "2" psegname = "PSEG_RAM" >
     219        <vseg name = "seg_sched_2"        vbase = "0xF0020000" mode = "C_W_" clusterid = "2" psegname = "PSEG_RAM" >
    219220            <vobj name = "sched_2"        type = "SCHED" length  = "0x00008000" />
    220221        </vseg>
    221         <vseg name = "seg_sched_3"        vbase = "0xF0300000" mode = "C_W_" clusterid = "3" psegname = "PSEG_RAM" >
     222        <vseg name = "seg_sched_3"        vbase = "0xF0030000" mode = "C_W_" clusterid = "3" psegname = "PSEG_RAM" >
    222223            <vobj name = "sched_3"        type = "SCHED" length  = "0x00008000" />
    223224        </vseg>

  • soft/giet_vm/mappings/4c_1p_iob.xml

    r252 r253  
    55              cluster_x    = "2"
    66              cluster_y    = "2"
    7               vspaces      = "4">
     7              vspaces      = "4"
     8              increment    = "0x10000" >
    89
    910*** This first section describes an instance of the "tsar_generic_iob" architecture
    … …  
    1415        <cluster index = "0" >
    1516            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x0000000000" length = "0x0010000000" />
    16             <pseg name = "PSEG_XICU" type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
     17            <pseg name = "PSEG_XCU" type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
    1718            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x00B1000000" length = "0x0000008000" />
    1819            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x00B2000000" length = "0x0000001000" />
    … …  
    5051
    5152            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4"  />
    52             <periph type = "XICU" psegname = "PSEG_XICU" channels = "18" />
     53            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "18" />
    5354            <periph type = "MMC"  psegname = "PSEG_MMC" channels = "1"  />
    5455            <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1"  />
    … …  
    6364        <cluster index = "1" >
    6465            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x4000000000" length = "0x0010000000" />
    65             <pseg name = "PSEG_XICU" type = "PERI" base = "0x40B0000000" length = "0x0000002000" />
     66            <pseg name = "PSEG_XCU" type = "PERI" base = "0x40B0000000" length = "0x0000002000" />
    6667            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x40B1000000" length = "0x0000008000" />
    6768            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x40B2000000" length = "0x0000001000" />
    … …  
    7374
    7475            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    75             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     76            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "2" />
    7677            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    7778        </cluster>
    … …  
    7980        <cluster index = "2" >
    8081            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x8000000000" length = "0x0010000000" />
    81             <pseg name = "PSEG_XICU" type = "PERI" base = "0x80B0000000" length = "0x0000002000" />
     82            <pseg name = "PSEG_XCU" type = "PERI" base = "0x80B0000000" length = "0x0000002000" />
    8283            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x80B1000000" length = "0x0000008000" />
    8384            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x80B2000000" length = "0x0000001000" />
    … …  
    8990
    9091            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    91             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     92            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "2" />
    9293            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    9394        </cluster>
    … …  
    9596        <cluster index = "3" >
    9697            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0xC000000000" length = "0x0010000000" />
    97             <pseg name = "PSEG_XICU" type = "PERI" base = "0xC0B0000000" length = "0x0000002000" />
     98            <pseg name = "PSEG_XCU" type = "PERI" base = "0xC0B0000000" length = "0x0000002000" />
    9899            <pseg name = "PSEG_DMA"  type = "PERI" base = "0xC0B1000000" length = "0x0000008000" />
    99100            <pseg name = "PSEG_MMC"  type = "PERI" base = "0xC0B2000000" length = "0x0000001000" />
    … …  
    105106
    106107            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "4" />
    107             <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
     108            <periph type = "XCU"  psegname = "PSEG_XCU" channels = "2" />
    108109            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
    109110        </cluster>
    … …  
    163164        </vseg>
    164165
    165 *** segments for replicated ICUS / A[31:28] = 0xE / Increment = 0x100000             
    166 
    167         <vseg name = "seg_icu_0"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XICU" >
     166*** segments for replicated ICUS / A[31:28] = 0xE / Increment = 0x10000             
     167
     168        <vseg name = "seg_icu_0"          vbase = "0xE0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_XCU" >
    168169            <vobj name = "icu_0"          type = "PERI" length  = "0x00001000" />
    169170        </vseg>
    170         <vseg name = "seg_icu_1"          vbase = "0xE0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_XICU" >
     171        <vseg name = "seg_icu_1"          vbase = "0xE0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_XCU" >
    171172            <vobj name = "icu_1"          type = "PERI" length  = "0x00001000" />
    172173        </vseg>
    173         <vseg name = "seg_icu_2"          vbase = "0xE0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_XICU" >
     174        <vseg name = "seg_icu_2"          vbase = "0xE0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_XCU" >
    174175            <vobj name = "icu_2"          type = "PERI" length  = "0x00001000" />
    175176        </vseg>
    176         <vseg name = "seg_icu_3"          vbase = "0xE0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_XICU" >
     177        <vseg name = "seg_icu_3"          vbase = "0xE0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_XCU" >
    177178            <vobj name = "icu_3"          type = "PERI" length  = "0x00001000" />
    178179        </vseg>
    179180
    180 *** segments for replicated DMAs / A[31:28] = 0xD / Increment = 0x100000
     181*** segments for replicated DMAs / A[31:28] = 0xD / Increment = 0x10000
    181182
    182183        <vseg name = "seg_dma_0"          vbase = "0xD0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_DMA" >
    183184            <vobj name = "dma_0"          type = "PERI" length  = "0x00008000" />
    184185        </vseg>
    185         <vseg name = "seg_dma_1"          vbase = "0xD0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
     186        <vseg name = "seg_dma_1"          vbase = "0xD0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
    186187            <vobj name = "dma_1"          type = "PERI" length  = "0x00008000" />
    187188        </vseg>
    188         <vseg name = "seg_dma_2"          vbase = "0xD0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
     189        <vseg name = "seg_dma_2"          vbase = "0xD0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
    189190            <vobj name = "dma_2"          type = "PERI" length  = "0x00008000" />
    190191        </vseg>
    191         <vseg name = "seg_dma_3"          vbase = "0xD0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
     192        <vseg name = "seg_dma_3"          vbase = "0xD0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
    192193            <vobj name = "dma_3"          type = "PERI" length  = "0x00008000" />
    193194        </vseg>
    194195
    195 *** segments for replicated MMC / A[31:28] = 0xC / Increment = 0x100000
     196*** segments for replicated MMC / A[31:28] = 0xC / Increment = 0x10000
    196197
    197198        <vseg name = "seg_memc_0"         vbase = "0xC0000000" mode = "__W_" clusterid = "0" psegname = "PSEG_MMC" >
    198199            <vobj name = "memc_0"         type = "PERI" length  = "0x00001000" />
    199200        </vseg>
    200         <vseg name = "seg_memc_1"         vbase = "0xC0100000" mode = "__W_" clusterid = "1" psegname = "PSEG_MMC" >
     201        <vseg name = "seg_memc_1"         vbase = "0xC0010000" mode = "__W_" clusterid = "1" psegname = "PSEG_MMC" >
    201202            <vobj name = "memc_1"         type = "PERI" length  = "0x00001000" />
    202203        </vseg>
    203         <vseg name = "seg_memc_2"         vbase = "0xC0200000" mode = "__W_" clusterid = "2" psegname = "PSEG_MMC" >
     204        <vseg name = "seg_memc_2"         vbase = "0xC0020000" mode = "__W_" clusterid = "2" psegname = "PSEG_MMC" >
    204205            <vobj name = "memc_2"         type = "PERI" length  = "0x00001000" />
    205206        </vseg>
    206         <vseg name = "seg_memc_3"         vbase = "0xC0300000" mode = "__W_" clusterid = "3" psegname = "PSEG_MMC" >
     207        <vseg name = "seg_memc_3"         vbase = "0xC0030000" mode = "__W_" clusterid = "3" psegname = "PSEG_MMC" >
    207208            <vobj name = "memc_3"         type = "PERI" length  = "0x00001000" />
    208209        </vseg>
    209210
    210 *** segments for replicated schedulers / A[31:28] = 0xF / Increment = 0x100000
     211*** segments for replicated schedulers / A[31:28] = 0xF / Increment = 0x10000
    211212
    212213        <vseg name = "seg_sched_0"        vbase = "0xF0000000" mode = "C_W_" clusterid = "0" psegname = "PSEG_RAM" >
    213214            <vobj name = "sched_0"        type = "SCHED" length  = "0x00008000" />
    214215        </vseg>
    215         <vseg name = "seg_sched_1"        vbase = "0xF0100000" mode = "C_W_" clusterid = "1" psegname = "PSEG_RAM" >
     216        <vseg name = "seg_sched_1"        vbase = "0xF0010000" mode = "C_W_" clusterid = "1" psegname = "PSEG_RAM" >
    216217            <vobj name = "sched_1"        type = "SCHED" length  = "0x00008000" />
    217218        </vseg>
    218         <vseg name = "seg_sched_2"        vbase = "0xF0200000" mode = "C_W_" clusterid = "2" psegname = "PSEG_RAM" >
     219        <vseg name = "seg_sched_2"        vbase = "0xF0020000" mode = "C_W_" clusterid = "2" psegname = "PSEG_RAM" >
    219220            <vobj name = "sched_2"        type = "SCHED" length  = "0x00008000" />
    220221        </vseg>
    221         <vseg name = "seg_sched_3"        vbase = "0xF0300000" mode = "C_W_" clusterid = "3" psegname = "PSEG_RAM" >
     222        <vseg name = "seg_sched_3"        vbase = "0xF0030000" mode = "C_W_" clusterid = "3" psegname = "PSEG_RAM" >
    222223            <vobj name = "sched_3"        type = "SCHED" length  = "0x00008000" />
    223224        </vseg>
    … …  
    314315            </vseg>
    315316
    316             <task name = "main_display" clusterid = "3" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" usedma = "1" />
     317            <task name = "main_display" clusterid = "3" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" usecma = "1" />
    317318        </vspace>
    318319    </vspaceset>
Note: See TracChangeset for help on using the changeset viewer.