diff options
| author | Qixiang Xu <qixiang.xu@arm.com> | 2017-10-13 09:04:12 +0800 |
|---|---|---|
| committer | Qixiang Xu <qixiang.xu@arm.com> | 2017-10-25 09:27:15 +0800 |
| commit | 7ca267bd8aaa8ea6a2a01d953bbcd4fc672ffe51 (patch) | |
| tree | b78e660ae8e0abd00bde912d69f8e393a5333d9d | |
| parent | 3b39efa49d9949c80b6e76b99829f84619b46110 (diff) | |
| download | arm-trusted-firmware-7ca267bd8aaa8ea6a2a01d953bbcd4fc672ffe51.tar.gz | |
plat/arm: change the default option of ARM_TSP_RAM_LOCATION
On Arm standard platforms, it runs out of SRAM space when TBB is
enabled, so the TSP default location is changed to dram when TBB
is enabled.
Change-Id: I516687013ad436ef454d2055d4e6fce06e467044
Signed-off-by: Qixiang Xu <qixiang.xu@arm.com>
| -rw-r--r-- | docs/user-guide.rst | 5 | ||||
| -rw-r--r-- | plat/arm/common/arm_common.mk | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/user-guide.rst b/docs/user-guide.rst index 28483f2b..d7ac2bd6 100644 --- a/docs/user-guide.rst +++ b/docs/user-guide.rst @@ -664,9 +664,10 @@ ARM development platform specific build options - ``ARM_TSP_RAM_LOCATION``: location of the TSP binary. Options: - - ``tsram`` : Trusted SRAM (default option) + - ``tsram`` : Trusted SRAM (default option when TBB is not enabled) - ``tdram`` : Trusted DRAM (if available) - - ``dram`` : Secure region in DRAM (configured by the TrustZone controller) + - ``dram`` : Secure region in DRAM (default option when TBB is enabled, + configured by the TrustZone controller) - ``ARM_XLAT_TABLES_LIB_V1``: boolean option to compile the Trusted Firmware with version 1 of the translation tables library instead of version 2. It is diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index 82f02b17..e1484d7e 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -9,7 +9,12 @@ ifeq (${ARCH}, aarch64) # DRAM (if available) or the TZC secured area of DRAM. # Trusted SRAM is the default. - ARM_TSP_RAM_LOCATION := tsram + ifneq (${TRUSTED_BOARD_BOOT},0) + ARM_TSP_RAM_LOCATION ?= dram + else + ARM_TSP_RAM_LOCATION ?= tsram + endif + ifeq (${ARM_TSP_RAM_LOCATION}, tsram) ARM_TSP_RAM_LOCATION_ID = ARM_TRUSTED_SRAM_ID else ifeq (${ARM_TSP_RAM_LOCATION}, tdram) |