ARM: mvebu: make CPU_PJ4B selection a per-SoC choice

Until now, the CPU_PJ4B Kconfig option was selected by
MACH_ARMADA_MVEBU, i.e for all Armada MVEBU SOCs. In preparation to
the introduction of Cortex-A9 based Armada MVEBU SOCs, this selection
is moved down to the Armada 370 and Armada XP specific options.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index eac46054a0ef6a0be0219d39b3581dd68e7f131c..d9d32aa077f89917f1d2f4ca68d784355538f25d 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -26,11 +26,11 @@ config MACH_MVEBU_V7
        select ARMADA_370_XP_TIMER
        select HAVE_SMP
        select CACHE_L2X0
-       select CPU_PJ4B
 
 config MACH_ARMADA_370
        bool "Marvell Armada 370 boards"
        select ARMADA_370_CLK
+       select CPU_PJ4B
        select MACH_MVEBU_V7
        select PINCTRL_ARMADA_370
        help
@@ -40,6 +40,7 @@ config MACH_ARMADA_370
 config MACH_ARMADA_XP
        bool "Marvell Armada XP boards"
        select ARMADA_XP_CLK
+       select CPU_PJ4B
        select MACH_MVEBU_V7
        select PINCTRL_ARMADA_XP
        help