Merge branch 'master' into tk71

[mv-sheeva.git] / arch / arm / mach-mmp / Kconfig

diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
index 6ab843eaa35b507b5df31773ecc6fe5a60200b23..67793a6902727eeb67fb53b5d688e2a738efc185 100644 (file)
--- a/arch/arm/mach-mmp/Kconfig
+++ b/arch/arm/mach-mmp/Kconfig
@@ -37,25 +37,45 @@ config MACH_TTC_DKB
          Say 'Y' here if you want to support the Marvell PXA910-based
          TTC_DKB Development Board.
 
+config MACH_BROWNSTONE
+       bool "Marvell's Brownstone Development Platform"
+       depends on !CPU_MOHAWK
+       select CPU_MMP2
+       help
+         Say 'Y' here if you want to support the Marvell MMP2-based
+         Brown Development Platform.
+         MMP2-based board can't be co-existed with PXA168-based &
+         PXA910-based development board. Since MMP2 is compatible to
+         ARMv7 architecture.
+
 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
          Flint Development Platform.
          MMP2-based board can't be co-existed with PXA168-based &
          PXA910-based development board. Since MMP2 is compatible to
-         ARMv6 architecture.
+         ARMv7 architecture.
 
 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
          Jasper Development Platform.
          MMP2-based board can't be co-existed with PXA168-based &
          PXA910-based development board. Since MMP2 is compatible to
-         ARMv6 architecture.
+         ARMv7 architecture.
+
+config MACH_TETON_BGA
+       bool "Marvell's PXA168 Teton BGA Development Board"
+       select CPU_PXA168
+       help
+         Say 'Y' here if you want to support the Marvell PXA168-based
+         Teton BGA Development Board.
 
 endmenu
 
@@ -73,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