xilinx: Merge together BOOT_SCRIPT_OFFSET between MB and ARM

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

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

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 2755cce884c5d881efe26ec6a61da1aadb820b75..99a17bccb38884a4c38c17cec4298c142682d490 100644 (file)
--- 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 51f6d2bac8adba08d1c11480e3c8bfc4a45c8de2..64507b5d843857bad90ffd6092b8f7c178c666c2 100644 (file)
--- 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 7a97211a1ecdabd80438390fe5ee7e171c07920d..f2fa0f72b13f46ac7ba24b31fcac752266e7c7e3 100644 (file)
--- 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