diff options
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/fvp/aarch64/fvp_common.c | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/fvp_common.c index 3a07844..41234cb 100644 --- a/plat/fvp/aarch64/fvp_common.c +++ b/plat/fvp/aarch64/fvp_common.c @@ -54,17 +54,27 @@ static unsigned long fvp_config[CONFIG_LIMIT]; * configure_mmu_elx() will give the available subset of that, */ const mmap_region_t fvp_mmap[] = { - { TZROM_BASE, TZROM_SIZE, MT_MEMORY | MT_RO | MT_SECURE }, - { TZDRAM_BASE, TZDRAM_SIZE, MT_MEMORY | MT_RW | MT_SECURE }, - { FLASH0_BASE, FLASH0_SIZE, MT_MEMORY | MT_RO | MT_SECURE }, - { FLASH1_BASE, FLASH1_SIZE, MT_MEMORY | MT_RO | MT_SECURE }, - { VRAM_BASE, VRAM_SIZE, MT_MEMORY | MT_RW | MT_SECURE }, - { DEVICE0_BASE, DEVICE0_SIZE, MT_DEVICE | MT_RW | MT_SECURE }, - { NSRAM_BASE, NSRAM_SIZE, MT_MEMORY | MT_RW | MT_NS }, - { DEVICE1_BASE, DEVICE1_SIZE, MT_DEVICE | MT_RW | MT_SECURE }, + { TZROM_BASE, TZROM_BASE, TZROM_SIZE, + MT_MEMORY | MT_RO | MT_SECURE }, + { TZDRAM_BASE, TZDRAM_BASE, TZDRAM_SIZE, + MT_MEMORY | MT_RW | MT_SECURE }, + { FLASH0_BASE, FLASH0_BASE, FLASH0_SIZE, + MT_MEMORY | MT_RO | MT_SECURE }, + { FLASH1_BASE, FLASH1_BASE, FLASH1_SIZE, + MT_MEMORY | MT_RO | MT_SECURE }, + { VRAM_BASE, VRAM_BASE, VRAM_SIZE, + MT_MEMORY | MT_RW | MT_SECURE }, + { DEVICE0_BASE, DEVICE0_BASE, DEVICE0_SIZE, + MT_DEVICE | MT_RW | MT_SECURE }, + { NSRAM_BASE, NSRAM_BASE, NSRAM_SIZE, + MT_MEMORY | MT_RW | MT_NS }, + { DEVICE1_BASE, DEVICE1_BASE, DEVICE1_SIZE, + MT_DEVICE | MT_RW | MT_SECURE }, /* 2nd GB as device for now...*/ - { 0x40000000, 0x40000000, MT_DEVICE | MT_RW | MT_SECURE }, - { DRAM1_BASE, DRAM1_SIZE, MT_MEMORY | MT_RW | MT_NS }, + { 0x40000000, 0x40000000, 0x40000000, + MT_DEVICE | MT_RW | MT_SECURE }, + { DRAM1_BASE, DRAM1_BASE, DRAM1_SIZE, + MT_MEMORY | MT_RW | MT_NS }, {0} }; @@ -73,19 +83,21 @@ const mmap_region_t fvp_mmap[] = { * the platform memory map & initialize the mmu, for the given exception level ******************************************************************************/ #define DEFINE_CONFIGURE_MMU_EL(_el) \ - void fvp_configure_mmu_el##_el(unsigned long total_base, \ + void fvp_configure_mmu_el##_el(unsigned long total_base, \ unsigned long total_size, \ unsigned long ro_start, \ unsigned long ro_limit, \ unsigned long coh_start, \ unsigned long coh_limit) \ { \ - mmap_add_region(total_base, \ + mmap_add_region(total_base, total_base, \ total_size, \ MT_MEMORY | MT_RW | MT_SECURE); \ - mmap_add_region(ro_start, ro_limit - ro_start, \ + mmap_add_region(ro_start, ro_start, \ + ro_limit - ro_start, \ MT_MEMORY | MT_RO | MT_SECURE); \ - mmap_add_region(coh_start, coh_limit - coh_start, \ + mmap_add_region(coh_start, coh_start, \ + coh_limit - coh_start, \ MT_DEVICE | MT_RW | MT_SECURE); \ mmap_add(fvp_mmap); \ init_xlat_tables(); \ |