From: Stefan Agner stefan.agner@toradex.com

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 ---

Changes in v2: - Move to arch/arm/mach-imx/mxs/Kconfig - Fix SoC name

arch/arm/Kconfig | 38 ++++++++------------------------------ arch/arm/mach-imx/mxs/Kconfig | 35 +++++++++++++++++++++++++++++++++++ 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, 50 insertions(+), 42 deletions(-) create mode 100644 arch/arm/mach-imx/mxs/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 880a56ba90..59b0588027 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 @@ -1270,6 +1250,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" @@ -1328,7 +1310,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 +1325,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 +1338,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 index 0000000000..f984545887 --- /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 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_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 6ad7f2cb8d..a7f08caf1a 100644 --- 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 f2e61c7ab5..fd0afa5bfd 100644 --- 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 6cdea5eb35..a2362f84e7 100644 --- 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 36ef186510..bca62efd57 100644 --- 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 9b54d20e21..16723968f0 100644 --- 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 99200140fe..3bf1601a7d 100644 --- 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 1e70a762e0..2f77accda2 100644 --- 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 ef83c00c1b..ff27abaffd 100644 --- 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

From: Stefan Agner stefan.agner@toradex.com

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 ---

Changes in v2: - Move to arch/arm/mach-imx/mxs/Kconfig

arch/arm/Kconfig | 49 ++++----------------------------- arch/arm/mach-imx/mxs/Kconfig | 43 +++++++++++++++++++++++++++++ configs/apx4devkit_defconfig | 3 +- configs/bg0900_defconfig | 3 +- configs/m28evk_defconfig | 3 +- configs/mx28evk_auart_console_defconfig | 3 +- configs/mx28evk_defconfig | 3 +- configs/mx28evk_nand_defconfig | 3 +- configs/mx28evk_spi_defconfig | 3 +- configs/sc_sps_1_defconfig | 3 +- configs/ts4600_defconfig | 3 +- include/configs/apx4devkit.h | 1 - include/configs/bg0900.h | 3 -- include/configs/m28evk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/sc_sps_1.h | 1 - include/configs/ts4600.h | 3 -- scripts/config_whitelist.txt | 1 - 18 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 59b0588027..8a0cbc7faa 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 @@ -650,6 +619,12 @@ config ARCH_MX25 bool "NXP MX25" select CPU_ARM926EJS

+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 @@ -767,12 +742,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 @@ -1294,7 +1263,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" @@ -1302,7 +1270,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" @@ -1325,7 +1292,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" @@ -1339,8 +1305,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" @@ -1352,7 +1316,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 diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig index 47a4ee9e26..6d57bb2dbc 100644 --- a/configs/apx4devkit_defconfig +++ b/configs/apx4devkit_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_APX4DEVKIT=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_APX4DEVKIT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOOTDELAY=1 CONFIG_VERSION_VARIABLE=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index 72616ae5e5..ed0448d55d 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_BG0900=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_BG0900=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index 3bc6b1835f..734bc0a456 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_M28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_M28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_FIT=y CONFIG_BOOTDELAY=3 diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index c4977564e4..3fef988d2d 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE" # CONFIG_CONSOLE_MUX is not set diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 40c9df2809..82de3bab8f 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_FIT=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index ea97f401d1..bdd60b6e00 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index 34e9927c0f..b418e98aae 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_MX28EVK=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_MX28EVK=y CONFIG_SPL_SERIAL_SUPPORT=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig index faebc04bd2..c013921e6c 100644 --- a/configs/sc_sps_1_defconfig +++ b/configs/sc_sps_1_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_SC_SPS_1=y +CONFIG_ARCH_MX28=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_SC_SPS_1=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig index aab0737823..bc7a576052 100644 --- a/configs/ts4600_defconfig +++ b/configs/ts4600_defconfig @@ -1,7 +1,8 @@ CONFIG_ARM=y -CONFIG_TARGET_TS4600=y +CONFIG_ARCH_MX28=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_TS4600=y CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_CPUINFO is not set diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index 903834cd2e..cd65b75250 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -15,7 +15,6 @@ #define __CONFIGS_APX4DEVKIT_H__

/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT

/* Memory configuration */ diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 03700b0b7b..0043050b60 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -6,9 +6,6 @@ #ifndef __CONFIGS_BG0900_H__ #define __CONFIGS_BG0900_H__

-/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ - /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index ad6995d1a0..d44cf786d7 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -8,7 +8,6 @@ #define __CONFIGS_M28EVK_H__

/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK

#define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 4ada384547..bc58ca5c62 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -12,7 +12,6 @@ #define __CONFIGS_MX28EVK_H__

/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK

/* Memory configuration */ diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index e929a071cb..7eae0cc51e 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -10,7 +10,6 @@ #define __CONFIGS_SC_SPS_1_H__

/* System configuration */ -#define CONFIG_MX28 /* i.MX28 SoC */ #define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1

/* U-Boot Commands */ diff --git a/include/configs/ts4600.h b/include/configs/ts4600.h index 59565c60e3..bbe268e51c 100644 --- a/include/configs/ts4600.h +++ b/include/configs/ts4600.h @@ -14,9 +14,6 @@ #ifndef __CONFIGS_TS4600_H__ #define __CONFIGS_TS4600_H__

-/* System configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ - /* U-Boot Commands */

/* Memory configuration */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ff27abaffd..ccc5ebde8a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1414,7 +1414,6 @@ CONFIG_MX25_HCLK_FREQ CONFIG_MX27 CONFIG_MX27_CLK32 CONFIG_MX27_TIMER_HIGH_PRECISION -CONFIG_MX28 CONFIG_MX28_FEC_MAC_IN_OCOTP CONFIG_MX31 CONFIG_MX31_CLK32

From: Stefan Agner stefan.agner@toradex.com

Simplify SPL_LDSCRIPT config by using the new arch Kconfig configurations ARCH_MX23 and ARCH_MX28.

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

Changes in v2: None

arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8a0cbc7faa..a3d3a6274e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1326,7 +1326,7 @@ source "arch/arm/Kconfig.debug" endmenu

config SPL_LDSCRIPT - default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if TARGET_APX4DEVKIT || TARGET_BG0900 || TARGET_M28EVK || TARGET_MX23_OLINUXINO || TARGET_MX23EVK || TARGET_MX28EVK || TARGET_SANSA_FUZE_PLUS || TARGET_SC_SPS_1 || TARGET_TS4600 || TARGET_XFI3 + default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if ARCH_MX23 || ARCH_MX28 default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64

From: Stefan Agner stefan.agner@toradex.com

This converts CONFIG_NAND_MXS to Kconfig.

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

Changes in v2: None

configs/apx4devkit_defconfig | 3 ++- configs/aristainetos2_defconfig | 3 ++- configs/aristainetos2b_defconfig | 3 ++- configs/aristainetos_defconfig | 3 ++- configs/bg0900_defconfig | 3 ++- configs/cm_fx6_defconfig | 11 ++--------- configs/colibri_imx7_defconfig | 3 ++- configs/gwventana_nand_defconfig | 3 ++- configs/m28evk_defconfig | 3 ++- configs/mx28evk_auart_console_defconfig | 3 ++- configs/mx28evk_defconfig | 3 ++- configs/mx28evk_nand_defconfig | 3 ++- configs/mx28evk_spi_defconfig | 3 ++- configs/mx6sabreauto_defconfig | 3 ++- configs/mx6sxsabreauto_defconfig | 3 ++- configs/pcm058_defconfig | 3 ++- configs/pfla02_defconfig | 3 +++ configs/platinum_picon_defconfig | 3 ++- configs/platinum_titanium_defconfig | 3 ++- configs/titanium_defconfig | 3 ++- drivers/mtd/nand/Kconfig | 2 +- include/configs/aristainetos-common.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri_imx7.h | 2 -- include/configs/gw_ventana.h | 1 - include/configs/mx6sabreauto.h | 1 - include/configs/mx6sxsabreauto.h | 1 - include/configs/mxs.h | 1 - include/configs/pcm058.h | 1 - include/configs/pfla02.h | 1 - include/configs/platinum.h | 1 - include/configs/titanium.h | 1 - 32 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig index 6d57bb2dbc..260ddb2194 100644 --- a/configs/apx4devkit_defconfig +++ b/configs/apx4devkit_defconfig @@ -14,7 +14,6 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y @@ -28,6 +27,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:128k(bootstrap),1024k(boot),768k(env CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index 288dab0d3c..c0daed6b22 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig index 115ae07ad6..fbb2c1c38d 100644 --- a/configs/aristainetos2b_defconfig +++ b/configs/aristainetos2b_defconfig @@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index cad8b4af8a..13f4d6eb52 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -14,7 +14,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -31,6 +30,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_MTD_UBI_FASTMAP=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index ed0448d55d..602eb60808 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -17,7 +17,6 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -27,6 +26,8 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 6b1c0a823c..995baabd5d 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -20,9 +20,7 @@ CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run legacy_bootcmd" CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80 CONFIG_SPL_I2C_SUPPORT=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-FX6 # " -CONFIG_CMD_BOOTZ=y # CONFIG_CMD_XIMG is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y @@ -35,20 +33,13 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_SATA=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi0.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)" @@ -57,6 +48,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_EON=y diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index efc4ccb0f6..7880f7733b 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -23,7 +23,6 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TORTURE=y CONFIG_CMD_USB=y @@ -45,6 +44,8 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index be6cf0cbde..fbfd352054 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_PCI=y CONFIG_CMD_USB=y @@ -57,6 +56,8 @@ CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_DWC_AHSATA=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_E1000=y diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index 734bc0a456..1999fa8b59 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -22,7 +22,6 @@ CONFIG_CMD_GREPENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -42,6 +41,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(u-boot),512k(env1),512k(env2),14m CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index 3fef988d2d..022308d77a 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -17,7 +17,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -37,6 +36,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 82de3bab8f..6aca16cb2a 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -17,7 +17,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -37,6 +36,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index bdd60b6e00..e61af7c0ab 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -16,7 +16,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -36,6 +35,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index b418e98aae..1243e3ecc2 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -16,7 +16,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y @@ -36,6 +35,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5 CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MMC_MXS=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 215700bc3f..0a713d5b10 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -23,7 +23,6 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_PART=y CONFIG_CMD_SF=y @@ -40,6 +39,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig index a2c4830795..43b6ab9c6c 100644 --- a/configs/mx6sxsabreauto_defconfig +++ b/configs/mx6sxsabreauto_defconfig @@ -10,7 +10,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -31,6 +30,8 @@ CONFIG_DM_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index 99713c26b2..daca54dbc3 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y @@ -48,6 +47,8 @@ CONFIG_EFI_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_MTD=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index 029c9de2ce..a9daccfd6a 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +# CONFIG_CMD_NAND is not set CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y @@ -45,6 +46,8 @@ CONFIG_EFI_PARTITION=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_DM=y CONFIG_MTD=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index 54d88b2dc0..c45ce14268 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -23,7 +23,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -41,6 +40,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),495M(ubi0),14M(res0),2M(res1),512k(res2),512k(res3),-(ubi1)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index c5f6b7ab62..9ef0b80a2c 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -23,7 +23,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -41,6 +40,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig index c47702ed4e..3a721cdfa5 100644 --- a/configs/titanium_defconfig +++ b/configs/titanium_defconfig @@ -11,7 +11,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -29,6 +28,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1),512k(env2),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_NAND=y +CONFIG_NAND_MXS=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 97ec6cf5f9..57d27578fe 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -140,7 +140,7 @@ config NAND_MXC

config NAND_MXS bool "MXS NAND support" - depends on MX6 || MX7 + depends on MX23 || MX28 || MX6 || MX7 imply CMD_NAND help This enables NAND driver for the NAND flash controller on the diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 397afbb408..9b1a39d4fd 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -176,7 +176,6 @@ #define CONFIG_SYS_I2C_NOPROBES { {0, 0x00} }

/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index da870b9baa..90cf024bdb 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -182,7 +182,6 @@ #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_NAND_MXS #define CONFIG_SYS_NAND_ONFI_DETECTION /* APBH DMA is required for NAND support */ #define CONFIG_APBH_DMA diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 8030ca69e7..d4aaff61fd 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -158,8 +158,6 @@ #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif

-#define CONFIG_NAND_MXS - /* NAND stuff */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index d2944b5db2..517ad08423 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -67,7 +67,6 @@ #elif defined(CONFIG_SPL_NAND_SUPPORT) /* Enable NAND support */ #ifdef CONFIG_CMD_NAND - #define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 64d54b6751..9982685f67 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -66,7 +66,6 @@ #define CONFIG_SYS_I2C_SPEED 100000

/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 9e46c397a4..02d6acf47e 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -119,7 +119,6 @@ #define CONFIG_SYS_I2C_SPEED 100000

/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 3a27c15060..21e51fca41 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -136,7 +136,6 @@

/* NAND */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x60000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 3067fc63ef..6c0902abd4 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -58,7 +58,6 @@

#ifndef CONFIG_SPL_BUILD /* Enable NAND support */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index ae03310040..83198a1065 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -57,7 +57,6 @@ #define CONFIG_CMD_NAND /* Enable NAND support */ #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 453c37d3f8..24c8de932f 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -66,7 +66,6 @@ #ifdef CONFIG_CMD_NAND

/* NAND config */ -#define CONFIG_NAND_MXS #ifndef CONFIG_SYS_NAND_MAX_CHIPS #define CONFIG_SYS_NAND_MAX_CHIPS 2 #endif diff --git a/include/configs/titanium.h b/include/configs/titanium.h index cc655f2960..ea18cb63e2 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -142,7 +142,6 @@ #ifdef CONFIG_CMD_NAND

/* NAND stuff */ -#define CONFIG_NAND_MXS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE