mx25: Move MX25 selection to Kconfig
The motivation for moving MX25 selection to Kconfig is to be
able to better handle MX25 specific errata, so that an errata option
can be selected at SoC level instead of board level.
This selection method also aligns with the way other i.MX SoCs are
selected in U-Boot.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 83b7aa5..30e71b2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -341,17 +341,6 @@
select CPU_ARM926EJS
select SUPPORT_SPL
-config TARGET_MX25PDK
- bool "Support mx25pdk"
- select BOARD_LATE_INIT
- select CPU_ARM926EJS
- select BOARD_EARLY_INIT_F
-
-config TARGET_ZMX25
- bool "Support zmx25"
- select BOARD_LATE_INIT
- select CPU_ARM926EJS
-
config TARGET_APF27
bool "Support apf27"
select CPU_ARM926EJS
@@ -599,6 +588,10 @@
targeted at media players and tablet computers. We currently
support the S905 (GXBaby) 64-bit SoC.
+config ARCH_MX25
+ bool "NXP MX25"
+ select CPU_ARM926EJS
+
config ARCH_MX7ULP
bool "NXP MX7ULP"
select CPU_V7
@@ -1162,6 +1155,8 @@
source "arch/arm/cpu/armv7/ls102xa/Kconfig"
+source "arch/arm/mach-imx/mx2/Kconfig"
+
source "arch/arm/mach-imx/mx7ulp/Kconfig"
source "arch/arm/mach-imx/mx7/Kconfig"
@@ -1244,7 +1239,6 @@
source "board/freescale/ls1012ardb/Kconfig"
source "board/freescale/ls1012afrdm/Kconfig"
source "board/freescale/mx23evk/Kconfig"
-source "board/freescale/mx25pdk/Kconfig"
source "board/freescale/mx28evk/Kconfig"
source "board/freescale/mx31ads/Kconfig"
source "board/freescale/mx31pdk/Kconfig"
@@ -1270,7 +1264,6 @@
source "board/spear/spear600/Kconfig"
source "board/spear/x600/Kconfig"
source "board/st/stv0991/Kconfig"
-source "board/syteco/zmx25/Kconfig"
source "board/tcl/sl50/Kconfig"
source "board/birdland/bav335x/Kconfig"
source "board/timll/devkit3250/Kconfig"
diff --git a/arch/arm/mach-imx/mx2/Kconfig b/arch/arm/mach-imx/mx2/Kconfig
new file mode 100644
index 0000000..5e985a6
--- /dev/null
+++ b/arch/arm/mach-imx/mx2/Kconfig
@@ -0,0 +1,29 @@
+if ARCH_MX25
+
+config MX25
+ bool
+ default y
+choice
+ prompt "MX25 board select"
+ optional
+
+config TARGET_MX25PDK
+ bool "Support mx25pdk"
+ select BOARD_LATE_INIT
+ select CPU_ARM926EJS
+ select BOARD_EARLY_INIT_F
+
+config TARGET_ZMX25
+ bool "Support zmx25"
+ select BOARD_LATE_INIT
+ select CPU_ARM926EJS1
+
+endchoice
+
+config SYS_SOC
+ default "mx25"
+
+source "board/freescale/mx25pdk/Kconfig"
+source "board/syteco/zmx25/Kconfig"
+
+endif