diff options
author | Michal Simek <michal.simek@amd.com> | 2023-08-03 14:51:53 +0200 |
---|---|---|
committer | Michal Simek <michal.simek@amd.com> | 2023-09-21 13:20:10 +0200 |
commit | 2cf78f951bc9bc2b549f311327e61b86bd86d175 (patch) | |
tree | ae50433206b4a3cb66bf1f95c1a05ba2a9f3e09f /include/configs | |
parent | b58ced5277edaa5213e4745cab829219f9a8a9c6 (diff) | |
download | u-boot-2cf78f951bc9bc2b549f311327e61b86bd86d175.zip u-boot-2cf78f951bc9bc2b549f311327e61b86bd86d175.tar.gz u-boot-2cf78f951bc9bc2b549f311327e61b86bd86d175.tar.bz2 |
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
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/xilinx_versal.h | 1 | ||||
-rw-r--r-- | include/configs/xilinx_versal_net.h | 1 | ||||
-rw-r--r-- | include/configs/xilinx_zynqmp.h | 1 | ||||
-rw-r--r-- | include/configs/zynq-common.h | 2 |
4 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index a403999..98792ab 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 613cce4..e17b440 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 74264b7..51f0a42 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 e372e90..553bb1b 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 |