From 15f195bfb37290f8e022bbead34860b4ffd0649a Mon Sep 17 00:00:00 2001 From: Andrew Thoelke Date: Fri, 20 Jun 2014 12:23:20 +0100 Subject: [PATCH] Remove NSRAM from FVP memory map This memory is not used by the FVP port and requires an additional 4KB translation table. This patch removes the entry from the memory map and reduces the number of allocated translation tables. Fixes ARM-software/tf-issues#196 Change-Id: I5b959e4fe92f5f892ed127c40dbe6c85eed3ed72 --- plat/fvp/aarch64/fvp_common.c | 2 -- plat/fvp/include/platform_def.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/fvp_common.c index 41234cba..580c7936 100644 --- a/plat/fvp/aarch64/fvp_common.c +++ b/plat/fvp/aarch64/fvp_common.c @@ -66,8 +66,6 @@ const mmap_region_t fvp_mmap[] = { 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...*/ diff --git a/plat/fvp/include/platform_def.h b/plat/fvp/include/platform_def.h index 46a9f24c..c8aaee66 100644 --- a/plat/fvp/include/platform_def.h +++ b/plat/fvp/include/platform_def.h @@ -145,7 +145,7 @@ * Platform specific page table and MMU setup constants ******************************************************************************/ #define ADDR_SPACE_SIZE (1ull << 32) -#define MAX_XLAT_TABLES 3 +#define MAX_XLAT_TABLES 2 #define MAX_MMAP_REGIONS 16 /******************************************************************************* -- 2.30.2