aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing-Chun Liu (PaulLiu) <paul.liu@linaro.org>2018-06-13 20:09:01 +0800
committerJérôme Forissier <jerome.forissier@linaro.org>2018-08-28 12:58:26 +0200
commit5f142e399977149693c07ceeb6cdb31a095910ec (patch)
tree8f90473ae1b3836e0135d5bafa2f05642c6cb13d
parente07aecdb99a2f7b57ded29373c3ed23e7af5dc4b (diff)
plat-rpi3: Modify addresses to work with upstream TF-A.
The upstream arm-trusted-firmware reserves 0x10100000-0x11000000 for secure DRAM. Change the address according to the upstream TF-A. To help troubleshoot discrepancies, this commit goes well with the TF-A at commit aa49bde8a3e8 ("rpi3: Move NS-DRAM out of the protected region") Acked-by: Jerome Forissier <jerome.forissier@linaro.org> Tested-by: Igor Opaniuk <igor.opaniuk@linaro.org> Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org> Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
-rw-r--r--core/arch/arm/plat-rpi3/platform_config.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/arch/arm/plat-rpi3/platform_config.h b/core/arch/arm/plat-rpi3/platform_config.h
index bff1379b..9399e46a 100644
--- a/core/arch/arm/plat-rpi3/platform_config.h
+++ b/core/arch/arm/plat-rpi3/platform_config.h
@@ -70,12 +70,12 @@
#define TEE_SHMEM_START (0x08000000)
#define TEE_SHMEM_SIZE (4 * 1024 * 1024)
-#define TZDRAM_BASE (TEE_SHMEM_START + TEE_SHMEM_SIZE)
-#define TZDRAM_SIZE (32 * 1024 * 1024)
+#define TZDRAM_BASE (0x10100000)
+#define TZDRAM_SIZE (15 * 1024 * 1024)
-#define TEE_RAM_VA_SIZE (4 * 1024 * 1024)
+#define TEE_RAM_VA_SIZE (7 * 1024 * 1024)
-#define TEE_LOAD_ADDR (TZDRAM_BASE + 0x20000)
+#define TEE_LOAD_ADDR TZDRAM_BASE
#define TEE_RAM_PH_SIZE TEE_RAM_VA_SIZE
#define TEE_RAM_START TZDRAM_BASE
@@ -83,6 +83,6 @@
#define TA_RAM_START ROUNDUP((TZDRAM_BASE + TEE_RAM_VA_SIZE), \
CORE_MMU_DEVICE_SIZE)
-# define TA_RAM_SIZE (16 * 1024 * 1024)
+# define TA_RAM_SIZE (8 * 1024 * 1024)
#endif /* PLATFORM_CONFIG_H */