From 4181ec8cec59141313580355f9a1ca95b296f5f2 Mon Sep 17 00:00:00 2001 From: Stephan Gerhold Date: Fri, 24 Mar 2023 19:18:51 +0100 Subject: [PATCH] build(msm8916): place bl32 directly after bl31 At the moment there are two entirely separate memory regions for BL31 and BL32. However, since BL31 is very small (<= 128 KiB) there is actually still plenty of space after BL31. Drop the extra memory region for BL32 and place it directly after BL31 (i.e. BL31_LIMIT). If needed it is still possible to change it on the make command line. While at it, move the definitions to the bottom of the make file so they come immediately before the related add_define calls. Change-Id: I5184dcc2d89a92f1384508f973d56fd963e7befb Signed-off-by: Stephan Gerhold --- plat/qti/msm8916/include/platform_def.h | 1 + plat/qti/msm8916/platform.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plat/qti/msm8916/include/platform_def.h b/plat/qti/msm8916/include/platform_def.h index 6d5ff2b33..02bfd37eb 100644 --- a/plat/qti/msm8916/include/platform_def.h +++ b/plat/qti/msm8916/include/platform_def.h @@ -18,6 +18,7 @@ */ #define BL31_LIMIT (BL31_BASE + SZ_128K) #define BL31_PROGBITS_LIMIT (BL31_BASE + SZ_64K) +#define BL32_LIMIT (BL32_BASE + SZ_128K) #define CACHE_WRITEBACK_GRANULE U(64) #define PLATFORM_STACK_SIZE SZ_4K diff --git a/plat/qti/msm8916/platform.mk b/plat/qti/msm8916/platform.mk index fcee2f33b..b3ea2feee 100644 --- a/plat/qti/msm8916/platform.mk +++ b/plat/qti/msm8916/platform.mk @@ -34,12 +34,6 @@ PLAT_INCLUDES := -Iinclude/plat/arm/common/${ARCH} \ RESET_TO_BL31 := 1 COLD_BOOT_SINGLE_CPU := 1 -# Build config flags -# ------------------ -BL31_BASE ?= 0x86500000 -BL32_BASE ?= 0x86000000 -PRELOADED_BL33_BASE ?= 0x8f600000 - # Have different sections for code and rodata SEPARATE_CODE_AND_RODATA := 1 @@ -65,5 +59,11 @@ ERRATA_A53_843419 := 1 ERRATA_A53_855873 := 0 # Workaround works only for >= r0p3 ERRATA_A53_1530924 := 1 +# Build config flags +# ------------------ +BL31_BASE ?= 0x86500000 +BL32_BASE ?= BL31_LIMIT +PRELOADED_BL33_BASE ?= 0x8f600000 + $(eval $(call add_define,BL31_BASE)) $(eval $(call add_define,BL32_BASE))