aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2014-04-16 17:20:11 +0100
committerdanh-arm <dan.handley@arm.com>2014-04-16 17:20:11 +0100
commit19c72525fb17fe9e00cfeb1d12fa00739f5f6579 (patch)
tree64cedd8d2012d8a13f99f8d55fe7eac2f9e5d8bd /plat
parent7640b47342eb779c92cf011b532168fa3ea0d99b (diff)
parent67c78844bc39ccd42ef4d79f823a9035ec6f52e8 (diff)
downloadarm-trusted-firmware-19c72525fb17fe9e00cfeb1d12fa00739f5f6579.tar.gz
Merge pull request #45 from danh-arm/dh/tf-issues#114
Rename FVP "mmap" array to avoid name confusion
Diffstat (limited to 'plat')
-rw-r--r--plat/fvp/aarch64/plat_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/fvp/aarch64/plat_common.c b/plat/fvp/aarch64/plat_common.c
index 6a5e5a7..16645cb 100644
--- a/plat/fvp/aarch64/plat_common.c
+++ b/plat/fvp/aarch64/plat_common.c
@@ -122,7 +122,7 @@ void disable_mmu(void)
* This doesn't include TZRAM as the 'mem_layout' argument passed to to
* configure_mmu() will give the available subset of that,
*/
-const mmap_region mmap[] = {
+const mmap_region 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 },
@@ -153,7 +153,7 @@ void configure_mmu(meminfo *mem_layout,
mmap_add_region(coh_start, coh_limit - coh_start,
MT_DEVICE | MT_RW | MT_SECURE);
- mmap_add(mmap);
+ mmap_add(fvp_mmap);
init_xlat_tables();