summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-12-11 12:22:26 +0900
committerTom Rini <trini@konsulko.com>2016-01-20 10:19:35 -0500
commitb766476df09b10c244bcf6f35a667d44f618a561 (patch)
tree56d89b43a2746c7baa4cb2c2944c0762313fdc9f
parent61a4392a363875d393b520faa3031c46e96887fe (diff)
downloadu-boot-imx-b766476df09b10c244bcf6f35a667d44f618a561.zip
u-boot-imx-b766476df09b10c244bcf6f35a667d44f618a561.tar.gz
u-boot-imx-b766476df09b10c244bcf6f35a667d44f618a561.tar.bz2
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>
-rw-r--r--Kconfig2
-rw-r--r--board/xilinx/microblaze-generic/config.mk2
-rw-r--r--configs/microblaze-generic_defconfig1
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 54aa3ef..ed336e6 100644
--- 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> "