diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-04-15 10:38:02 +0100 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-04-15 10:38:02 +0100 |
| commit | 67c78844bc39ccd42ef4d79f823a9035ec6f52e8 (patch) | |
| tree | 2be666831129a0511e9f03164e168be7f7dc4335 /plat | |
| parent | 4b79cce54d0978817caba335d57c529f510f86e6 (diff) | |
Rename FVP "mmap" array to avoid name confusion
Rename the array "mmap" in plat/fvp/aarch64/plat_common.c to
"fvp_mmap", to avoid confusion with the array of the same name
in lib/arch/aarch64/xlat_tables.c
Fixes ARM-software/tf-issues#114
Change-Id: I61478c0070aa52d5dcf5d85af2f353f56c060cfb
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/fvp/aarch64/plat_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/fvp/aarch64/plat_common.c b/plat/fvp/aarch64/plat_common.c index a5d9f1d5..8c1e56c6 100644 --- a/plat/fvp/aarch64/plat_common.c +++ b/plat/fvp/aarch64/plat_common.c @@ -126,7 +126,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 }, @@ -157,7 +157,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(); |