fix(fvp): increase BL2 size for CRYPTO_SUPPORT & ROMLIB
With MbedTLS v2.28.5 and using GCC 11.3, there is a compilation error
for the config fvp-tbb-mbedtls-romlib-fwu:
BL2 image has exceeded its limit.
region `RAM' overflowed by 4096 bytes
Increase the size of BL2 by 4kB: use the same size for (CRYPTO_SUPPORT &&
USE_ROMLIB) as for (TRUSTED_BOARD_BOOT && COT_DESC_IN_DTB). In this case
BL31 is not supposed to increase, and then won't break other configs like
fvp-tspd-tbb-mbedtls-dualroot
Signed-off-by: Yann Gautier <yann.gautier@st.com>
Change-Id: Iea791f6b2c7ace7e376e7dbd6a90dd3bcefd799b
diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h
index 16dfaf5..7559fd2 100644
--- a/plat/arm/board/fvp/include/platform_def.h
+++ b/plat/arm/board/fvp/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2022, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2023, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -191,7 +191,7 @@
* PLAT_ARM_MAX_BL2_SIZE is calculated using the current BL2 debug size plus a
* little space for growth.
*/
-#if TRUSTED_BOARD_BOOT && COT_DESC_IN_DTB
+#if (TRUSTED_BOARD_BOOT && COT_DESC_IN_DTB) || (CRYPTO_SUPPORT && USE_ROMLIB)
# define PLAT_ARM_MAX_BL2_SIZE (UL(0x1E000) - FVP_BL2_ROMLIB_OPTIMIZATION)
#elif CRYPTO_SUPPORT
# define PLAT_ARM_MAX_BL2_SIZE (UL(0x1D000) - FVP_BL2_ROMLIB_OPTIMIZATION)