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 /include | |
| parent | 24552242b2143e0588ba93b41ec614e151d10f5c (diff) | |
| parent | 9b1eae96bff907e80992dbc66278cf0c913f3e17 (diff) | |
| download | platform_external_arm-trusted-firmware-a2ef56af183155465df8ed7577854cebec7522d9.tar.gz platform_external_arm-trusted-firmware-a2ef56af183155465df8ed7577854cebec7522d9.tar.bz2 platform_external_arm-trusted-firmware-a2ef56af183155465df8ed7577854cebec7522d9.zip | |
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 'include')
| -rw-r--r-- | include/drivers/auth/mbedtls/mbedtls_config.h | 7 | ||||
| -rw-r--r-- | include/plat/arm/board/common/board_arm_def.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/drivers/auth/mbedtls/mbedtls_config.h b/include/drivers/auth/mbedtls/mbedtls_config.h index ca2d9fad8..96587acae 100644 --- a/include/drivers/auth/mbedtls/mbedtls_config.h +++ b/include/drivers/auth/mbedtls/mbedtls_config.h @@ -76,12 +76,13 @@ #define MBEDTLS_MPI_WINDOW_SIZE 2 #define MBEDTLS_MPI_MAX_SIZE 256 -/* System headers required to build mbed TLS with the current configuration */ -#include <stdlib.h> - /* Memory buffer allocator options */ #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" +#endif #endif /* __MBEDTLS_CONFIG_H__ */ diff --git a/include/plat/arm/board/common/board_arm_def.h b/include/plat/arm/board/common/board_arm_def.h index 49ab601b0..93828c9d4 100644 --- a/include/plat/arm/board/common/board_arm_def.h +++ b/include/plat/arm/board/common/board_arm_def.h @@ -71,7 +71,7 @@ * little space for growth. */ #if TRUSTED_BOARD_BOOT -# define PLAT_ARM_MAX_BL2_SIZE 0x1D000 +# define PLAT_ARM_MAX_BL2_SIZE 0x1E000 #else # define PLAT_ARM_MAX_BL2_SIZE 0xF000 #endif |