summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2015-07-23 11:56:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-07-24 09:25:17 +0200
commitb560c2b45d8589340a04ae3eb9b918050e471d5d (patch)
tree2500d2f2f078cc3b28a5fa58b35cb50137544370 /arch
parent9c3395c384830fd58106f5b022940342f8ce5997 (diff)
downloadbarebox-b560c2b45d8589340a04ae3eb9b918050e471d5d.tar.gz
barebox-b560c2b45d8589340a04ae3eb9b918050e471d5d.tar.xz
ARM: pxa: move mainstone 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 <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/mainstone_defconfig1
-rw-r--r--arch/arm/mach-pxa/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig
index 946902d200..1e735d4a6d 100644
--- a/arch/arm/configs/mainstone_defconfig
+++ b/arch/arm/configs/mainstone_defconfig
@@ -7,7 +7,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 2b7f631757..54094f4ca0 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -5,6 +5,7 @@ config ARCH_TEXT_BASE
default 0xa0000000 if MACH_MIOA701
default 0xa3f00000 if MACH_PCM027
default 0xa3d00000 if MACH_LUBBOCK
+ default 0xa3d00000 if MACH_MAINSTONE
default 0x83f00000 if MACH_ZYLONITE
# ----------------------------------------------------------