From 2e608f0e3389ab6c4b24d72ba0f5788dc433f3bb Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Wed, 24 Nov 2010 11:54:21 +0800 Subject: [PATCH] --- yaml --- r: 225959 b: refs/heads/master c: 3f408fa071418183742110f7314d6b596916e31e h: refs/heads/master i: 225957: efbd1de25974a45b4b0e31851ed1ecb3908c0697 225955: c17e7da48026845d343f6443217a9896f9456e80 225951: 1f2af3de50ca526bfd10b99b04eabde4e69eeaab v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mmp/Kconfig | 7 ++++--- trunk/arch/arm/mm/Kconfig | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1174fc95dce6..86dd8a4b00b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9b5ef47dc9d154a79f320eeaddc4bc9684ae1ea +refs/heads/master: 3f408fa071418183742110f7314d6b596916e31e diff --git a/trunk/arch/arm/mach-mmp/Kconfig b/trunk/arch/arm/mach-mmp/Kconfig index 5772e592fe61..67793a690272 100644 --- a/trunk/arch/arm/mach-mmp/Kconfig +++ b/trunk/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/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig index ede1763429a3..a099efed0e63 100644 --- a/trunk/arch/arm/mm/Kconfig +++ b/trunk/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