aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Murzin <[email protected]>2017-10-16 12:55:06 +0100
committerRussell King <[email protected]>2017-10-23 16:59:06 +0100
commitdf8089e7f343e3a6744df9d05f3e4c225deddadb (patch)
treef6408ce613981d9f47c40af7edd62d3c6db3a424
parenta0995c0805b63c930b99970f2c9d5e4f167ca65b (diff)
ARM: 8709/1: NOMMU: Disallow MPU for XIP
It seems that MPU never worked with XIP, so we just disallow such combination. Tested-by: Szemző András <[email protected]> Tested-by: Alexandre TORGUE <[email protected]> Tested-by: Benjamin Gaignard <[email protected]> Signed-off-by: Vladimir Murzin <[email protected]> Signed-off-by: Russell King <[email protected]>
-rw-r--r--arch/arm/Kconfig-nommu2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu
index b7576349528c..6d18395da24d 100644
--- a/arch/arm/Kconfig-nommu
+++ b/arch/arm/Kconfig-nommu
@@ -52,7 +52,7 @@ config REMAP_VECTORS_TO_RAM
config ARM_MPU
bool 'Use the ARM v7 PMSA Compliant MPU'
- depends on CPU_V7
+ depends on !XIP_KERNEL && CPU_V7
default y
help
Some ARM systems without an MMU have instead a Memory Protection