aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2014-06-23 14:41:34 +0100
committerdanh-arm <dan.handley@arm.com>2014-06-23 14:41:34 +0100
commitf52ec1975c9a88acd9bb2af4262802bef66b4574 (patch)
tree9cb386b8d6bedf16ead40f3ef4f397de34069010
parent5219862cd05467c0fb4f1bc46ddce1b5aab06ff2 (diff)
parent15f195bfb37290f8e022bbead34860b4ffd0649a (diff)
downloadarm-trusted-firmware-f52ec1975c9a88acd9bb2af4262802bef66b4574.tar.gz
Merge pull request #143 from athoelke/at/remove-nsram
Remove NSRAM from FVP memory map
-rw-r--r--plat/fvp/aarch64/fvp_common.c2
-rw-r--r--plat/fvp/include/platform_def.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/fvp_common.c
index 41234cb..580c793 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 46a9f24..c8aaee6 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
/*******************************************************************************