aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-01-03 11:20:56 +0000
committerGitHub <noreply@github.com>2018-01-03 11:20:56 +0000
commit34c2b9c2f144e213533c00bbdedb8da5b786311b (patch)
treeff7aa60067ad59d3a6cffdef52cab6a6bf7a16f4
parent9a2a38a201f207d7b19e854b5959c56ab8cd57e5 (diff)
parent66db10ca41959d90107186740ad321d1ac130374 (diff)
downloadtrusted-firmware-a-34c2b9c2f144e213533c00bbdedb8da5b786311b.tar.gz
Merge pull request #1212 from dp-arm/dp/tsp_dram
Move TSP to TZC secured DRAM
-rw-r--r--include/plat/arm/board/common/board_arm_def.h2
-rw-r--r--plat/arm/common/arm_common.mk8
2 files changed, 3 insertions, 7 deletions
diff --git a/include/plat/arm/board/common/board_arm_def.h b/include/plat/arm/board/common/board_arm_def.h
index 69eb727f57..e0c3c86814 100644
--- a/include/plat/arm/board/common/board_arm_def.h
+++ b/include/plat/arm/board/common/board_arm_def.h
@@ -90,7 +90,7 @@
* PLAT_ARM_MAX_BL31_SIZE is calculated using the current BL31 debug size plus a
* little space for growth.
*/
-#define PLAT_ARM_MAX_BL31_SIZE 0x1D000
+#define PLAT_ARM_MAX_BL31_SIZE 0x1E000
#ifdef AARCH32
/*
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
index 17acae52f7..fab57f1475 100644
--- a/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@ -7,13 +7,9 @@
ifeq (${ARCH}, aarch64)
# On ARM standard platorms, the TSP can execute from Trusted SRAM, Trusted
# DRAM (if available) or the TZC secured area of DRAM.
- # Trusted SRAM is the default.
+ # TZC secured DRAM is the default.
- ifneq (${TRUSTED_BOARD_BOOT},0)
- ARM_TSP_RAM_LOCATION ?= dram
- else
- ARM_TSP_RAM_LOCATION ?= tsram
- endif
+ ARM_TSP_RAM_LOCATION ?= dram
ifeq (${ARM_TSP_RAM_LOCATION}, tsram)
ARM_TSP_RAM_LOCATION_ID = ARM_TRUSTED_SRAM_ID