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

[Michal Simek]

On 8/3/23 14:51, Michal Simek wrote:
> 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 at amd.com>
> ---
> 
> The patch is based on
> https://lore.kernel.org/r/b37aec1460d93727a9065766aa5f50fa356ae5aa.1690873880.git.michal.simek@amd.com
> and
> https://lore.kernel.org/r/b77352af92102dfad2e12a49a7680f5f64f8ee31.1690873880.git.michal.simek@amd.com
> ---
>   arch/arm/dts/xilinx-versal-net-virt.dts | 6 ++++++
>   arch/arm/dts/xilinx-versal-virt.dts     | 6 ++++++
>   arch/arm/dts/zynq-7000.dtsi             | 7 +++++++
>   arch/arm/dts/zynqmp.dtsi                | 7 +++++++
>   include/configs/xilinx_versal.h         | 1 -
>   include/configs/xilinx_versal_net.h     | 1 -
>   include/configs/xilinx_zynqmp.h         | 1 -
>   include/configs/zynq-common.h           | 2 --
>   8 files changed, 26 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/dts/xilinx-versal-net-virt.dts b/arch/arm/dts/xilinx-versal-net-virt.dts
> index c99257cb0834..f5eca843b646 100644
> --- 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 733e532f9874..3ea3cb1bdd3c 100644
> --- 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 8c6eafec1d4e..fb61fe98e3de 100644
> --- 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 1632be843b15..355f360281b5 100644
> --- 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 a403999977e4..98792aba7cce 100644
> --- 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 613cce46f904..e17b44093548 100644
> --- 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 74264b7bee8b..51f0a4253406 100644
> --- 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 e372e903170a..553bb1b45b69 100644
> --- 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

Applied.
M