This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 787daaa..f0a8782 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -14,7 +14,6 @@ config CPU_ARM610
        depends on ARCH_RPC
        select CPU_32v3
        select CPU_CACHE_V3
-       select CPU_CACHE_VIVT
        select CPU_COPY_V3
        select CPU_TLB_V3
        help
@@ -30,7 +29,6 @@ config CPU_ARM710
        default y if ARCH_CLPS7500
        select CPU_32v3
        select CPU_CACHE_V3
-       select CPU_CACHE_VIVT
        select CPU_COPY_V3
        select CPU_TLB_V3
        help
@@ -49,7 +47,6 @@ config CPU_ARM720T
        select CPU_32v4
        select CPU_ABRT_LV4T
        select CPU_CACHE_V4
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WT
        select CPU_TLB_V4WT
        help
@@ -67,7 +64,6 @@ config CPU_ARM920T
        select CPU_32v4
        select CPU_ABRT_EV4T
        select CPU_CACHE_V4WT
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB
        select CPU_TLB_V4WBI
        help
@@ -88,7 +84,6 @@ config CPU_ARM922T
        select CPU_32v4
        select CPU_ABRT_EV4T
        select CPU_CACHE_V4WT
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB
        select CPU_TLB_V4WBI
        help
@@ -107,7 +102,6 @@ config CPU_ARM925T
        select CPU_32v4
        select CPU_ABRT_EV4T
        select CPU_CACHE_V4WT
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB
        select CPU_TLB_V4WBI
        help
@@ -121,11 +115,10 @@ config CPU_ARM925T
 # ARM926T
 config CPU_ARM926T
        bool "Support ARM926T processor" if ARCH_INTEGRATOR
-       depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP1610 || ARCH_OMAP5912
-       default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB
+       depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_OMAP730 || ARCH_OMAP1610 || ARCH_OMAP5912
+       default y if ARCH_VERSATILE_PB
        select CPU_32v5
        select CPU_ABRT_EV5TJ
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB
        select CPU_TLB_V4WBI
        help
@@ -143,7 +136,6 @@ config CPU_ARM1020
        select CPU_32v5
        select CPU_ABRT_EV4T
        select CPU_CACHE_V4WT
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB
        select CPU_TLB_V4WBI
        help
@@ -160,7 +152,6 @@ config CPU_ARM1020E
        select CPU_32v5
        select CPU_ABRT_EV4T
        select CPU_CACHE_V4WT
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB
        select CPU_TLB_V4WBI
        depends on n
@@ -171,7 +162,6 @@ config CPU_ARM1022
        depends on ARCH_INTEGRATOR
        select CPU_32v5
        select CPU_ABRT_EV4T
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB # can probably do better
        select CPU_TLB_V4WBI
        help
@@ -188,7 +178,6 @@ config CPU_ARM1026
        depends on ARCH_INTEGRATOR
        select CPU_32v5
        select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB # can probably do better
        select CPU_TLB_V4WBI
        help
@@ -206,7 +195,6 @@ config CPU_SA110
        select CPU_32v4 if !ARCH_RPC
        select CPU_ABRT_EV4
        select CPU_CACHE_V4WB
-       select CPU_CACHE_VIVT
        select CPU_COPY_V4WB
        select CPU_TLB_V4WB
        help
@@ -226,7 +214,6 @@ config CPU_SA1100
        select CPU_32v4
        select CPU_ABRT_EV4
        select CPU_CACHE_V4WB
-       select CPU_CACHE_VIVT
        select CPU_TLB_V4WB
        select CPU_MINICACHE
 
@@ -237,7 +224,6 @@ config CPU_XSCALE
        default y
        select CPU_32v5
        select CPU_ABRT_EV5T
-       select CPU_CACHE_VIVT
        select CPU_TLB_V4WBI
        select CPU_MINICACHE
 
@@ -248,7 +234,6 @@ config CPU_V6
        select CPU_32v6
        select CPU_ABRT_EV6
        select CPU_CACHE_V6
-       select CPU_CACHE_VIPT
        select CPU_COPY_V6
        select CPU_TLB_V6
 
@@ -301,12 +286,6 @@ config CPU_CACHE_V4WB
 config CPU_CACHE_V6
        bool
 
-config CPU_CACHE_VIVT
-       bool
-
-config CPU_CACHE_VIPT
-       bool
-
 # The copy-page model
 config CPU_COPY_V3
        bool