microblaze: move CONFIG_SYS_TEXT_BASE to defconfig

This is how CONFIG options are defined by Kconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/Kconfig b/Kconfig
index 9b07838764329918f59e083c2b32b4ff6dd55cf4..ee4e060c286fab19bb1d82f5cf56cde0b1116050 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -209,7 +209,7 @@ config SYS_EXTRA_OPTIONS
 
 config SYS_TEXT_BASE
        depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
-               (M68K && !TARGET_ASTRO_MCF5373L)
+               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE
        depends on !EFI_APP
        hex "Text Base"
        help

diff --git a/board/xilinx/microblaze-generic/config.mk b/board/xilinx/microblaze-generic/config.mk
index 36bdd963434d565ea1f6ed86c4f1133628eb94ed..95ef9c0f069060569d57c78d8632a7aa075dbf31 100644 (file)
--- a/board/xilinx/microblaze-generic/config.mk
+++ b/board/xilinx/microblaze-generic/config.mk
@@ -11,8 +11,6 @@
 #          the generated file from your Xilinx design flow.
 #
 
-CONFIG_SYS_TEXT_BASE = 0x29000000
-
 PLATFORM_CPPFLAGS += -mno-xl-soft-mul
 PLATFORM_CPPFLAGS += -mno-xl-soft-div
 PLATFORM_CPPFLAGS += -mxl-barrel-shift

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 54aa3ef3d26f36497c5370d85776ec3ea481241e..ed336e6bc4412dd7bf9c4063c6d057139fdfa977 100644 (file)
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -1,6 +1,7 @@
 CONFIG_MICROBLAZE=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_TARGET_MICROBLAZE_GENERIC=y
+CONFIG_SYS_TEXT_BASE=0x29000000
 CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="U-Boot-mONStR> "