arm: imx: mx23: Move MX23 selection to Kconfig

The motivation for moving MX23 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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ce9cee5ada9e07d87137bdad9a586761deb5ae6b..af2608768fa9f34fe3ff10382e3875a2692aede8 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -402,25 +402,12 @@ config TARGET_APX4DEVKIT
        select SUPPORT_SPL
        select PL011_SERIAL
 
-config TARGET_XFI3
-       bool "Support xfi3"
-       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_MX23EVK
-       bool "Support mx23evk"
-       select CPU_ARM926EJS
-       select SUPPORT_SPL
-       select BOARD_EARLY_INIT_F
-       select PL011_SERIAL
-
 config TARGET_MX28EVK
        bool "Support mx28evk"
        select CPU_ARM926EJS
@@ -428,25 +415,12 @@ config TARGET_MX28EVK
        select BOARD_EARLY_INIT_F
        select PL011_SERIAL
 
-config TARGET_MX23_OLINUXINO
-       bool "Support mx23_olinuxino"
-       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_SANSA_FUZE_PLUS
-       bool "Support sansa_fuze_plus"
-       select CPU_ARM926EJS
-       select SUPPORT_SPL
-       select PL011_SERIAL
-
 config TARGET_SC_SPS_1
        bool "Support sc_sps_1"
        select CPU_ARM926EJS
@@ -666,6 +640,12 @@ config ARCH_MX8M
        select DM
        select SUPPORT_SPL
 
+config ARCH_MX23
+       bool "NXP i.MX23 family"
+       select CPU_ARM926EJS
+       select PL011_SERIAL
+       select SUPPORT_SPL
+
 config ARCH_MX25
        bool "NXP MX25"
        select CPU_ARM926EJS
@@ -1275,6 +1255,8 @@ source "arch/arm/mach-imx/mx7ulp/Kconfig"
 
 source "arch/arm/mach-imx/mx8m/Kconfig"
 
+source "arch/arm/mach-imx/mxs/Kconfig"
+
 source "arch/arm/mach-omap2/Kconfig"
 
 source "arch/arm/cpu/armv8/fsl-layerscape/Kconfig"
@@ -1333,7 +1315,6 @@ source "board/broadcom/bcmnsp/Kconfig"
 source "board/broadcom/bcmns2/Kconfig"
 source "board/cavium/thunderx/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
-source "board/creative/xfi3/Kconfig"
 source "board/eets/pdu001/Kconfig"
 source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"
@@ -1349,7 +1330,6 @@ source "board/freescale/ls1046ardb/Kconfig"
 source "board/freescale/ls1012aqds/Kconfig"
 source "board/freescale/ls1012ardb/Kconfig"
 source "board/freescale/ls1012afrdm/Kconfig"
-source "board/freescale/mx23evk/Kconfig"
 source "board/freescale/mx28evk/Kconfig"
 source "board/freescale/mx31ads/Kconfig"
 source "board/freescale/mx31pdk/Kconfig"
@@ -1363,10 +1343,8 @@ source "board/hisilicon/hikey/Kconfig"
 source "board/hisilicon/poplar/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep003x/Kconfig"
-source "board/olimex/mx23_olinuxino/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
-source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/schulercontrol/sc_sps_1/Kconfig"
 source "board/silica/pengwyn/Kconfig"
 source "board/spear/spear300/Kconfig"

diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig
new file mode 100644 (file)
index 0000000..f984545
--- /dev/null
+++ b/arch/arm/mach-imx/mxs/Kconfig
@@ -0,0 +1,35 @@
+if ARCH_MX23
+
+config MX23
+       bool
+       default y
+
+choice
+       prompt "MX23 board select"
+       optional
+
+config TARGET_MX23_OLINUXINO
+       bool "Support mx23_olinuxino"
+       select BOARD_EARLY_INIT_F
+
+config TARGET_MX23EVK
+       bool "Support mx23evk"
+       select BOARD_EARLY_INIT_F
+
+config TARGET_SANSA_FUZE_PLUS
+       bool "Support sansa_fuze_plus"
+
+config TARGET_XFI3
+       bool "Support xfi3"
+
+endchoice
+
+config SYS_SOC
+       default "mxs"
+
+source "board/olimex/mx23_olinuxino/Kconfig"
+source "board/freescale/mx23evk/Kconfig"
+source "board/sandisk/sansa_fuze_plus/Kconfig"
+source "board/creative/xfi3/Kconfig"
+
+endif

diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig
index 628c11d851dba8b93606fde0d2f2baba1900c75e..d70ca52da2dc24dd1ad082387c0c1611e5929c39 100644 (file)
--- a/configs/mx23_olinuxino_defconfig
+++ b/configs/mx23_olinuxino_defconfig
@@ -1,8 +1,9 @@
 CONFIG_ARM=y
-CONFIG_TARGET_MX23_OLINUXINO=y
+CONFIG_ARCH_MX23=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TARGET_MX23_OLINUXINO=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
index 6ad7f2cb8da233a3078a99d91fdd8cf23e95dfd4..a7f08caf1afc27a0e71217883fd94a8ed9fd524d 100644 (file)
--- a/configs/mx23evk_defconfig
+++ b/configs/mx23evk_defconfig
@@ -1,8 +1,9 @@
 CONFIG_ARM=y
-CONFIG_TARGET_MX23EVK=y
+CONFIG_ARCH_MX23=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TARGET_MX23EVK=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y

diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
index f2e61c7ab5f3d4cd974941c24b27deb3906baf1c..fd0afa5bfdda6d6844110f56729bbba15f070470 100644 (file)
--- a/configs/sansa_fuze_plus_defconfig
+++ b/configs/sansa_fuze_plus_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX23=y
 CONFIG_TARGET_SANSA_FUZE_PLUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y

diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
index 6cdea5eb35b2edb6d33694119860f5ee68801c15..a2362f84e7ee8ebbc2dcea9727d70c6f384af21b 100644 (file)
--- a/configs/xfi3_defconfig
+++ b/configs/xfi3_defconfig
@@ -1,8 +1,9 @@
 CONFIG_ARM=y
-CONFIG_TARGET_XFI3=y
+CONFIG_ARCH_MX23=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TARGET_XFI3=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y

diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index 36ef186510f1cb8317e0c2d0f8a3a436cb173ead..bca62efd5723cf72c8d7e61c86fec0909f68a0cd 100644 (file)
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -7,7 +7,6 @@
 #define __CONFIGS_MX23_OLINUXINO_H__
 
 /* System configurations */
-#define CONFIG_MX23                            /* i.MX23 SoC */
 #define CONFIG_MACH_TYPE       4105
 
 /* U-Boot Commands */

diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 9b54d20e21a06a7f2a30b01d2fdd671785d603c4..16723968f08698d9cb9fd78bc2d0b8691c1b7904 100644 (file)
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -10,7 +10,6 @@
 #define __CONFIGS_MX23EVK_H__
 
 /* System configurations */
-#define CONFIG_MX23                            /* i.MX23 SoC */
 #define CONFIG_MACH_TYPE       MACH_TYPE_MX23EVK
 
 /* U-Boot Commands */

diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index 99200140fe5ed4d1b99bcba6c5892e60d7e9d95b..3bf1601a7d1a052f3f99ea17fe92f91829fa4861 100644 (file)
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -6,9 +6,6 @@
 #ifndef __CONFIGS_SANSA_FUZE_PLUS_H__
 #define __CONFIGS_SANSA_FUZE_PLUS_H__
 
-/* System configurations */
-#define CONFIG_MX23                            /* i.MX23 SoC */
-
 /* U-Boot Commands */
 
 /* Memory configuration */

diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 1e70a762e0d9e6991044f338914633dfd35f7913..2f77accda21e31f4576ca974967874423d08ded3 100644 (file)
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -6,9 +6,6 @@
 #ifndef __CONFIGS_XFI3_H__
 #define __CONFIGS_XFI3_H__
 
-/* System configurations */
-#define CONFIG_MX23                            /* i.MX23 SoC */
-
 /* U-Boot Commands */
 
 /* Memory configuration */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d35f756b7fe42d27bf196f5a3e211d5183186afb..2fae26b579016750c338528a1b5750cf858a24ea 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1409,7 +1409,6 @@ CONFIG_MVSATA_IDE_USE_PORT1
 CONFIG_MV_ETH_RXQ
 CONFIG_MV_I2C_NUM
 CONFIG_MV_I2C_REG
-CONFIG_MX23
 CONFIG_MX25_CLK32
 CONFIG_MX25_HCLK_FREQ
 CONFIG_MX27