[PATCH 4/8] ARM: mmp: select CPU_PJ4

[Eric Miao]

On Wed, Nov 24, 2010 at 11:54 AM, Haojian Zhuang
<haojian.zhuang at marvell.com> wrote:
> Since CPU_PJ4 is shared between PXA95x and MMP2, select CPU_PJ4 in MMP2
> configuration.
>
> Signed-off-by: Haojian Zhuang <haojian.zhuang at marvell.com>
> Cc: Eric Miao <eric.y.miao at gmail.com>

Applied.

> ---
>  arch/arm/mach-mmp/Kconfig |    7 ++++---
>  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 0711d3b..fd18d33 100644
> --- a/arch/arm/mach-mmp/Kconfig
> +++ b/arch/arm/mach-mmp/Kconfig
> @@ -39,6 +39,7 @@ config MACH_TTC_DKB
>
>  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
> @@ -49,6 +50,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
> @@ -80,8 +82,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/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
> index ede1763..a099efe 100644
> --- a/arch/arm/mm/Kconfig
> +++ b/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
> --
> 1.5.6.5
>
>