From 300a012bc8f3aea7cbd30480a232e5f86acb9afc Mon Sep 17 00:00:00 2001
From: Nicolas Toromanoff <nicolas.toromanoff@st.com>
Date: Thu, 8 Oct 2020 12:57:06 +0200
Subject: [PATCH] fdts: stm32mp1: update BL32/BL32_DT load address

Invert position of BL32 and BL32_DT in memory, otherwise the BL32
BSS initialization overwrote DT area. With this inversion BL32 BSS
overwrite a no more used memory area.

Signed-off-by: Nicolas Toromanoff <nicolas.toromanoff@st.com>
Change-Id: I0a8cd0c64921d2813be4b31212510f53caea9158
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/tf-a/+/184834
Reviewed-by: CITOOLS <smet-aci-reviews@lists.codex.cro.st.com>
Reviewed-by: CIBUILD <smet-aci-builds@lists.codex.cro.st.com>
Reviewed-by: Yann GAUTIER <yann.gautier@st.com>
---
 fdts/stm32mp15-ddr-1g-fw-config.dts   | 4 ++--
 fdts/stm32mp15-ddr-512m-fw-config.dts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fdts/stm32mp15-ddr-1g-fw-config.dts b/fdts/stm32mp15-ddr-1g-fw-config.dts
index cf0e24db6..a271a7267 100644
--- a/fdts/stm32mp15-ddr-1g-fw-config.dts
+++ b/fdts/stm32mp15-ddr-1g-fw-config.dts
@@ -32,13 +32,13 @@
 		};
 #else
 		tos_fw {
-			load-address = <0x0 0x2FFC0000>;
+			load-address = <0x0 0x2FFC5000>;
 			max-size = <0x00019000>;
 			id = <BL32_IMAGE_ID>;
 		};
 
 		tos_fw-config {
-			load-address = <0x0 0x2FFD9000>;
+			load-address = <0x0 0x2FFC0000>;
 			max-size = <0x00005000>;
 			id = <TOS_FW_CONFIG_ID>;
 		};
diff --git a/fdts/stm32mp15-ddr-512m-fw-config.dts b/fdts/stm32mp15-ddr-512m-fw-config.dts
index acb4ed565..d5082df0b 100644
--- a/fdts/stm32mp15-ddr-512m-fw-config.dts
+++ b/fdts/stm32mp15-ddr-512m-fw-config.dts
@@ -32,13 +32,13 @@
 		};
 #else
 		tos_fw {
-			load-address = <0x0 0x2FFC0000>;
+			load-address = <0x0 0x2FFC5000>;
 			max-size = <0x00019000>;
 			id = <BL32_IMAGE_ID>;
 		};
 
 		tos_fw-config {
-			load-address = <0x0 0x2FFD9000>;
+			load-address = <0x0 0x2FFC0000>;
 			max-size = <0x00005000>;
 			id = <TOS_FW_CONFIG_ID>;
 		};
-- 
GitLab