arm: imx: mx28: Move MX28 selection to Kconfig

The motivation for moving MX28 selection to Kconfig is to be able
to better handle NAND MXS selection through Kconfig.

This selection method also aligns with the way other i.MX SoCs are
selected in U-Boot.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

2 files changed, 49 insertions, 43 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index af2608768f..0956d41f52 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -396,37 +396,6 @@ config TARGET_APF27
 	select CPU_ARM926EJS
 	select SUPPORT_SPL
 
-config TARGET_APX4DEVKIT
-	bool "Support apx4devkit"
-	select CPU_ARM926EJS
-	select SUPPORT_SPL
-	select PL011_SERIAL
-
-config TARGET_M28EVK
-	bool "Support m28evk"
-	select CPU_ARM926EJS
-	select SUPPORT_SPL
-	select PL011_SERIAL
-
-config TARGET_MX28EVK
-	bool "Support mx28evk"
-	select CPU_ARM926EJS
-	select SUPPORT_SPL
-	select BOARD_EARLY_INIT_F
-	select PL011_SERIAL
-
-config TARGET_BG0900
-	bool "Support bg0900"
-	select CPU_ARM926EJS
-	select SUPPORT_SPL
-	select PL011_SERIAL
-
-config TARGET_SC_SPS_1
-	bool "Support sc_sps_1"
-	select CPU_ARM926EJS
-	select SUPPORT_SPL
-	select PL011_SERIAL
-
 config ORION5X
 	bool "Marvell Orion"
 	select CPU_ARM926EJS
@@ -651,6 +620,12 @@ config ARCH_MX25
 	select CPU_ARM926EJS
 	imply MXC_GPIO
 
+config ARCH_MX28
+	bool "NXP i.MX28 family"
+	select CPU_ARM926EJS
+	select PL011_SERIAL
+	select SUPPORT_SPL
+
 config ARCH_MX7ULP
         bool "NXP MX7ULP"
         select CPU_V7
@@ -772,12 +747,6 @@ config ARCH_SUNXI
 	imply SPL_SERIAL_SUPPORT
 	imply USB_GADGET
 
-config TARGET_TS4600
-	bool "Support TS4600"
-	select CPU_ARM926EJS
-	select SUPPORT_SPL
-	select PL011_SERIAL
-
 config ARCH_VF610
 	bool "Freescale Vybrid"
 	select CPU_V7
@@ -1299,7 +1268,6 @@ source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"
 
-source "board/aries/m28evk/Kconfig"
 source "board/bosch/shc/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
@@ -1307,7 +1275,6 @@ source "board/Marvell/gplugd/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
-source "board/bluegiga/apx4devkit/Kconfig"
 source "board/broadcom/bcm23550_w1d/Kconfig"
 source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
@@ -1330,7 +1297,6 @@ source "board/freescale/ls1046ardb/Kconfig"
 source "board/freescale/ls1012aqds/Kconfig"
 source "board/freescale/ls1012ardb/Kconfig"
 source "board/freescale/ls1012afrdm/Kconfig"
-source "board/freescale/mx28evk/Kconfig"
 source "board/freescale/mx31ads/Kconfig"
 source "board/freescale/mx31pdk/Kconfig"
 source "board/freescale/mx35pdk/Kconfig"
@@ -1344,8 +1310,6 @@ source "board/hisilicon/poplar/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep003x/Kconfig"
 source "board/phytec/pcm051/Kconfig"
-source "board/ppcag/bg0900/Kconfig"
-source "board/schulercontrol/sc_sps_1/Kconfig"
 source "board/silica/pengwyn/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
@@ -1357,7 +1321,6 @@ source "board/tcl/sl50/Kconfig"
 source "board/birdland/bav335x/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
-source "board/technologic/ts4600/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig
index f984545887..684d49e5db 100644
--- a/arch/arm/mach-imx/mxs/Kconfig
+++ b/arch/arm/mach-imx/mxs/Kconfig
@@ -33,3 +33,46 @@ source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/creative/xfi3/Kconfig"
 
 endif
+
+if ARCH_MX28
+
+config MX28
+	bool
+	default y
+
+choice
+	prompt "MX28 board select"
+	optional
+
+config TARGET_APX4DEVKIT
+	bool "Support apx4devkit"
+
+config TARGET_BG0900
+	bool "Support bg0900"
+
+config TARGET_M28EVK
+	bool "Support m28evk"
+
+config TARGET_MX28EVK
+	bool "Support mx28evk"
+	select BOARD_EARLY_INIT_F
+
+config TARGET_SC_SPS_1
+	bool "Support sc_sps_1"
+
+config TARGET_TS4600
+	bool "Support TS4600"
+
+endchoice
+
+config SYS_SOC
+	default "mxs"
+
+source "board/aries/m28evk/Kconfig"
+source "board/bluegiga/apx4devkit/Kconfig"
+source "board/freescale/mx28evk/Kconfig"
+source "board/ppcag/bg0900/Kconfig"
+source "board/schulercontrol/sc_sps_1/Kconfig"
+source "board/technologic/ts4600/Kconfig"
+
+endif