Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-23 13:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(fvp): adjust BL31 maximum size as per total SRAM size" into integration

Browse source
This commit is contained in:
Lauren Wehrmeister 2023-06-29 17:14:29 +02:00 • committed by TrustedFirmware Code Review
commit 0bc2f3d2bb
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/plat/arm/common/arm_def.h
View file

@ -539,7 +539,8 @@ MEASURED_BOOT
* Define limit of firmware configuration memory: * Define limit of firmware configuration memory:
* ARM_FW_CONFIG + ARM_BL2_MEM_DESC memory * ARM_FW_CONFIG + ARM_BL2_MEM_DESC memory
*/ */
#define ARM_FW_CONFIGS_LIMIT (ARM_BL_RAM_BASE + (PAGE_SIZE * 2)) #define ARM_FW_CONFIGS_SIZE (PAGE_SIZE * 2)
#define ARM_FW_CONFIGS_LIMIT (ARM_BL_RAM_BASE + ARM_FW_CONFIGS_SIZE)
#if ENABLE_RME #if ENABLE_RME
/* /*

7
plat/arm/board/fvp/include/platform_def.h
View file

@ -230,9 +230,12 @@ defined(IMAGE_BL2) && MEASURED_BOOT
/* /*
* Since BL31 NOBITS overlays BL2 and BL1-RW, PLAT_ARM_MAX_BL31_SIZE is * Since BL31 NOBITS overlays BL2 and BL1-RW, PLAT_ARM_MAX_BL31_SIZE is
* calculated using the current BL31 PROGBITS debug size plus the sizes of * calculated using the current BL31 PROGBITS debug size plus the sizes of
* BL2 and BL1-RW * BL2 and BL1-RW.
* Size of the BL31 PROGBITS increases as the SRAM size increases.
*/ */
#define PLAT_ARM_MAX_BL31_SIZE (UL(0x3D000) - ARM_L0_GPT_SIZE) #define PLAT_ARM_MAX_BL31_SIZE (PLAT_ARM_TRUSTED_SRAM_SIZE - \
ARM_SHARED_RAM_SIZE - \
ARM_FW_CONFIGS_SIZE - ARM_L0_GPT_SIZE)
#endif /* RESET_TO_BL31 */ #endif /* RESET_TO_BL31 */
#ifndef __aarch64__ #ifndef __aarch64__