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 08c9fe917d1fec0c681ba2ab8ea4897dcd026e29..a925de4f51b117cd7705e9b68b2885301e61a8ca 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -436,7 +436,6 @@ config CPU_32v5
 
 config CPU_32v6
        bool
-       select CPU_USE_DOMAINS if CPU_V6 && MMU
        select TLS_REG_EMUL if !CPU_32v6K && !MMU
 
 config CPU_32v6K
@@ -597,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 && \
@@ -651,7 +660,7 @@ config ARM_VIRT_EXT
 
 config SWP_EMULATE
        bool "Emulate SWP/SWPB instructions"
-       depends on !CPU_USE_DOMAINS && CPU_V7
+       depends on CPU_V7
        default y if SMP
        select HAVE_PROC_CPU if PROC_FS
        help
@@ -779,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.
@@ -932,3 +942,9 @@ config ARCH_HAS_BARRIERS
        help
          This option allows the use of custom mandatory barriers
          included via the mach/barriers.h file.
+
+config ARCH_SUPPORTS_BIG_ENDIAN
+       bool
+       help
+         This option specifies the architecture can support big endian
+         operation.