[U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig

Masahiro Yamada
2015-12-11T03:22:26Z

This is how CONFIG options are defined by Kconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Kconfig | 2 +-
board/xilinx/microblaze-generic/config.mk | 2 --
configs/microblaze-generic_defconfig | 1 +
3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Kconfig b/Kconfig
index 9b07838..ee4e060 100644
--- 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 36bdd96..95ef9c0 100644
--- 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 1fe2e0f..66d0e97 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -1,5 +1,6 @@
CONFIG_MICROBLAZE=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> "
--
1.9.1