summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-02-17 15:23:21 +0100
committerJason Cooper <jason@lakedaemon.net>2014-02-22 01:41:08 +0100
commit798ec443ad30f1366ae6bff909eec77e8debffb4 (patch)
treec1f8552ce325cae38dfd673691d947a42a1a70e6 /arch/arm/mach-mvebu
parentARM: mvebu: rename DT machine structure for Armada 370/XP (diff)
downloadlinux-798ec443ad30f1366ae6bff909eec77e8debffb4.tar.xz
linux-798ec443ad30f1366ae6bff909eec77e8debffb4.zip
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>
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r--arch/arm/mach-mvebu/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index eac46054a0ef..d9d32aa077f8 100644
--- 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