Skip to content

Commit

Permalink
ARM: mmp: select CPU_PJ4
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Haojian Zhuang authored and Eric Miao committed Dec 18, 2010
1 parent c9b5ef4 commit 3f408fa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions arch/arm/mach-mmp/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion arch/arm/mm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3f408fa

Please sign in to comment.