ARM: mmp: select CPU_PJ4

Since CPU_PJ4 is shared between PXA95x and MMP2, select CPU_PJ4 in MMP2
configuration.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
index 5772e592fe611aac02fed96e7f9891a9f2c64e9d..67793a6902727eeb67fb53b5d688e2a738efc185 100644 (file)
--- a/arch/arm/mach-mmp/Kconfig
+++ b/arch/arm/mach-mmp/Kconfig
@@ -50,6 +50,7 @@ config MACH_BROWNSTONE
 
 config MACH_FLINT
        bool "Marvell's Flint Development Platform"
+       depends on !CPU_MOHAWK
        select CPU_MMP2
        help
          Say 'Y' here if you want to support the Marvell MMP2-based
@@ -60,6 +61,7 @@ config MACH_FLINT
 
 config MACH_MARVELL_JASPER
        bool "Marvell's Jasper Development Platform"
+       depends on !CPU_MOHAWK
        select CPU_MMP2
        help
          Say 'Y' here if you want to support the Marvell MMP2-base
@@ -91,8 +93,7 @@ config CPU_PXA910
 
 config CPU_MMP2
        bool
-       select CPU_V6
-       select CPU_32v6K
+       select CPU_PJ4
        help
-         Select code specific to MMP2. MMP2 is ARMv6 compatible.
+         Select code specific to MMP2. MMP2 is ARMv7 compatible.
 endif

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index ede1763429a338a1ca1200a3a97c5f5d6a3d8b43..a099efed0e63540fce62f98aac4290da87156d8f 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -795,7 +795,7 @@ config CACHE_PL310
 
 config CACHE_TAUROS2
        bool "Enable the Tauros2 L2 cache controller"
-       depends on (ARCH_DOVE || ARCH_MMP)
+       depends on (ARCH_DOVE || ARCH_MMP || CPU_PJ4)
        default y
        select OUTER_CACHE
        help