From fb1d3bd9330ce70f735a344dd4223faffb261118 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Thu, 30 Jun 2022 14:03:20 +0200 Subject: [PATCH 1/2] feat(stm32mp15): disable OP-TEE shared memory OP-TEE manages its own memory, and can open some areas through TZC400. There is no need to configure this shared memory in TF-A. Just assure that CFG_CORE_RESERVED_SHM=n for OP-TEE compilation. Signed-off-by: Yann Gautier Change-Id: Ib54acd60d9ec243d6ef9cc6b74937b4183d9ffa5 --- plat/st/stm32mp1/platform.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plat/st/stm32mp1/platform.mk b/plat/st/stm32mp1/platform.mk index 194672ee5..ddc528925 100644 --- a/plat/st/stm32mp1/platform.mk +++ b/plat/st/stm32mp1/platform.mk @@ -62,7 +62,7 @@ STM32_HEADER_VERSION_MAJOR:= 1 STM32_HEADER_VERSION_MINOR:= 0 # Add OP-TEE reserved shared memory area in mapping -STM32MP15_OPTEE_RSV_SHM := 1 +STM32MP15_OPTEE_RSV_SHM := 0 $(eval $(call add_defines,STM32MP15_OPTEE_RSV_SHM)) STM32MP_CRYPTO_ROM_LIB := 1 From 12e683a68049f6a3d0985a2cd1564e00115e809f Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Thu, 30 Jun 2022 14:05:21 +0200 Subject: [PATCH 2/2] docs(stm32mp15): mark STM32MP15_OPTEE_RSV_SHM deprecated TF-A is no more in charge of configuring OP-TEE shared memory. Set the STM32MP15_OPTEE_RSV_SHM flag as deprecated (as well as the code depending on it). Signed-off-by: Yann Gautier Change-Id: I863d9a1e45e0bfc2f45d9bd84b90d626738934ab --- docs/about/release-information.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about/release-information.rst b/docs/about/release-information.rst index 9b51dabe5..3d2783dad 100644 --- a/docs/about/release-information.rst +++ b/docs/about/release-information.rst @@ -69,7 +69,7 @@ after which it will be removed. | | Date | after | | | | | Release | | +================================+=============+=========+=========================================================+ -| None at this time | | | | +| STM32MP15_OPTEE_RSV_SHM | 2.10 | 3.0 | OP-TEE manages its own memory on STM32MP15 | +--------------------------------+-------------+---------+---------------------------------------------------------+ Removal of Deprecated Drivers