From 7762e5d0ed5c28b0a77dc25cc566cf54a69af7e6 Mon Sep 17 00:00:00 2001 From: Boyan Karatotev Date: Tue, 4 Apr 2023 14:48:04 +0100 Subject: [PATCH] fix(fvp): work around DRTM_SUPPORT BL31 progbits exceeded Just like the tspd, DRTM support pulls in a lot of code which can't fit into SRAM with everything else the fvp is including. Luckily, testing this feature is only done on v8.0 models, meaning all feature related code can be excluded for this run, saving space. The benefit of doing it this way is that the test can continue running unaltered in the interim. Signed-off-by: Boyan Karatotev Change-Id: Iced2089837622fea49c10ae403c653dd1f331ca3 --- plat/arm/board/fvp/platform.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index e5091c3b3..bbd0e22e4 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -37,8 +37,11 @@ FVP_DT_PREFIX := fvp-base-gicv3-psci # The fix is to enable everything, as before. When the tsp is included, though, # we need to slim the size down. In that case, disable all optional features, # that will not be present in CI when the tsp is. +# Similarly, DRTM support is only tested on v8.0 models. Disable everything just +# for it. # TODO: make all of this unconditional (or only base the condition on # ARM_ARCH_* when the makefile supports it). +ifneq (${DRTM_SUPPORT}, 1) ifneq (${SPD}, tspd) ENABLE_FEAT_AMU := 2 ENABLE_FEAT_AMUv1p1 := 2 @@ -74,6 +77,7 @@ ENABLE_TRF_FOR_NS := 2 ENABLE_FEAT_ECV := 2 ENABLE_FEAT_FGT := 2 ENABLE_FEAT_TCR2 := 2 +endif # The FVP platform depends on this macro to build with correct GIC driver. $(eval $(call add_define,FVP_USE_GIC_DRIVER)) -- 2.39.5