Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[linux-2.6-omap-h63xx.git] / arch / arm / mm / Kconfig

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 893d3fc8078f7ecba929b8e493173ad7553ea6ac..c0bfb8212b7742abda15da17ffd47b09c3fe24e2 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -28,6 +28,7 @@ config CPU_ARM610
 # ARM7TDMI
 config CPU_ARM7TDMI
        bool "Support ARM7TDMI processor"
+       depends on !MMU
        select CPU_32v4T
        select CPU_ABRT_LV4T
        select CPU_CACHE_V4
@@ -78,6 +79,7 @@ config CPU_ARM720T
 # ARM740T
 config CPU_ARM740T
        bool "Support ARM740T processor" if ARCH_INTEGRATOR
+       depends on !MMU
        select CPU_32v4T
        select CPU_ABRT_LV4T
        select CPU_CACHE_V3     # although the core is v4t
@@ -93,8 +95,9 @@ config CPU_ARM740T
 # ARM9TDMI
 config CPU_ARM9TDMI
        bool "Support ARM9TDMI processor"
+       depends on !MMU
        select CPU_32v4T
-       select CPU_ABRT_EV4T
+       select CPU_ABRT_NOMMU
        select CPU_CACHE_V4
        help
          A 32-bit RISC microprocessor based on the ARM9 processor core
@@ -187,8 +190,9 @@ config CPU_ARM926T
 # ARM940T
 config CPU_ARM940T
        bool "Support ARM940T processor" if ARCH_INTEGRATOR
+       depends on !MMU
        select CPU_32v4T
-       select CPU_ABRT_EV4T
+       select CPU_ABRT_NOMMU
        select CPU_CACHE_VIVT
        select CPU_CP15_MPU
        help
@@ -203,8 +207,9 @@ config CPU_ARM940T
 # ARM946E-S
 config CPU_ARM946E
        bool "Support ARM946E-S processor" if ARCH_INTEGRATOR
+       depends on !MMU
        select CPU_32v5
-       select CPU_ABRT_EV5T
+       select CPU_ABRT_NOMMU
        select CPU_CACHE_VIVT
        select CPU_CP15_MPU
        help
@@ -387,6 +392,9 @@ config CPU_32v6
        bool
 
 # The abort model
+config CPU_ABRT_NOMMU
+       bool
+
 config CPU_ABRT_EV4
        bool
 
@@ -516,6 +524,18 @@ config CPU_BIG_ENDIAN
          port must properly enable any big-endian related features
          of your chipset/board/processor.
 
+config CPU_HIGH_VECTOR
+       depends !MMU && CPU_CP15 && !CPU_ARM740T
+       bool "Select the High exception vector"
+       default n
+       help
+         Say Y here to select high exception vector(0xFFFF0000~).
+         The exception vector can be vary depending on the platform
+         design in nommu mode. If your platform needs to select
+         high exception vector, say Y.
+         Otherwise or if you are unsure, say N, and the low exception
+         vector (0x00000000~) will be used.
+
 config CPU_ICACHE_DISABLE
        bool "Disable I-Cache (I-bit)"
        depends on CPU_CP15 && !(CPU_ARM610 || CPU_ARM710 || CPU_ARM720T || CPU_ARM740T || CPU_XSCALE || CPU_XSC3)