summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2011-11-22 18:30:32 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2011-12-08 11:33:29 +0100
commit497b7e943d0dc5743454de56dcdb67352bbf96b2 (patch)
tree7c8b85aef41299cd50f4c3740ab89800f10f79ae /arch/arm/Kconfig
parentARM: LPAE: mark memory banks with start > ULONG_MAX as highmem (diff)
downloadlinux-497b7e943d0dc5743454de56dcdb67352bbf96b2.tar.xz
linux-497b7e943d0dc5743454de56dcdb67352bbf96b2.zip
ARM: LPAE: Add the Kconfig entries
This patch adds the ARM_LPAE and ARCH_PHYS_ADDR_T_64BIT Kconfig entries allowing LPAE support to be compiled into the kernel. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 44789eff983f..885c04e39400 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1959,7 +1959,7 @@ endchoice
config XIP_KERNEL
bool "Kernel Execute-In-Place from ROM"
- depends on !ZBOOT_ROM
+ depends on !ZBOOT_ROM && !ARM_LPAE
help
Execute-In-Place allows the kernel to run from non-volatile storage
directly addressable by the CPU, such as NOR flash. This saves RAM