diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2010-11-24 11:54:21 +0800 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-12-18 21:02:16 +0800 |
commit | 3f408fa071418183742110f7314d6b596916e31e (patch) | |
tree | d5ecfe564d7d53c436bf1989ff49ddb635e398ff /arch/arm/mach-mmp/Kconfig | |
parent | c9b5ef47dc9d154a79f320eeaddc4bc9684ae1ea (diff) | |
download | linux-stable-3f408fa071418183742110f7314d6b596916e31e.tar.gz linux-stable-3f408fa071418183742110f7314d6b596916e31e.tar.bz2 linux-stable-3f408fa071418183742110f7314d6b596916e31e.zip |
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>
Diffstat (limited to 'arch/arm/mach-mmp/Kconfig')
-rw-r--r-- | arch/arm/mach-mmp/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index 5772e592fe61..67793a690272 100644 --- 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 |