Embedded_Projects/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Michal Simek 2023-08-03 14:51:53 +02:00
parent b58ced5277
commit 2cf78f951b
8 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/dts/xilinx-versal-net-virt.dts
View File

@ -8,4 +8,10 @@
/dts-v1/;
/ {
options {
u-boot {
compatible = "u-boot,config";
bootscr-address = /bits/ 64 <0x20000000>;
};
};
};

6
arch/arm/dts/xilinx-versal-virt.dts
View File

@ -8,4 +8,10 @@
/dts-v1/;
/ {
options {
u-boot {
compatible = "u-boot,config";
bootscr-address = /bits/ 64 <0x20000000>;
};
};
};

7
arch/arm/dts/zynq-7000.dtsi
View File

@ -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>;

7
arch/arm/dts/zynqmp.dtsi
View File

@ -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>;

1
include/configs/xilinx_versal.h
View File

@ -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"

1
include/configs/xilinx_versal_net.h
View File

@ -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"

1
include/configs/xilinx_zynqmp.h
View File

@ -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" \

2
include/configs/zynq-common.h
View File

@ -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