diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mmp/Kconfig | 7 | ||||
-rw-r--r-- | arch/arm/mm/Kconfig | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index 5772e592fe6..67793a69027 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig | |||
@@ -50,6 +50,7 @@ config MACH_BROWNSTONE | |||
50 | 50 | ||
51 | config MACH_FLINT | 51 | config MACH_FLINT |
52 | bool "Marvell's Flint Development Platform" | 52 | bool "Marvell's Flint Development Platform" |
53 | depends on !CPU_MOHAWK | ||
53 | select CPU_MMP2 | 54 | select CPU_MMP2 |
54 | help | 55 | help |
55 | Say 'Y' here if you want to support the Marvell MMP2-based | 56 | Say 'Y' here if you want to support the Marvell MMP2-based |
@@ -60,6 +61,7 @@ config MACH_FLINT | |||
60 | 61 | ||
61 | config MACH_MARVELL_JASPER | 62 | config MACH_MARVELL_JASPER |
62 | bool "Marvell's Jasper Development Platform" | 63 | bool "Marvell's Jasper Development Platform" |
64 | depends on !CPU_MOHAWK | ||
63 | select CPU_MMP2 | 65 | select CPU_MMP2 |
64 | help | 66 | help |
65 | Say 'Y' here if you want to support the Marvell MMP2-base | 67 | Say 'Y' here if you want to support the Marvell MMP2-base |
@@ -91,8 +93,7 @@ config CPU_PXA910 | |||
91 | 93 | ||
92 | config CPU_MMP2 | 94 | config CPU_MMP2 |
93 | bool | 95 | bool |
94 | select CPU_V6 | 96 | select CPU_PJ4 |
95 | select CPU_32v6K | ||
96 | help | 97 | help |
97 | Select code specific to MMP2. MMP2 is ARMv6 compatible. | 98 | Select code specific to MMP2. MMP2 is ARMv7 compatible. |
98 | endif | 99 | endif |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index ede1763429a..a099efed0e6 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -795,7 +795,7 @@ config CACHE_PL310 | |||
795 | 795 | ||
796 | config CACHE_TAUROS2 | 796 | config CACHE_TAUROS2 |
797 | bool "Enable the Tauros2 L2 cache controller" | 797 | bool "Enable the Tauros2 L2 cache controller" |
798 | depends on (ARCH_DOVE || ARCH_MMP) | 798 | depends on (ARCH_DOVE || ARCH_MMP || CPU_PJ4) |
799 | default y | 799 | default y |
800 | select OUTER_CACHE | 800 | select OUTER_CACHE |
801 | help | 801 | help |