From 138221c2457b9d04101b84084c07d576b0eb5a51 Mon Sep 17 00:00:00 2001 From: Boyan Karatotev Date: Thu, 30 Mar 2023 14:56:45 +0100 Subject: fix(fvp): work around BL31 progbits exceeded It is useful to have a single build for the FVP that includes as much stuff as possible. Such a build allows a single TF-A build to be used on a wide variety of fvp command lines. Unfortunately, the fvp also has a (somewhat arbitrary) SRAM limit and enabling a bunch of stuff overruns what is available. To workaround this limit, don't enable everything for all configurations. The offending configuration is when tsp is enabled, so try to slim the binary down only when building with it. As this doesn't solve the issue of running out of space for BL31, update the linker error to give some clue as to what has (likely) caused it while more permanent fixes are found. Also add FEAT_RNG to the mix as it got missed in the commotion. Signed-off-by: Boyan Karatotev Change-Id: Icb27cc837c2d90ca182693e9b3121b51383d51fd --- bl31/bl31.ld.S | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bl31') diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index c8290587e..5ac83fa59 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -132,7 +132,10 @@ SECTIONS { RELA_SECTION >RAM #ifdef BL31_PROGBITS_LIMIT - ASSERT(. <= BL31_PROGBITS_LIMIT, "BL31 progbits has exceeded its limit.") + ASSERT( + . <= BL31_PROGBITS_LIMIT, + "BL31 progbits has exceeded its limit. Consider disabling some features." + ) #endif /* BL31_PROGBITS_LIMIT */ #if SEPARATE_NOBITS_REGION -- cgit v1.2.1