From 61cb163bb829ee3e31c72fbb48358fbcf9eed835 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Thu, 1 May 2014 15:24:04 +0100 Subject: juno: Rename Juno "mmap" array to avoid name confusion Rename the array "mmap" in plat/juno/aarch64/plat_common.c to "juno_mmap", to avoid confusion with the array of the same name in lib/arch/aarch64/xlat_tables.c Change-Id: If2f2976b1bc9177a14625a2a4559c32c5236090f --- plat/juno/aarch64/plat_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plat/juno/aarch64/plat_common.c b/plat/juno/aarch64/plat_common.c index 280122d..9be2081 100644 --- a/plat/juno/aarch64/plat_common.c +++ b/plat/juno/aarch64/plat_common.c @@ -104,7 +104,7 @@ void disable_mmu(void) return; } -static const mmap_region mmap[] = { +static const mmap_region juno_mmap[] = { { TZROM_BASE, TZROM_SIZE, MT_MEMORY | MT_RO | MT_SECURE }, { MHU_SECURE_BASE, MHU_SECURE_SIZE, (MHU_PAYLOAD_CACHED ? MT_MEMORY : MT_DEVICE) | MT_RW | MT_SECURE }, @@ -134,7 +134,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(juno_mmap); init_xlat_tables(); -- cgit v1.2.3