1 files changed, 22 insertions, 4 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a7eb44a1955c..9746667c1973 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -46,10 +46,6 @@ config GENERIC_CLOCKEVENTS_BROADCAST
         depends on GENERIC_CLOCKEVENTS
         default y if SMP && !LOCAL_TIMERS
 
-config MMU
-        bool
-        default y
-
 config NO_IOPORT
         bool
 
@@ -188,6 +184,13 @@ source "kernel/Kconfig.freezer"
 
 menu "System Type"
 
+config MMU
+        bool "MMU-based Paged Memory Management Support"
+        default y
+        help
+          Select if you want MMU-based virtualised addressing space
+          support by paged memory management. If unsure, say 'Y'.
+
 choice
         prompt "ARM system type"
         default ARCH_VERSATILE
@@ -972,6 +975,21 @@ config HZ
         default AT91_TIMER_HZ if ARCH_AT91
         default 100
 
+config THUMB2_KERNEL
+        bool "Compile the kernel in Thumb-2 mode"
+        depends on CPU_V7 && EXPERIMENTAL
+        select AEABI
+        select ARM_ASM_UNIFIED
+        help
+          By enabling this option, the kernel will be compiled in
+          Thumb-2 mode. A compiler/assembler that understand the unified
+          ARM-Thumb syntax is needed.
+
+          If unsure, say N.
+
+config ARM_ASM_UNIFIED
+        bool
+
 config AEABI
         bool "Use the ARM EABI to compile the kernel"
         help