commit df8089e7f343e3a6744df9d05f3e4c225deddadb
author Vladimir Murzin <vladimir.murzin@arm.com> Mon Oct 16 12:55:06 2017 +0100
committer Russell King <rmk+kernel@armlinux.org.uk> Mon Oct 23 16:59:06 2017 +0100
tree f6408ce613981d9f47c40af7edd62d3c6db3a424
parent a0995c0805b63c930b99970f2c9d5e4f167ca65b

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 <sza@esh.hu>
Tested-by: Alexandre TORGUE <alexandre.torgue@st.com>
Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

arch/arm/Kconfig-nommu

diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu
index b757634..6d18395 100644
--- a/arch/arm/Kconfig-nommu
+++ b/arch/arm/Kconfig-nommu
@@ -52,7 +52,7 @@
 
 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