diff mbox series

[v3,13/13] ARM: dts: stm32mp: dts: Don't remove OPTEE nodes for DK2 boards

Message ID 20211008195655.46046-14-mr.nuke.me@gmail.com
State Deferred
Delegated to: Tom Rini
Headers show
Series stm32mp1: Support falcon mode with OP-TEE payloads | expand

Commit Message

Alex G. Oct. 8, 2021, 7:56 p.m. UTC
To prepare for an OP-TEE payload, the spl_board_prepare_for_optee()
handler of STM32MP calls. stm32_init_tzc_for_optee(), which will
panic(). The reason for the panic is a failure to locate a valid
"/reserved-memory/optee" node in the devicetree.

This all occurs in SPL, so to re-add the OP-TEE memory nodes to the
SPL devicetree.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
---
 arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 3 ---
 1 file changed, 3 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
index fb60549f4d..fe347377ba 100644
--- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
@@ -27,10 +27,7 @@ 
 	config {
 		u-boot,mmc-env-partition = "ssbl";
 	};
-#endif
 
-#ifdef CONFIG_STM32MP15x_STM32IMAGE
-	/* only needed for boot with TF-A, witout FIP support */
 	firmware {
 		optee {
 			compatible = "linaro,optee-tz";