ARM: mvebu: Allow multiple SoCs

Now that the correct SoC specific memory fixup function is called
we can allow to select multiple SoCs in Kconfig.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

5 files changed, 19 insertions, 21 deletions

diff --git a/arch/arm/configs/globalscale_guruplug_defconfig b/arch/arm/configs/globalscale_guruplug_defconfig
index d21de45c5d..ee9cee6a9c 100644
--- a/arch/arm/configs/globalscale_guruplug_defconfig
+++ b/arch/arm/configs/globalscale_guruplug_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_MACH_GLOBALSCALE_GURUPLUG=y
 CONFIG_TEXT_BASE=0x2000000
 CONFIG_DEBUG_LL=y
 CONFIG_CMD_RESET=y
diff --git a/arch/arm/configs/globalscale_mirabox_defconfig b/arch/arm/configs/globalscale_mirabox_defconfig
index ed9d94d867..d295a94dd6 100644
--- a/arch/arm/configs/globalscale_mirabox_defconfig
+++ b/arch/arm/configs/globalscale_mirabox_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARCH_MVEBU=y
+CONFIG_MACH_GLOBALSCALE_MIRABOX=y
 CONFIG_AEABI=y
 CONFIG_DEBUG_LL=y
 CONFIG_CMD_LOADY=y
diff --git a/arch/arm/configs/plathome_openblocks_ax3_defconfig b/arch/arm/configs/plathome_openblocks_ax3_defconfig
index 95449c9741..fbe94c9275 100644
--- a/arch/arm/configs/plathome_openblocks_ax3_defconfig
+++ b/arch/arm/configs/plathome_openblocks_ax3_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_ARMADA_XP=y
+CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3=y
 CONFIG_AEABI=y
 CONFIG_DEBUG_LL=y
 CONFIG_CMD_LOADY=y
diff --git a/arch/arm/configs/solidrun_cubox_defconfig b/arch/arm/configs/solidrun_cubox_defconfig
index 7ba42a98ef..d09b035b43 100644
--- a/arch/arm/configs/solidrun_cubox_defconfig
+++ b/arch/arm/configs/solidrun_cubox_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_DOVE=y
+CONFIG_MACH_SOLIDRUN_CUBOX=y
 CONFIG_THUMB2_BAREBOX=y
 CONFIG_CMD_ARM_MMUINFO=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 3270f9265b..7c51264ce9 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -7,87 +7,81 @@ config ARCH_TEXT_BASE
 	default 0x2000000 if ARCH_DOVE
 	default 0x2000000 if ARCH_KIRKWOOD
 
-choice
-	prompt "Marvell EBU Processor"
-
 config ARCH_ARMADA_370
-	bool "Armada 370"
+	bool
 	select CPU_V7
 	select CLOCKSOURCE_MVEBU
 	select PINCTRL_ARMADA_370
 
 config ARCH_ARMADA_XP
-	bool "Armada XP"
+	bool
 	select CPU_V7
 	select CLOCKSOURCE_MVEBU
 	select PINCTRL_ARMADA_XP
 
 config ARCH_DOVE
-	bool "Dove 88AP510"
+	bool
 	select CPU_V7
 	select CLOCKSOURCE_ORION
 	select PINCTRL_DOVE
 
 config ARCH_KIRKWOOD
-	bool "Kirkwood"
+	bool
 	select CPU_FEROCEON
 	select CLOCKSOURCE_ORION
 	select PINCTRL_KIRKWOOD
 
-endchoice
-
 #
 # Armada 370 SoC boards
 #
 
-if ARCH_ARMADA_370
+comment "Armada 370 based boards"
 
 config MACH_GLOBALSCALE_MIRABOX
 	bool "Globalscale Mirabox"
-
-endif # ARCH_ARMADA_370
+	select ARCH_ARMADA_370
 
 #
 # Armada XP SoC boards
 #
 
-if ARCH_ARMADA_XP
+comment "Armada XP based boards"
 
 config MACH_PLATHOME_OPENBLOCKS_AX3
 	bool "PlatHome OpenBlocks AX3"
+	select ARCH_ARMADA_XP
 
 config MACH_MARVELL_ARMADA_XP_GP
 	bool "Marvell Armada XP GP"
-
-endif # ARCH_ARMADA_XP
+	select ARCH_ARMADA_XP
 
 #
 # Dove 88AP510 SoC boards
 #
 
-if ARCH_DOVE
+comment "Dove based boards"
 
 config MACH_SOLIDRUN_CUBOX
 	bool "SolidRun CuBox"
-
-endif # ARCH_DOVE
+	select ARCH_DOVE
 
 #
 # Kirkwood SoC boards
 #
 
-if ARCH_KIRKWOOD
+comment "Kirkwood based boards"
 
 config MACH_GLOBALSCALE_GURUPLUG
 	bool "Guruplug"
+	select ARCH_KIRKWOOD
 
 config MACH_PLATHOME_OPENBLOCKS_A6
 	bool "PlatHome OpenBlocks A6"
+	select ARCH_KIRKWOOD
 
 config MACH_USI_TOPKICK
 	bool "Topkick"
-
-endif # ARCH_KIRKWOOD
+	select ARCH_KIRKWOOD
 
 #
 # Common options