arm: dts: k3: use SPL_TEXT_BASE for R5 SPL load address

The load address for the R5's SPL is defined in Kconfig by
SPL_TEXT_BASE. Rather than hard coding the load address which could
lead to hard to debug issues if this value is changed, just use the
SPL_TEXT_BASE value.

Reviewed-by: Andrew Davis <afd@ti.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
Reviewed-by: Neha Malcom Francis <n-francis@ti.com>

diff --git a/arch/arm/dts/k3-am625-phycore-som-binman.dtsi b/arch/arm/dts/k3-am625-phycore-som-binman.dtsi
index 6deebda..a9bd5a2 100644 (file)
--- a/arch/arm/dts/k3-am625-phycore-som-binman.dtsi
+++ b/arch/arm/dts/k3-am625-phycore-som-binman.dtsi
@@ -25,7 +25,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -69,7 +69,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -105,7 +105,7 @@
                        combined;
                        dm-data;
                        content-sbl = <&u_boot_spl_unsigned>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        content-sysfw = <&ti_fs_gp>;
                        load-sysfw = <0x40000>;
                        content-sysfw-data = <&combined_tifs_cfg_gp>;

diff --git a/arch/arm/dts/k3-am625-sk-binman.dtsi b/arch/arm/dts/k3-am625-sk-binman.dtsi
index 6822a5d..f743c43 100644 (file)
--- a/arch/arm/dts/k3-am625-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am625-sk-binman.dtsi
@@ -23,7 +23,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -67,7 +67,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -103,7 +103,7 @@
                        combined;
                        dm-data;
                        content-sbl = <&u_boot_spl_unsigned>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        content-sysfw = <&ti_fs_gp>;
                        load-sysfw = <0x40000>;
                        content-sysfw-data = <&combined_tifs_cfg_gp>;

diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
index bfbba28..65fef6e 100644 (file)
--- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
+++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
@@ -23,7 +23,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -67,7 +67,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -103,7 +103,7 @@
                        combined;
                        dm-data;
                        content-sbl = <&u_boot_spl_unsigned>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        content-sysfw = <&ti_fs_gp>;
                        load-sysfw = <0x40000>;
                        content-sysfw-data = <&combined_tifs_cfg_gp>;

diff --git a/arch/arm/dts/k3-am62a-phycore-som-binman.dtsi b/arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
index fd34010..9bcdf74 100644 (file)
--- a/arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
+++ b/arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
@@ -30,7 +30,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -74,7 +74,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -110,7 +110,7 @@
                        combined;
                        dm-data;
                        content-sbl = <&u_boot_spl_unsigned>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        content-sysfw = <&ti_fs_gp>;
                        load-sysfw = <0x40000>;
                        content-sysfw-data = <&combined_tifs_cfg_gp>;

diff --git a/arch/arm/dts/k3-am62a-sk-binman.dtsi b/arch/arm/dts/k3-am62a-sk-binman.dtsi
index 877a513..0685bdd 100644 (file)
--- a/arch/arm/dts/k3-am62a-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am62a-sk-binman.dtsi
@@ -27,7 +27,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -71,7 +71,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c3a800>;
@@ -107,7 +107,7 @@
                        combined;
                        dm-data;
                        content-sbl = <&u_boot_spl_unsigned>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        content-sysfw = <&ti_fs_gp>;
                        load-sysfw = <0x40000>;
                        content-sysfw-data = <&combined_tifs_cfg_gp>;

diff --git a/arch/arm/dts/k3-am62p-sk-binman.dtsi b/arch/arm/dts/k3-am62p-sk-binman.dtsi
index d65e5c4..feb59ed 100644 (file)
--- a/arch/arm/dts/k3-am62p-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am62p-sk-binman.dtsi
@@ -25,7 +25,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c4a800>;
@@ -72,7 +72,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_hs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_hs>;
                        content-dm-data = <&combined_dm_cfg_hs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c4a800>;

diff --git a/arch/arm/dts/k3-am62p5-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am62p5-verdin-wifi-dev-binman.dtsi
index 13fac18..b1591fa 100644 (file)
--- a/arch/arm/dts/k3-am62p5-verdin-wifi-dev-binman.dtsi
+++ b/arch/arm/dts/k3-am62p5-verdin-wifi-dev-binman.dtsi
@@ -25,7 +25,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c4a800>;
@@ -74,7 +74,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_hs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_hs>;
                        content-dm-data = <&combined_dm_cfg_hs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c4a800>;

diff --git a/arch/arm/dts/k3-am67a-beagley-ai-u-boot.dtsi b/arch/arm/dts/k3-am67a-beagley-ai-u-boot.dtsi
index 2a0023f..0e810e7 100644 (file)
--- a/arch/arm/dts/k3-am67a-beagley-ai-u-boot.dtsi
+++ b/arch/arm/dts/k3-am67a-beagley-ai-u-boot.dtsi
@@ -75,7 +75,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c7a800>;
@@ -125,7 +125,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c7a800>;

diff --git a/arch/arm/dts/k3-j7200-binman.dtsi b/arch/arm/dts/k3-j7200-binman.dtsi
index b74bd16..b4e0ce8 100644 (file)
--- a/arch/arm/dts/k3-j7200-binman.dtsi
+++ b/arch/arm/dts/k3-j7200-binman.dtsi
@@ -24,7 +24,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_sr1>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_sr1>;
                        content-dm-data = <&combined_dm_cfg_sr1>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x7f000>;
                        load-dm-data = <0x41c80000>;
@@ -67,7 +67,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x7f000>;
                        load-dm-data = <0x41c80000>;
@@ -112,7 +112,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs_sr1>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs_sr1>;
                        content-dm-data = <&combined_dm_cfg_fs_sr1>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x7f000>;
                        load-dm-data = <0x41c80000>;
@@ -155,7 +155,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x7f000>;
                        load-dm-data = <0x41c80000>;
@@ -192,7 +192,7 @@
                        combined;
                        dm-data;
                        content-sbl = <&u_boot_spl_unsigned>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        content-sysfw = <&ti_fs_gp>;
                        load-sysfw = <0x40000>;
                        content-sysfw-data = <&combined_tifs_cfg_gp>;

diff --git a/arch/arm/dts/k3-j721s2-binman.dtsi b/arch/arm/dts/k3-j721s2-binman.dtsi
index 4f524e5..f79b3e5 100644 (file)
--- a/arch/arm/dts/k3-j721s2-binman.dtsi
+++ b/arch/arm/dts/k3-j721s2-binman.dtsi
@@ -23,7 +23,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x41c80000>;
@@ -66,7 +66,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x41c80000>;
@@ -103,7 +103,7 @@
                        combined;
                        dm-data;
                        content-sbl = <&u_boot_spl_unsigned>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        content-sysfw = <&ti_fs_gp>;
                        load-sysfw = <0x40000>;
                        content-sysfw-data = <&combined_tifs_cfg_gp>;

diff --git a/arch/arm/dts/k3-j722s-binman.dtsi b/arch/arm/dts/k3-j722s-binman.dtsi
index 57e966e..278b7bf 100644 (file)
--- a/arch/arm/dts/k3-j722s-binman.dtsi
+++ b/arch/arm/dts/k3-j722s-binman.dtsi
@@ -23,7 +23,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c7a800>;
@@ -73,7 +73,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x43c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x67000>;
                        load-dm-data = <0x43c7a800>;

diff --git a/arch/arm/dts/k3-j784s4-binman.dtsi b/arch/arm/dts/k3-j784s4-binman.dtsi
index a7ce1ee..34b2cc1 100644 (file)
--- a/arch/arm/dts/k3-j784s4-binman.dtsi
+++ b/arch/arm/dts/k3-j784s4-binman.dtsi
@@ -27,7 +27,7 @@
                        content-sysfw-data = <&combined_tifs_cfg>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert>;
                        content-dm-data = <&combined_dm_cfg>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x66800>;
                        load-dm-data = <0x41c80000>;
@@ -74,7 +74,7 @@
                        content-sysfw-data = <&combined_tifs_cfg_fs>;
                        content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
                        content-dm-data = <&combined_dm_cfg_fs>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        load-sysfw = <0x40000>;
                        load-sysfw-data = <0x66800>;
                        load-dm-data = <0x41c80000>;
@@ -114,7 +114,7 @@
                        combined;
                        dm-data;
                        content-sbl = <&u_boot_spl_unsigned>;
-                       load = <0x41c00000>;
+                       load = <CONFIG_SPL_TEXT_BASE>;
                        content-sysfw = <&ti_fs_gp>;
                        load-sysfw = <0x40000>;
                        content-sysfw-data = <&combined_tifs_cfg_gp>;