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
This commit is contained in:
commit
a2ef56af18
|
@ -664,9 +664,10 @@ ARM development platform specific build options
|
||||||
|
|
||||||
- ``ARM_TSP_RAM_LOCATION``: location of the TSP binary. 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)
|
- ``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
|
- ``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
|
with version 1 of the translation tables library instead of version 2. It is
|
||||||
|
|
|
@ -76,12 +76,13 @@
|
||||||
#define MBEDTLS_MPI_WINDOW_SIZE 2
|
#define MBEDTLS_MPI_WINDOW_SIZE 2
|
||||||
#define MBEDTLS_MPI_MAX_SIZE 256
|
#define MBEDTLS_MPI_MAX_SIZE 256
|
||||||
|
|
||||||
/* System headers required to build mbed TLS with the current configuration */
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
/* Memory buffer allocator options */
|
/* Memory buffer allocator options */
|
||||||
#define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8
|
#define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8
|
||||||
|
|
||||||
|
#ifndef __ASSEMBLY__
|
||||||
|
/* System headers required to build mbed TLS with the current configuration */
|
||||||
|
#include <stdlib.h>
|
||||||
#include "mbedtls/check_config.h"
|
#include "mbedtls/check_config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __MBEDTLS_CONFIG_H__ */
|
#endif /* __MBEDTLS_CONFIG_H__ */
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
* little space for growth.
|
* little space for growth.
|
||||||
*/
|
*/
|
||||||
#if TRUSTED_BOARD_BOOT
|
#if TRUSTED_BOARD_BOOT
|
||||||
# define PLAT_ARM_MAX_BL2_SIZE 0x1D000
|
# define PLAT_ARM_MAX_BL2_SIZE 0x1E000
|
||||||
#else
|
#else
|
||||||
# define PLAT_ARM_MAX_BL2_SIZE 0xF000
|
# define PLAT_ARM_MAX_BL2_SIZE 0xF000
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -12,6 +12,9 @@
|
||||||
#include <board_css_def.h>
|
#include <board_css_def.h>
|
||||||
#include <common_def.h>
|
#include <common_def.h>
|
||||||
#include <css_def.h>
|
#include <css_def.h>
|
||||||
|
#if TRUSTED_BOARD_BOOT
|
||||||
|
#include <mbedtls_config.h>
|
||||||
|
#endif
|
||||||
#include <soc_css_def.h>
|
#include <soc_css_def.h>
|
||||||
#include <tzc400.h>
|
#include <tzc400.h>
|
||||||
#include <v2m_def.h>
|
#include <v2m_def.h>
|
||||||
|
@ -106,7 +109,11 @@
|
||||||
* little space for growth.
|
* little space for growth.
|
||||||
*/
|
*/
|
||||||
#if TRUSTED_BOARD_BOOT
|
#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
|
#else
|
||||||
# define PLAT_ARM_MAX_BL2_SIZE 0xC000
|
# define PLAT_ARM_MAX_BL2_SIZE 0xC000
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,7 +9,12 @@ ifeq (${ARCH}, aarch64)
|
||||||
# DRAM (if available) or the TZC secured area of DRAM.
|
# DRAM (if available) or the TZC secured area of DRAM.
|
||||||
# Trusted SRAM is the default.
|
# 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)
|
ifeq (${ARM_TSP_RAM_LOCATION}, tsram)
|
||||||
ARM_TSP_RAM_LOCATION_ID = ARM_TRUSTED_SRAM_ID
|
ARM_TSP_RAM_LOCATION_ID = ARM_TRUSTED_SRAM_ID
|
||||||
else ifeq (${ARM_TSP_RAM_LOCATION}, tdram)
|
else ifeq (${ARM_TSP_RAM_LOCATION}, tdram)
|
||||||
|
|
Loading…
Reference in New Issue