From: Stefan Agner
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
---
arch/arm/Kconfig | 36 ++--
arch/arm/mach-imx/mx2/Kconfig | 36
configs/mx23_olinuxino_defconfig | 3 ++-
configs/mx23evk_defconfig | 3 ++-
configs/sansa_fuze_plus_defconfig | 1 +
configs/xfi3_defconfig| 3 ++-
include/configs/mx23_olinuxino.h | 1 -
include/configs/mx23evk.h | 1 -
include/configs/sansa_fuze_plus.h | 3 ---
include/configs/xfi3.h| 3 ---
scripts/config_whitelist.txt | 1 -
11 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 880a56ba90..b963a5102e 100644
--- 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
@@ -1328,7 +1308,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"
@@ -1344,7 +1323,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"
@@ -1358,10 +1336,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/mx2/Kconfig b/arch/arm/mach-imx/mx2/Kconfig
index ea308fccab..7d70ee2971 100644
--- a/arch/arm/mach-imx/mx2/Kconfig
+++ b/arch/arm/mach-imx/mx2/Kconfig
@@ -1,3 +1,39 @@
+if ARCH_MX23
+
+config MX23
+ bool
+ default y
+
+choice
+ prompt "MX25 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
+
if ARCH_MX25
config MX25
diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig
index 628c11d851..d70ca52da2 100644
--- 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_
