[PATCH 09/10] xilinx: Merge together BOOT_SCRIPT_OFFSET between MB and ARM

Michal Simek michal.simek at xilinx.com
Thu Oct 22 12:32:21 CEST 2020


There is no reason not to use commong Kconfig by Microblaze too.

Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

 arch/microblaze/Kconfig                 | 1 +
 board/xilinx/Kconfig                    | 6 +++---
 board/xilinx/microblaze-generic/Kconfig | 5 -----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 2755cce884c5..99a17bccb388 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -23,6 +23,7 @@ config TARGET_MICROBLAZE_GENERIC
 
 endchoice
 
+source "board/xilinx/Kconfig"
 source "board/xilinx/microblaze-generic/Kconfig"
 
 endmenu
diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig
index 51f6d2bac8ad..64507b5d8438 100644
--- a/board/xilinx/Kconfig
+++ b/board/xilinx/Kconfig
@@ -50,12 +50,12 @@ config XILINX_OF_BOARD_DTB_ADDR
 
 config BOOT_SCRIPT_OFFSET
 	hex "Boot script offset"
-	depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
-	default 0xFC0000 if ARCH_ZYNQ
+	depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || MICROBLAZE
+	default 0xFC0000 if ARCH_ZYNQ || MICROBLAZE
 	default 0x3E80000 if ARCH_ZYNQMP
 	default 0x7F80000 if ARCH_VERSAL
 	help
-	   Specifies distro boot script offset in NAND/NOR flash.
+	   Specifies distro boot script offset in NAND/QSPI/NOR flash.
 
 config ZYNQ_MAC_IN_EEPROM
 	bool "Reading MAC address from EEPROM"
diff --git a/board/xilinx/microblaze-generic/Kconfig b/board/xilinx/microblaze-generic/Kconfig
index 7a97211a1ecd..f2fa0f72b13f 100644
--- a/board/xilinx/microblaze-generic/Kconfig
+++ b/board/xilinx/microblaze-generic/Kconfig
@@ -38,9 +38,4 @@ config XILINX_MICROBLAZE0_HW_VER
 	string "Core version number"
 	default "7.10.d"
 
-config BOOT_SCRIPT_OFFSET
-        hex "Boot script offset"
-        default 0xFC0000
-        help
-           Specifies distro boot script offset in NAND/QSPI flash.
 endif
-- 
2.28.0



More information about the U-Boot mailing list