ARM: davinci: DA8xx+DMx combined kernels need PATCH_PHYS_VIRT

We already forbid that combination when AUTO_ZRELADDR is disabled,
for the same reason that the two have their RAM at different
physical addresses as seen from the CPU.

This does the same change for PATCH_PHYS_VIRT: if you disable
either of the options, Kconfig now enforces that you have to
pick one or the other SoC family.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4f799e567fc870502ae147f3c26c5bb402315a9d..498dc4cf347cab4faeb92597080feb7d597d82e7 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -623,6 +623,7 @@ config ARCH_DAVINCI
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
+       select CPU_ARM926T
        select GENERIC_ALLOCATOR
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index de45db23f03723d5a7f7ac9cfe43a67761a561cd..01574da3860be1171cd10c4c891cc59be70dad86 100644 (file)
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -9,7 +9,6 @@ config CP_INTC
 
 config ARCH_DAVINCI_DMx
        bool
-       select CPU_ARM926T
 
 menu "TI DaVinci Implementations"
 
@@ -32,7 +31,7 @@ config ARCH_DAVINCI_DM646x
 
 config ARCH_DAVINCI_DA830
        bool "DA830/OMAP-L137/AM17x based system"
-       depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR
+       depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)
        select ARCH_DAVINCI_DA8XX
        # needed on silicon revs 1.0, 1.1:
        select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
@@ -40,13 +39,12 @@ config ARCH_DAVINCI_DA830
 
 config ARCH_DAVINCI_DA850
        bool "DA850/OMAP-L138/AM18x based system"
-       depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR
+       depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT)
        select ARCH_DAVINCI_DA8XX
        select CP_INTC
 
 config ARCH_DAVINCI_DA8XX
        bool
-       select CPU_ARM926T
 
 config ARCH_DAVINCI_DM365
        bool "DaVinci 365 based system"