Merge tag 'lsk-v3.10-15.04-android'

[firefly-linux-kernel-4.4.55.git] / arch / arm / mm / Kconfig

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 36e9f24e03b0213cb1682ab131a0f0b9c2176998..a925de4f51b117cd7705e9b68b2885301e61a8ca 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -596,6 +596,16 @@ config IO_36
 
 comment "Processor Features"
 
+config ARM_TRUSTZONE
+       bool "Support TrustZone-enabled Trusted Execution Environment"
+       default n
+       help
+         Select if you want a kernel to be executed at non-secure world.
+         This option should be used with related secure bootloader and
+         TrustZone software.
+
+         If you don't know about TrustZone, say 'N'.
+
 config ARM_LPAE
        bool "Support for the Large Physical Address Extension"
        depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \
@@ -778,6 +788,7 @@ config NEED_KUSER_HELPERS
 
 config KUSER_HELPERS
        bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
+       depends on MMU
        default y
        help
          Warning: disabling this option may break user programs.