xilinx: Remove scriptaddr from config files and move it to DT

Define bootscript address in RAM via DT property and remove it from config
file. Adding default value to common DTSI. Platform DT description can
remove this property or rewrite it.

In Zynq case scriptaddr property was defined twice for no reason.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/d36ffeb00ed8f0ca4bb67d4983d1852d01ade637.1691067102.git.michal.simek@amd.com

diff --git a/arch/arm/dts/xilinx-versal-net-virt.dts b/arch/arm/dts/xilinx-versal-net-virt.dts
index c99257cb0834d35e5439e744507b931388d5feed..f5eca843b646b7f888597d250d22a11279a96d85 100644 (file)
--- a/arch/arm/dts/xilinx-versal-net-virt.dts
+++ b/arch/arm/dts/xilinx-versal-net-virt.dts
@@ -8,4 +8,10 @@
 /dts-v1/;
 
 / {
+       options {
+               u-boot {
+                       compatible = "u-boot,config";
+                       bootscr-address = /bits/ 64 <0x20000000>;
+               };
+       };
 };

diff --git a/arch/arm/dts/xilinx-versal-virt.dts b/arch/arm/dts/xilinx-versal-virt.dts
index 733e532f9874e8f93e3bda5f14684c9af6baccce..3ea3cb1bdd3c18cc70f110a3bde46da01ed58d2c 100644 (file)
--- a/arch/arm/dts/xilinx-versal-virt.dts
+++ b/arch/arm/dts/xilinx-versal-virt.dts
@@ -8,4 +8,10 @@
 /dts-v1/;
 
 / {
+       options {
+               u-boot {
+                       compatible = "u-boot,config";
+                       bootscr-address = /bits/ 64 <0x20000000>;
+               };
+       };
 };

diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
index 8c6eafec1d4ee24f73de6956df749f535c34d399..fb61fe98e3dead2abe2998f9ef69da2e904215f8 100644 (file)
--- a/arch/arm/dts/zynq-7000.dtsi
+++ b/arch/arm/dts/zynq-7000.dtsi
@@ -11,6 +11,13 @@
        #size-cells = <1>;
        compatible = "xlnx,zynq-7000";
 
+       options {
+               u-boot {
+                       compatible = "u-boot,config";
+                       bootscr-address = /bits/ 64 <0x3000000>;
+               };
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 1632be843b156ad7a942fd8a1cfb8a46cb652ded..355f360281b5bb301343217622aba351f458f8ea 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -22,6 +22,13 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
+       options {
+               u-boot {
+                       compatible = "u-boot,config";
+                       bootscr-address = /bits/ 64 <0x20000000>;
+               };
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index a403999977e450235173a12b12a8b08030e916db..98792aba7ccec822d256d67c14084f7822bd7aba 100644 (file)
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -40,7 +40,6 @@
        "kernel_size_r=0x10000000\0" \
        "kernel_comp_addr_r=0x30000000\0" \
        "kernel_comp_size=0x3C00000\0" \
-       "scriptaddr=0x20000000\0" \
        "ramdisk_addr_r=0x02100000\0" \
        "script_size_f=0x80000\0"
 

diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h
index 613cce46f904c3095783f0d3af6bf5e6376dacc9..e17b44093548a70ba20a2758d2b86f539acecc54 100644 (file)
--- a/include/configs/xilinx_versal_net.h
+++ b/include/configs/xilinx_versal_net.h
@@ -54,7 +54,6 @@
        "kernel_size_r=0x10000000\0" \
        "kernel_comp_addr_r=0x30000000\0" \
        "kernel_comp_size=0x3C00000\0" \
-       "scriptaddr=0x20000000\0" \
        "ramdisk_addr_r=0x02100000\0" \
        "script_size_f=0x80000\0"
 

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 74264b7bee8bc5929ec6b95572282f4356771788..51f0a42534067253fe56e2556125e6853d8cdc34 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -57,7 +57,6 @@
        "kernel_size_r=0x10000000\0" \
        "kernel_comp_addr_r=0x30000000\0" \
        "kernel_comp_size=0x3C00000\0" \
-       "scriptaddr=0x20000000\0" \
        "ramdisk_addr_r=0x02100000\0" \
        "script_size_f=0x80000\0" \
        "stdin=serial\0" \

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index e372e903170a873f853d8f871bc9cace22b0a154..553bb1b45b69baa4852d2149a9fbad7d53bf587e 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -172,12 +172,10 @@
 /* Default environment */
 #ifndef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS \
-       "scriptaddr=0x20000\0"  \
        "script_size_f=0x40000\0"       \
        "fdt_addr_r=0x1f00000\0"        \
        "pxefile_addr_r=0x2000000\0"    \
        "kernel_addr_r=0x2000000\0"     \
-       "scriptaddr=0x3000000\0"        \
        "ramdisk_addr_r=0x3100000\0"    \
        BOOTENV
 #endif