diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-02-01 21:35:57 +0100 |
|---|---|---|
| committer |   Sekhar Nori <nsekhar@ti.com> | 2016-02-17 19:13:24 +0530 |
| commit | ce32c5c5a346a09ed938cdf01a000c885d699b27 (patch) | |
| tree | bcc633f8b155c5e92e54601fbb41c99f5f5c01c7 /arch/arm/mach-davinci | |
| parent | ARM: davinci: avoid unused mityomapl138_pn_info variable (diff) | |
| download | linux-dev-ce32c5c5a346a09ed938cdf01a000c885d699b27.tar.xz linux-dev-ce32c5c5a346a09ed938cdf01a000c885d699b27.zip | |
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>
Diffstat (limited to 'arch/arm/mach-davinci')
| -rw-r--r-- | arch/arm/mach-davinci/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index de45db23f037..01574da3860b 100644 --- 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" |