From aa5cae231fc5224d8cf32644b92ea80a7dd06047 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 7 Nov 2023 13:40:50 +0100 Subject: [PATCH] plat-stm32mp1: default disable reserved shared memory Changes stm32mp15 default configuration to not embed OP-TEE's reserved static shared memory. This change is aligned with a recent change in TF-A [1] that also default disables the related configuration switch. Note that TF-A/stm32mp1 deprecates this configuration in order to fully remove its support in the future [2]. Note that when CFG_CORE_RESERVED_SHM is disabled the default 2MB area is now used by OP-TEE as secure memory. Link: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=fb1d3bd9330ce70f735a344dd4223faffb261118 [1] Link: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=12e683a68049f6a3d0985a2cd1564e00115e809f [2] Acked-by: Jerome Forissier Acked-by: Gatien Chevallier Signed-off-by: Etienne Carriere --- core/arch/arm/plat-stm32mp1/conf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/arch/arm/plat-stm32mp1/conf.mk b/core/arch/arm/plat-stm32mp1/conf.mk index 058199a489c..c488c588741 100644 --- a/core/arch/arm/plat-stm32mp1/conf.mk +++ b/core/arch/arm/plat-stm32mp1/conf.mk @@ -129,7 +129,7 @@ $(call force,CFG_SECONDARY_INIT_CNTFRQ,y) $(call force,CFG_STM32MP1_SHARED_RESOURCES,y) $(call force,CFG_STM32_SAES,n) $(call force,CFG_STM32MP15_CLK,y) -CFG_CORE_RESERVED_SHM ?= y +CFG_CORE_RESERVED_SHM ?= n CFG_EXTERNAL_DT ?= y CFG_STM32_BSEC_SIP ?= y CFG_TEE_CORE_NB_CORE ?= 2