summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2015-06-25 20:29:13 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-06-26 11:56:25 +0200
commitdc3dfc7286b3b711d5c10e5ecfcb282d169e7663 (patch)
treeee3be507fd394321a42f59768465bc74e8ecb393
parent8012bc199bce56a881aac8b9d21387d78506fe6e (diff)
downloadbarebox-dc3dfc7286b3b711d5c10e5ecfcb282d169e7663.tar.gz
barebox-dc3dfc7286b3b711d5c10e5ecfcb282d169e7663.tar.xz
ARM: pxa: move lubbock TEXTBASE to Kconfig
So we can drop it from the defconfig and stop bothering the user with this choice by default. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/configs/lubbock_defconfig1
-rw-r--r--arch/arm/mach-pxa/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig
index bf04fa3b18..224854c7cc 100644
--- a/arch/arm/configs/lubbock_defconfig
+++ b/arch/arm/configs/lubbock_defconfig
@@ -6,7 +6,6 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_ARM_UNWIND=y
# CONFIG_BANNER is not set
CONFIG_MMU=y
-CONFIG_TEXT_BASE=0xa3d00000
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0x80000
CONFIG_MALLOC_SIZE=0x1000000
CONFIG_EXPERIMENTAL=y
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 610fb1c80e..2b7f631757 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -4,6 +4,7 @@ config ARCH_TEXT_BASE
hex
default 0xa0000000 if MACH_MIOA701
default 0xa3f00000 if MACH_PCM027
+ default 0xa3d00000 if MACH_LUBBOCK
default 0x83f00000 if MACH_ZYLONITE
# ----------------------------------------------------------