summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-01-27 14:22:17 +0100
committerArnd Bergmann <arnd@arndb.de>2015-02-18 12:20:25 +0100
commit99bd667a34f4cd3878d4458d75517a430cf40974 (patch)
treec7cc48d08920e324b2bcdca4bc75f0974fdbdaae /arch/arm/mach-davinci/Kconfig
parent31612d6484271ad6d4db5b4c8df366f35bded928 (diff)
ARM: davinci: multi-soc kernels require AUTO_ZRELADDR
The davinci DA8xx and DMx families have incompatible zreladdr settings, and attempting to build a kernel with both enabled results in an error unless AUTO_ZRELADDR is set: multiple zreladdrs: 0xc0008000 0x80008000 This needs CONFIG_AUTO_ZRELADDR to be set This patch changes Kconfig to make the two families mutually exclusive when this is unset. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/Kconfig')
-rw-r--r--arch/arm/mach-davinci/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 584e8d4e2892..cd30f6f5f2ff 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -32,12 +32,14 @@ config ARCH_DAVINCI_DM646x
config ARCH_DAVINCI_DA830
bool "DA830/OMAP-L137/AM17x based system"
+ depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR
select ARCH_DAVINCI_DA8XX
select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1
select CP_INTC
config ARCH_DAVINCI_DA850
bool "DA850/OMAP-L138/AM18x based system"
+ depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR
select ARCH_DAVINCI_DA8XX
select CP_INTC