diff options
| -rw-r--r-- | board/xilinx/Kconfig | 9 | ||||
| -rw-r--r-- | board/xilinx/versal/board.c | 2 | ||||
| -rw-r--r-- | board/xilinx/zynq/board.c | 2 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 2 | ||||
| -rw-r--r-- | include/configs/xilinx_versal.h | 1 | ||||
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 1 | ||||
| -rw-r--r-- | include/configs/zynq-common.h | 1 |
7 files changed, 15 insertions, 3 deletions
diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig index cb272eafda..7833b11767 100644 --- a/board/xilinx/Kconfig +++ b/board/xilinx/Kconfig @@ -47,3 +47,12 @@ config XILINX_OF_BOARD_DTB_ADDR depends on OF_BOARD help Offset in the memory where the board configuration DTB is placed. + +config BOOT_SCRIPT_OFFSET + hex "Boot script offset" + depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL + default 0xFC0000 if ARCH_ZYNQ + default 0x3E80000 if ARCH_ZYNQMP + default 0x7F80000 if ARCH_VERSAL + help + Specifies distro boot script offset in NAND/NOR flash. diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 45724478a2..9fa9e76e66 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -203,6 +203,8 @@ int board_late_init(void) initrd_hi = round_down(initrd_hi, SZ_16M); env_set_addr("initrd_high", (void *)initrd_hi); + env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET); + return 0; } diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index cffabe825a..390d9482a7 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -76,6 +76,8 @@ int board_late_init(void) env_set("boot_targets", new_targets); + env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET); + return 0; } diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index b72eade43e..8bdc67748e 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -667,6 +667,8 @@ int board_late_init(void) initrd_hi = round_down(initrd_hi, SZ_16M); env_set_addr("initrd_high", (void *)initrd_hi); + env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET); + reset_reason(); return 0; diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index f426127edc..dec5001b5f 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -92,7 +92,6 @@ "kernel_size_r=0x10000000\0" \ "scriptaddr=0x20000000\0" \ "ramdisk_addr_r=0x02100000\0" \ - "script_offset_f=0x7F80000\0" \ "script_size_f=0x80000\0" #if defined(CONFIG_MMC_SDHCI_ZYNQ) diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index ee1ceebf12..9e08ed5108 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -114,7 +114,6 @@ "kernel_addr_r=0x18000000\0" \ "scriptaddr=0x20000000\0" \ "ramdisk_addr_r=0x02100000\0" \ - "script_offset_f=0x3e80000\0" \ "script_size_f=0x80000\0" \ #if defined(CONFIG_MMC_SDHCI_ZYNQ) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 189ca81bbe..22486c0e4c 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -194,7 +194,6 @@ "fdt_high=0x20000000\0" \ "initrd_high=0x20000000\0" \ "scriptaddr=0x20000\0" \ - "script_offset_f=0xFC0000\0" \ "script_size_f=0x40000\0" \ "fdt_addr_r=0x1f00000\0" \ "pxefile_addr_r=0x2000000\0" \ |