diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-10-30 16:56:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 16:56:07 +0000 |
| commit | a2ef56af183155465df8ed7577854cebec7522d9 (patch) | |
| tree | 022d38261c370df855efa9eb725b5d39fc8acc40 /plat | |
| parent | 24552242b2143e0588ba93b41ec614e151d10f5c (diff) | |
| parent | 9b1eae96bff907e80992dbc66278cf0c913f3e17 (diff) | |
| download | arm-trusted-firmware-a2ef56af183155465df8ed7577854cebec7522d9.tar.gz | |
Merge pull request #1144 from geesun/qx/resize_bl2_size
Change the default option of ARM_TSP_RAM_LOCATION and Enlarge the BL2 size on ARM platforms
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/juno/include/platform_def.h | 9 | ||||
| -rw-r--r-- | plat/arm/common/arm_common.mk | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/plat/arm/board/juno/include/platform_def.h b/plat/arm/board/juno/include/platform_def.h index 395d1fb6..ccc7771e 100644 --- a/plat/arm/board/juno/include/platform_def.h +++ b/plat/arm/board/juno/include/platform_def.h @@ -12,6 +12,9 @@ #include <board_css_def.h> #include <common_def.h> #include <css_def.h> +#if TRUSTED_BOARD_BOOT +#include <mbedtls_config.h> +#endif #include <soc_css_def.h> #include <tzc400.h> #include <v2m_def.h> @@ -106,7 +109,11 @@ * little space for growth. */ #if TRUSTED_BOARD_BOOT -# define PLAT_ARM_MAX_BL2_SIZE 0x19000 +#if TF_MBEDTLS_KEY_ALG_ID == TF_MBEDTLS_RSA_AND_ECDSA +# define PLAT_ARM_MAX_BL2_SIZE 0x1E000 +#else +# define PLAT_ARM_MAX_BL2_SIZE 0x1A000 +#endif #else # define PLAT_ARM_MAX_BL2_SIZE 0xC000 #endif 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) |