[U-Boot] [PATCH 1/2] Convert CONFIG_NAND to Kconfig
Adam Ford
aford173 at gmail.com
Fri May 10 12:00:19 UTC 2019
On Sat, Mar 9, 2019 at 6:03 PM Adam Ford <aford173 at gmail.com> wrote:
>
> This converts the following to Kconfig:
> CONFIG_NAND
>
> A bunch of boards have dependent NAND drivers, and CONFIG_NAND
> is already in Kconfig, so this patch enables that flag for a
> variety of boards to make their respective NAND drivers more
> easily convert to Kconfig
>
> Signed-off-by: Adam Ford <aford173 at gmail.com>
Tom,
Any feedback on this conversion series?
> ---
> configs/B4420QDS_SPIFLASH_defconfig | 1 +
> configs/B4420QDS_defconfig | 1 +
> configs/B4860QDS_SECURE_BOOT_defconfig | 1 +
> configs/B4860QDS_SPIFLASH_defconfig | 1 +
> configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 1 +
> configs/B4860QDS_defconfig | 1 +
> configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 1 +
> configs/BSC9131RDB_SPIFLASH_defconfig | 1 +
> configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 1 +
> configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 1 +
> configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 1 +
> configs/BSC9132QDS_NOR_DDRCLK100_defconfig | 1 +
> configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 1 +
> configs/BSC9132QDS_NOR_DDRCLK133_defconfig | 1 +
> configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 1 +
> configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig | 1 +
> configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 1 +
> configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig | 1 +
> configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 1 +
> configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig | 1 +
> configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 1 +
> configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig | 1 +
> configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 +
> configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 +
> configs/C29XPCIE_SPIFLASH_defconfig | 1 +
> configs/C29XPCIE_defconfig | 1 +
> configs/CONFIG_NAND=y | 1 +
> configs/MPC8313ERDB_33_defconfig | 1 +
> configs/MPC8313ERDB_66_defconfig | 1 +
> configs/MPC8315ERDB_defconfig | 1 +
> configs/MPC837XEMDS_HOST_defconfig | 1 +
> configs/MPC837XEMDS_defconfig | 1 +
> configs/MPC8536DS_36BIT_defconfig | 1 +
> configs/MPC8536DS_SDCARD_defconfig | 1 +
> configs/MPC8536DS_SPIFLASH_defconfig | 1 +
> configs/MPC8536DS_defconfig | 1 +
> configs/MPC8569MDS_ATM_defconfig | 1 +
> configs/MPC8569MDS_defconfig | 1 +
> configs/MPC8572DS_36BIT_defconfig | 1 +
> configs/MPC8572DS_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_NOR_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PA_NOR_defconfig | 1 +
> configs/P1010RDB-PA_SDCARD_defconfig | 1 +
> configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PA_SPIFLASH_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_NOR_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PB_NOR_defconfig | 1 +
> configs/P1010RDB-PB_SDCARD_defconfig | 1 +
> configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 1 +
> configs/P1010RDB-PB_SPIFLASH_defconfig | 1 +
> configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 +
> configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1020RDB-PC_36BIT_defconfig | 1 +
> configs/P1020RDB-PC_SDCARD_defconfig | 1 +
> configs/P1020RDB-PC_SPIFLASH_defconfig | 1 +
> configs/P1020RDB-PC_defconfig | 1 +
> configs/P1020RDB-PD_SDCARD_defconfig | 1 +
> configs/P1020RDB-PD_SPIFLASH_defconfig | 1 +
> configs/P1020RDB-PD_defconfig | 1 +
> configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 1 +
> configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1021RDB-PC_36BIT_defconfig | 1 +
> configs/P1021RDB-PC_SDCARD_defconfig | 1 +
> configs/P1021RDB-PC_SPIFLASH_defconfig | 1 +
> configs/P1021RDB-PC_defconfig | 1 +
> configs/P1022DS_36BIT_SDCARD_defconfig | 1 +
> configs/P1022DS_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1022DS_36BIT_defconfig | 1 +
> configs/P1022DS_SDCARD_defconfig | 1 +
> configs/P1022DS_SPIFLASH_defconfig | 1 +
> configs/P1022DS_defconfig | 1 +
> configs/P1023RDB_defconfig | 1 +
> configs/P1024RDB_36BIT_defconfig | 1 +
> configs/P1024RDB_SDCARD_defconfig | 1 +
> configs/P1024RDB_SPIFLASH_defconfig | 1 +
> configs/P1024RDB_defconfig | 1 +
> configs/P1025RDB_36BIT_defconfig | 1 +
> configs/P1025RDB_SDCARD_defconfig | 1 +
> configs/P1025RDB_SPIFLASH_defconfig | 1 +
> configs/P1025RDB_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_defconfig | 1 +
> configs/P2020RDB-PC_SDCARD_defconfig | 1 +
> configs/P2020RDB-PC_SPIFLASH_defconfig | 1 +
> configs/P2020RDB-PC_defconfig | 1 +
> configs/P2041RDB_SDCARD_defconfig | 1 +
> configs/P2041RDB_SECURE_BOOT_defconfig | 1 +
> configs/P2041RDB_SPIFLASH_defconfig | 1 +
> configs/P2041RDB_SRIO_PCIE_BOOT_defconfig | 1 +
> configs/P2041RDB_defconfig | 1 +
> configs/P3041DS_SDCARD_defconfig | 1 +
> configs/P3041DS_SECURE_BOOT_defconfig | 1 +
> configs/P3041DS_SPIFLASH_defconfig | 1 +
> configs/P3041DS_SRIO_PCIE_BOOT_defconfig | 1 +
> configs/P3041DS_defconfig | 1 +
> configs/P5020DS_SDCARD_defconfig | 1 +
> configs/P5020DS_SECURE_BOOT_defconfig | 1 +
> configs/P5020DS_SPIFLASH_defconfig | 1 +
> configs/P5020DS_SRIO_PCIE_BOOT_defconfig | 1 +
> configs/P5020DS_defconfig | 1 +
> configs/P5040DS_SDCARD_defconfig | 1 +
> configs/P5040DS_SECURE_BOOT_defconfig | 1 +
> configs/P5040DS_SPIFLASH_defconfig | 1 +
> configs/P5040DS_defconfig | 1 +
> configs/T1023RDB_SDCARD_defconfig | 1 +
> configs/T1023RDB_SECURE_BOOT_defconfig | 1 +
> configs/T1023RDB_SPIFLASH_defconfig | 1 +
> configs/T1023RDB_defconfig | 1 +
> configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 1 +
> configs/T1024QDS_DDR4_defconfig | 1 +
> configs/T1024QDS_SDCARD_defconfig | 1 +
> configs/T1024QDS_SECURE_BOOT_defconfig | 1 +
> configs/T1024QDS_SPIFLASH_defconfig | 1 +
> configs/T1024QDS_defconfig | 1 +
> configs/T1024RDB_SDCARD_defconfig | 1 +
> configs/T1024RDB_SECURE_BOOT_defconfig | 1 +
> configs/T1024RDB_SPIFLASH_defconfig | 1 +
> configs/T1024RDB_defconfig | 1 +
> configs/T1040D4RDB_SDCARD_defconfig | 1 +
> configs/T1040D4RDB_SECURE_BOOT_defconfig | 1 +
> configs/T1040D4RDB_SPIFLASH_defconfig | 1 +
> configs/T1040D4RDB_defconfig | 1 +
> configs/T1040QDS_DDR4_defconfig | 1 +
> configs/T1040QDS_SECURE_BOOT_defconfig | 1 +
> configs/T1040QDS_defconfig | 1 +
> configs/T1040RDB_SDCARD_defconfig | 1 +
> configs/T1040RDB_SECURE_BOOT_defconfig | 1 +
> configs/T1040RDB_SPIFLASH_defconfig | 1 +
> configs/T1040RDB_defconfig | 1 +
> configs/T1042D4RDB_SDCARD_defconfig | 1 +
> configs/T1042D4RDB_SECURE_BOOT_defconfig | 1 +
> configs/T1042D4RDB_SPIFLASH_defconfig | 1 +
> configs/T1042D4RDB_defconfig | 1 +
> configs/T1042RDB_PI_SDCARD_defconfig | 1 +
> configs/T1042RDB_PI_SPIFLASH_defconfig | 1 +
> configs/T1042RDB_PI_defconfig | 1 +
> configs/T1042RDB_SECURE_BOOT_defconfig | 1 +
> configs/T1042RDB_defconfig | 1 +
> configs/T2080QDS_SDCARD_defconfig | 1 +
> configs/T2080QDS_SECURE_BOOT_defconfig | 1 +
> configs/T2080QDS_SPIFLASH_defconfig | 1 +
> configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 +
> configs/T2080QDS_defconfig | 1 +
> configs/T2080RDB_SDCARD_defconfig | 1 +
> configs/T2080RDB_SECURE_BOOT_defconfig | 1 +
> configs/T2080RDB_SPIFLASH_defconfig | 1 +
> configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 1 +
> configs/T2080RDB_defconfig | 1 +
> configs/T2081QDS_SDCARD_defconfig | 1 +
> configs/T2081QDS_SPIFLASH_defconfig | 1 +
> configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 1 +
> configs/T2081QDS_defconfig | 1 +
> configs/T4160QDS_SDCARD_defconfig | 1 +
> configs/T4160QDS_SECURE_BOOT_defconfig | 1 +
> configs/T4160QDS_defconfig | 1 +
> configs/T4160RDB_defconfig | 1 +
> configs/T4240QDS_SDCARD_defconfig | 1 +
> configs/T4240QDS_SECURE_BOOT_defconfig | 1 +
> configs/T4240QDS_SRIO_PCIE_BOOT_defconfig | 1 +
> configs/T4240QDS_defconfig | 1 +
> configs/T4240RDB_SDCARD_defconfig | 1 +
> configs/T4240RDB_defconfig | 1 +
> configs/cat | 1 +
> configs/colibri_t20_defconfig | 1 +
> configs/dns325_defconfig | 1 +
> configs/dockstar_defconfig | 1 +
> configs/goflexhome_defconfig | 1 +
> configs/guruplug_defconfig | 1 +
> configs/harmony_defconfig | 1 +
> configs/ib62x0_defconfig | 1 +
> configs/iconnect_defconfig | 1 +
> configs/ids8313_defconfig | 1 +
> configs/km_kirkwood_128m16_defconfig | 1 +
> configs/km_kirkwood_defconfig | 1 +
> configs/km_kirkwood_pci_defconfig | 1 +
> configs/kmcoge4_defconfig | 1 +
> configs/kmcoge5ne_defconfig | 1 +
> configs/kmcoge5un_defconfig | 1 +
> configs/kmlion1_defconfig | 1 +
> configs/kmnusa_defconfig | 1 +
> configs/kmsugp1_defconfig | 1 +
> configs/kmsuv31_defconfig | 1 +
> configs/kmtegr1_defconfig | 1 +
> configs/ls1021aqds_ddr4_nor_defconfig | 1 +
> configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
> configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 1 +
> configs/ls1021aqds_nor_defconfig | 1 +
> configs/ls1021aqds_nor_lpuart_defconfig | 1 +
> configs/ls1021aqds_sdcard_ifc_defconfig | 1 +
> configs/ls1043aqds_defconfig | 1 +
> configs/ls1043aqds_lpuart_defconfig | 1 +
> configs/ls1043aqds_nor_ddr3_defconfig | 1 +
> configs/ls1043aqds_sdcard_ifc_defconfig | 1 +
> configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 +
> configs/ls1043aqds_tfa_defconfig | 1 +
> configs/ls1043ardb_SECURE_BOOT_defconfig | 1 +
> configs/ls1043ardb_defconfig | 1 +
> configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 +
> configs/ls1043ardb_sdcard_defconfig | 1 +
> configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 1 +
> configs/ls1043ardb_tfa_defconfig | 1 +
> configs/ls1046aqds_SECURE_BOOT_defconfig | 1 +
> configs/ls1046aqds_defconfig | 1 +
> configs/ls1046aqds_lpuart_defconfig | 1 +
> configs/ls1046aqds_sdcard_ifc_defconfig | 1 +
> configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 +
> configs/ls1046aqds_tfa_defconfig | 1 +
> configs/ls1046ardb_emmc_defconfig | 1 +
> configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 +
> configs/ls1046ardb_qspi_defconfig | 1 +
> configs/ls1046ardb_qspi_spl_defconfig | 1 +
> configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 +
> configs/ls1046ardb_sdcard_defconfig | 1 +
> configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 1 +
> configs/ls1046ardb_tfa_defconfig | 1 +
> configs/ls1088aqds_defconfig | 1 +
> configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 +
> configs/ls1088aqds_qspi_defconfig | 1 +
> configs/ls1088aqds_sdcard_ifc_defconfig | 1 +
> configs/ls1088aqds_sdcard_qspi_defconfig | 1 +
> configs/ls1088aqds_tfa_defconfig | 1 +
> configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 +
> configs/ls1088ardb_qspi_defconfig | 1 +
> configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 +
> configs/ls1088ardb_sdcard_qspi_defconfig | 1 +
> configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 +
> configs/ls1088ardb_tfa_defconfig | 1 +
> configs/ls2080a_simu_defconfig | 1 +
> configs/ls2080aqds_SECURE_BOOT_defconfig | 1 +
> configs/ls2080aqds_defconfig | 1 +
> configs/ls2080aqds_qspi_defconfig | 1 +
> configs/ls2080aqds_sdcard_defconfig | 1 +
> configs/ls2080ardb_SECURE_BOOT_defconfig | 1 +
> configs/ls2080ardb_defconfig | 1 +
> configs/ls2088aqds_tfa_defconfig | 1 +
> configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 +
> configs/ls2088ardb_tfa_defconfig | 1 +
> configs/medcom-wide_defconfig | 1 +
> configs/mgcoge3un_defconfig | 1 +
> configs/nand.sh | 4 ++++
> configs/nas220_defconfig | 1 +
> configs/nsa310s_defconfig | 1 +
> configs/openrd_base_defconfig | 1 +
> configs/openrd_client_defconfig | 1 +
> configs/openrd_ultimate_defconfig | 1 +
> configs/plutux_defconfig | 1 +
> configs/pogo_e02_defconfig | 1 +
> configs/portl2_defconfig | 1 +
> configs/seaboard_defconfig | 1 +
> configs/sheevaplug_defconfig | 1 +
> configs/spear300_defconfig | 1 +
> configs/spear300_usbtty_defconfig | 1 +
> configs/spear310_defconfig | 1 +
> configs/spear310_pnor_defconfig | 1 +
> configs/spear310_usbtty_defconfig | 1 +
> configs/spear310_usbtty_pnor_defconfig | 1 +
> configs/spear320_defconfig | 1 +
> configs/spear320_pnor_defconfig | 1 +
> configs/spear320_usbtty_defconfig | 1 +
> configs/spear320_usbtty_pnor_defconfig | 1 +
> configs/spear600_defconfig | 1 +
> configs/spear600_usbtty_defconfig | 1 +
> configs/tec_defconfig | 1 +
> configs/ve8313_defconfig | 1 +
> configs/work_92105_defconfig | 1 +
> configs/x600_defconfig | 1 +
> configs/xpedite537x_defconfig | 1 +
> configs/xpedite550x_defconfig | 1 +
> 283 files changed, 286 insertions(+)
>
> diff --git a/configs/B4420QDS_SPIFLASH_defconfig b/configs/B4420QDS_SPIFLASH_defconfig
> index 8e3b0a7e7d..5be195fdc7 100644
> --- a/configs/B4420QDS_SPIFLASH_defconfig
> +++ b/configs/B4420QDS_SPIFLASH_defconfig
> @@ -41,3 +41,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/B4420QDS_defconfig b/configs/B4420QDS_defconfig
> index 29b351a328..8386cd7e3c 100644
> --- a/configs/B4420QDS_defconfig
> +++ b/configs/B4420QDS_defconfig
> @@ -40,3 +40,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
> index 26ad411d44..1e33df20d6 100644
> --- a/configs/B4860QDS_SECURE_BOOT_defconfig
> +++ b/configs/B4860QDS_SECURE_BOOT_defconfig
> @@ -44,3 +44,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
> index 612cb7ed92..594df563de 100644
> --- a/configs/B4860QDS_SPIFLASH_defconfig
> +++ b/configs/B4860QDS_SPIFLASH_defconfig
> @@ -41,3 +41,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
> index 9bfed3c111..2fcad8812e 100644
> --- a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
> +++ b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
> @@ -37,3 +37,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/B4860QDS_defconfig b/configs/B4860QDS_defconfig
> index 3232530afa..86a5e6cc65 100644
> --- a/configs/B4860QDS_defconfig
> +++ b/configs/B4860QDS_defconfig
> @@ -40,3 +40,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
> index 2d3c3d6128..a563688def 100644
> --- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
> +++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
> @@ -39,3 +39,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig
> index 5a9f10d6c7..d4f72d923f 100644
> --- a/configs/BSC9131RDB_SPIFLASH_defconfig
> +++ b/configs/BSC9131RDB_SPIFLASH_defconfig
> @@ -39,3 +39,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
> index 1e2686174e..688d528c81 100644
> --- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
> +++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
> index 005087e6dd..f31b004231 100644
> --- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
> +++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
> index d88b6d49e2..457c85c09f 100644
> --- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
> +++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
> index 09751edebc..46ce6d43a7 100644
> --- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
> +++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
> @@ -47,3 +47,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
> index 94d099b6cd..61b07ba9a7 100644
> --- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
> +++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
> index 7b4ecee5c5..5ecb3cbc2e 100644
> --- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
> +++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
> @@ -47,3 +47,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
> index 4a53c72467..3a2ee32e6e 100644
> --- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
> +++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
> index ea2e04010d..b1fa521b26 100644
> --- a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
> +++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
> @@ -47,3 +47,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
> index fc41568c97..bd091a3d57 100644
> --- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
> +++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
> index 622f5ca8c8..6dbb756ce6 100644
> --- a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
> +++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
> @@ -47,3 +47,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
> index 5eca1f1580..95cae8875b 100644
> --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
> +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
> index b6f2e69af3..a21dc358e3 100644
> --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
> +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
> @@ -47,3 +47,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
> index fc89a74b0a..6de6be3176 100644
> --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
> +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
> index 18f40bb188..757b2fe18d 100644
> --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
> +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
> @@ -47,3 +47,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> +CONFIG_NAND=y
> diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
> index efc8dd90b7..c20a51f064 100644
> --- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
> +++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
> @@ -41,3 +41,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
> index dcf793b734..34d1c9605b 100644
> --- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
> @@ -42,3 +42,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig
> index aaecadbecc..8100747a48 100644
> --- a/configs/C29XPCIE_SPIFLASH_defconfig
> +++ b/configs/C29XPCIE_SPIFLASH_defconfig
> @@ -38,3 +38,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_FSL_ESPI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig
> index a487dcae75..c9feef5dd9 100644
> --- a/configs/C29XPCIE_defconfig
> +++ b/configs/C29XPCIE_defconfig
> @@ -37,3 +37,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_FSL_ESPI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/CONFIG_NAND=y b/configs/CONFIG_NAND=y
> new file mode 100644
> index 0000000000..58429a4cfc
> --- /dev/null
> +++ b/configs/CONFIG_NAND=y
> @@ -0,0 +1 @@
> +CONFIG_NAND=y
> diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig
> index 3bb680c217..214e68245e 100644
> --- a/configs/MPC8313ERDB_33_defconfig
> +++ b/configs/MPC8313ERDB_33_defconfig
> @@ -32,3 +32,4 @@ CONFIG_PHY_MARVELL=y
> CONFIG_TSEC_ENET=y
> CONFIG_SYS_NS16550=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig
> index bb26a9e381..9cae5d1c5e 100644
> --- a/configs/MPC8313ERDB_66_defconfig
> +++ b/configs/MPC8313ERDB_66_defconfig
> @@ -32,3 +32,4 @@ CONFIG_PHY_MARVELL=y
> CONFIG_TSEC_ENET=y
> CONFIG_SYS_NS16550=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig
> index b45369e626..a766e53c9f 100644
> --- a/configs/MPC8315ERDB_defconfig
> +++ b/configs/MPC8315ERDB_defconfig
> @@ -35,3 +35,4 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC837XEMDS_HOST_defconfig b/configs/MPC837XEMDS_HOST_defconfig
> index 4ac95735b2..1682588b48 100644
> --- a/configs/MPC837XEMDS_HOST_defconfig
> +++ b/configs/MPC837XEMDS_HOST_defconfig
> @@ -32,3 +32,4 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC837XEMDS_defconfig b/configs/MPC837XEMDS_defconfig
> index 9ee8c7d880..10f8c298ad 100644
> --- a/configs/MPC837XEMDS_defconfig
> +++ b/configs/MPC837XEMDS_defconfig
> @@ -28,3 +28,4 @@ CONFIG_TSEC_ENET=y
> # CONFIG_PCI is not set
> CONFIG_SYS_NS16550=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig
> index 654a5175d2..d74fc42ca5 100644
> --- a/configs/MPC8536DS_36BIT_defconfig
> +++ b/configs/MPC8536DS_36BIT_defconfig
> @@ -44,3 +44,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8536DS_SDCARD_defconfig b/configs/MPC8536DS_SDCARD_defconfig
> index eebc00337e..df5fe27bab 100644
> --- a/configs/MPC8536DS_SDCARD_defconfig
> +++ b/configs/MPC8536DS_SDCARD_defconfig
> @@ -43,3 +43,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8536DS_SPIFLASH_defconfig b/configs/MPC8536DS_SPIFLASH_defconfig
> index c376abe5f1..0ea959f162 100644
> --- a/configs/MPC8536DS_SPIFLASH_defconfig
> +++ b/configs/MPC8536DS_SPIFLASH_defconfig
> @@ -43,3 +43,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig
> index 7501488117..6567d3da5f 100644
> --- a/configs/MPC8536DS_defconfig
> +++ b/configs/MPC8536DS_defconfig
> @@ -43,3 +43,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8569MDS_ATM_defconfig b/configs/MPC8569MDS_ATM_defconfig
> index 5140ae9ecd..f535efab32 100644
> --- a/configs/MPC8569MDS_ATM_defconfig
> +++ b/configs/MPC8569MDS_ATM_defconfig
> @@ -30,3 +30,4 @@ CONFIG_SYS_FLASH_CFI=y
> CONFIG_E1000=y
> CONFIG_SYS_NS16550=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8569MDS_defconfig b/configs/MPC8569MDS_defconfig
> index a778eaeeb8..a1ebe4fe63 100644
> --- a/configs/MPC8569MDS_defconfig
> +++ b/configs/MPC8569MDS_defconfig
> @@ -29,3 +29,4 @@ CONFIG_SYS_FLASH_CFI=y
> CONFIG_E1000=y
> CONFIG_SYS_NS16550=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
> index 3f02171737..59f2033fcc 100644
> --- a/configs/MPC8572DS_36BIT_defconfig
> +++ b/configs/MPC8572DS_36BIT_defconfig
> @@ -39,3 +39,4 @@ CONFIG_USB_EHCI_PCI=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
> index acb4af4b3d..4a1931c1fa 100644
> --- a/configs/MPC8572DS_defconfig
> +++ b/configs/MPC8572DS_defconfig
> @@ -38,3 +38,4 @@ CONFIG_USB_EHCI_PCI=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
> index 568d886161..5d2fd3a0a6 100644
> --- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
> @@ -49,3 +49,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
> index e565b414a0..09c8d0b2a8 100644
> --- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
> @@ -48,3 +48,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
> index 1723d8dc55..ea1427e45a 100644
> --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
> @@ -44,3 +44,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> index 798a0dcc37..dea23ecf16 100644
> --- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> @@ -55,3 +55,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
> index d8482a3efa..8c45cf09a7 100644
> --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
> @@ -49,3 +49,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> index 3b4992fcf5..1530c4e9e2 100644
> --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> @@ -56,3 +56,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
> index b2f000af14..7105e112ed 100644
> --- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
> @@ -48,3 +48,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
> index 806bf88c9d..417d007072 100644
> --- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
> @@ -47,3 +47,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
> index f1429abf74..65325ff19d 100644
> --- a/configs/P1010RDB-PA_NOR_defconfig
> +++ b/configs/P1010RDB-PA_NOR_defconfig
> @@ -43,3 +43,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
> index eb3151c370..c3ab57240a 100644
> --- a/configs/P1010RDB-PA_SDCARD_defconfig
> +++ b/configs/P1010RDB-PA_SDCARD_defconfig
> @@ -54,3 +54,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
> index 9c759db24f..ed5d1c1e92 100644
> --- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
> @@ -48,3 +48,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
> index 5513446739..d9d4da6fe1 100644
> --- a/configs/P1010RDB-PA_SPIFLASH_defconfig
> +++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
> @@ -55,3 +55,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
> index aee9edf406..f3a0b92b6d 100644
> --- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
> @@ -49,3 +49,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
> index f41e0503c7..4a84083d0a 100644
> --- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
> @@ -48,3 +48,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
> index a7e7ecff9e..67141d4aaa 100644
> --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
> @@ -44,3 +44,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> index aca04419f5..675faa6cbf 100644
> --- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> @@ -55,3 +55,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
> index 9a0332d6af..443e747722 100644
> --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
> @@ -49,3 +49,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> index 7041356374..4a0dbf95e8 100644
> --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> @@ -56,3 +56,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
> index 39b62bb375..324fab848c 100644
> --- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
> @@ -48,3 +48,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
> index 45c7d3cd1d..03e4898094 100644
> --- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
> @@ -47,3 +47,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
> index f1753a3971..fe2f50c5da 100644
> --- a/configs/P1010RDB-PB_NOR_defconfig
> +++ b/configs/P1010RDB-PB_NOR_defconfig
> @@ -43,3 +43,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
> index 56200bb6e8..9c22201a18 100644
> --- a/configs/P1010RDB-PB_SDCARD_defconfig
> +++ b/configs/P1010RDB-PB_SDCARD_defconfig
> @@ -54,3 +54,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
> index 60e2e1bb38..bd1bee9c2c 100644
> --- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
> @@ -48,3 +48,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
> index f44d36c342..b4dc2401f7 100644
> --- a/configs/P1010RDB-PB_SPIFLASH_defconfig
> +++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
> @@ -55,3 +55,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> index 778a258bd7..620050cb60 100644
> --- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> +++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> @@ -55,3 +55,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> index 31572566d4..7588aa00ea 100644
> --- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> +++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> @@ -56,3 +56,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
> index 3dbefd3c6b..eb267fb161 100644
> --- a/configs/P1020RDB-PC_36BIT_defconfig
> +++ b/configs/P1020RDB-PC_36BIT_defconfig
> @@ -45,3 +45,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
> index 983fbc740b..099c1adcc0 100644
> --- a/configs/P1020RDB-PC_SDCARD_defconfig
> +++ b/configs/P1020RDB-PC_SDCARD_defconfig
> @@ -54,3 +54,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
> index 0f49a81c04..a51ac0face 100644
> --- a/configs/P1020RDB-PC_SPIFLASH_defconfig
> +++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
> @@ -55,3 +55,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
> index 2dadfa92c7..15c4cdb8c5 100644
> --- a/configs/P1020RDB-PC_defconfig
> +++ b/configs/P1020RDB-PC_defconfig
> @@ -44,3 +44,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
> index c6cb7a58e1..5a9bdf0cc9 100644
> --- a/configs/P1020RDB-PD_SDCARD_defconfig
> +++ b/configs/P1020RDB-PD_SDCARD_defconfig
> @@ -58,3 +58,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
> index 848ca279aa..c6d6d76100 100644
> --- a/configs/P1020RDB-PD_SPIFLASH_defconfig
> +++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
> @@ -59,3 +59,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
> index 5377df34ce..1971d03694 100644
> --- a/configs/P1020RDB-PD_defconfig
> +++ b/configs/P1020RDB-PD_defconfig
> @@ -48,3 +48,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
> index a086c527ac..8390411f86 100644
> --- a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
> +++ b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
> @@ -60,3 +60,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
> index 2ff094c165..e8cd0f4199 100644
> --- a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
> +++ b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
> @@ -61,3 +61,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1021RDB-PC_36BIT_defconfig b/configs/P1021RDB-PC_36BIT_defconfig
> index 72c79d77bf..84c3ba0b52 100644
> --- a/configs/P1021RDB-PC_36BIT_defconfig
> +++ b/configs/P1021RDB-PC_36BIT_defconfig
> @@ -50,3 +50,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1021RDB-PC_SDCARD_defconfig b/configs/P1021RDB-PC_SDCARD_defconfig
> index 4c49da3a7c..b974770151 100644
> --- a/configs/P1021RDB-PC_SDCARD_defconfig
> +++ b/configs/P1021RDB-PC_SDCARD_defconfig
> @@ -59,3 +59,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1021RDB-PC_SPIFLASH_defconfig b/configs/P1021RDB-PC_SPIFLASH_defconfig
> index ac8c9b2669..5daab846c2 100644
> --- a/configs/P1021RDB-PC_SPIFLASH_defconfig
> +++ b/configs/P1021RDB-PC_SPIFLASH_defconfig
> @@ -60,3 +60,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1021RDB-PC_defconfig b/configs/P1021RDB-PC_defconfig
> index c831333b92..f1390f33da 100644
> --- a/configs/P1021RDB-PC_defconfig
> +++ b/configs/P1021RDB-PC_defconfig
> @@ -49,3 +49,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig
> index 5e49b03726..c2da5f0567 100644
> --- a/configs/P1022DS_36BIT_SDCARD_defconfig
> +++ b/configs/P1022DS_36BIT_SDCARD_defconfig
> @@ -57,3 +57,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig
> index cf1b6a0408..5534817570 100644
> --- a/configs/P1022DS_36BIT_SPIFLASH_defconfig
> +++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig
> @@ -58,3 +58,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig
> index e1fb283959..80b9fad686 100644
> --- a/configs/P1022DS_36BIT_defconfig
> +++ b/configs/P1022DS_36BIT_defconfig
> @@ -47,3 +47,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig
> index dbf1872f62..8c9ebcca9f 100644
> --- a/configs/P1022DS_SDCARD_defconfig
> +++ b/configs/P1022DS_SDCARD_defconfig
> @@ -56,3 +56,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig
> index 2c0546100a..d155054689 100644
> --- a/configs/P1022DS_SPIFLASH_defconfig
> +++ b/configs/P1022DS_SPIFLASH_defconfig
> @@ -57,3 +57,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig
> index 3449838653..16c70af349 100644
> --- a/configs/P1022DS_defconfig
> +++ b/configs/P1022DS_defconfig
> @@ -46,3 +46,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1023RDB_defconfig b/configs/P1023RDB_defconfig
> index b4e27c4d23..2e4bf950f7 100644
> --- a/configs/P1023RDB_defconfig
> +++ b/configs/P1023RDB_defconfig
> @@ -39,3 +39,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1024RDB_36BIT_defconfig b/configs/P1024RDB_36BIT_defconfig
> index b34dc74863..9d696683e8 100644
> --- a/configs/P1024RDB_36BIT_defconfig
> +++ b/configs/P1024RDB_36BIT_defconfig
> @@ -45,3 +45,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1024RDB_SDCARD_defconfig b/configs/P1024RDB_SDCARD_defconfig
> index 0925c2cf1b..6779bf61d2 100644
> --- a/configs/P1024RDB_SDCARD_defconfig
> +++ b/configs/P1024RDB_SDCARD_defconfig
> @@ -54,3 +54,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1024RDB_SPIFLASH_defconfig b/configs/P1024RDB_SPIFLASH_defconfig
> index 398112fe4c..4f1ddfe4b2 100644
> --- a/configs/P1024RDB_SPIFLASH_defconfig
> +++ b/configs/P1024RDB_SPIFLASH_defconfig
> @@ -55,3 +55,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1024RDB_defconfig b/configs/P1024RDB_defconfig
> index 2f21e2a403..23eab175f8 100644
> --- a/configs/P1024RDB_defconfig
> +++ b/configs/P1024RDB_defconfig
> @@ -44,3 +44,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1025RDB_36BIT_defconfig b/configs/P1025RDB_36BIT_defconfig
> index 30cef8ed41..26a80d09fe 100644
> --- a/configs/P1025RDB_36BIT_defconfig
> +++ b/configs/P1025RDB_36BIT_defconfig
> @@ -47,3 +47,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1025RDB_SDCARD_defconfig b/configs/P1025RDB_SDCARD_defconfig
> index 5ca059cce1..cdd58ef3e6 100644
> --- a/configs/P1025RDB_SDCARD_defconfig
> +++ b/configs/P1025RDB_SDCARD_defconfig
> @@ -56,3 +56,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1025RDB_SPIFLASH_defconfig b/configs/P1025RDB_SPIFLASH_defconfig
> index ebb04754da..c1be973a6c 100644
> --- a/configs/P1025RDB_SPIFLASH_defconfig
> +++ b/configs/P1025RDB_SPIFLASH_defconfig
> @@ -57,3 +57,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P1025RDB_defconfig b/configs/P1025RDB_defconfig
> index 2feb9cca4a..4a30773a12 100644
> --- a/configs/P1025RDB_defconfig
> +++ b/configs/P1025RDB_defconfig
> @@ -46,3 +46,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> index fb78b202e9..346bed007c 100644
> --- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> +++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> @@ -60,3 +60,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> index e453814277..b5a051c917 100644
> --- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> +++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> @@ -61,3 +61,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
> index 2d7b823eb3..86aa399c58 100644
> --- a/configs/P2020RDB-PC_36BIT_defconfig
> +++ b/configs/P2020RDB-PC_36BIT_defconfig
> @@ -50,3 +50,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
> index 784262e447..457d500a7e 100644
> --- a/configs/P2020RDB-PC_SDCARD_defconfig
> +++ b/configs/P2020RDB-PC_SDCARD_defconfig
> @@ -59,3 +59,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
> index 647009750d..a333a26bbe 100644
> --- a/configs/P2020RDB-PC_SPIFLASH_defconfig
> +++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
> @@ -60,3 +60,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
> index 7e905dcf9c..37929ab45a 100644
> --- a/configs/P2020RDB-PC_defconfig
> +++ b/configs/P2020RDB-PC_defconfig
> @@ -49,3 +49,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig
> index 3d5d96e1ce..ccb390c177 100644
> --- a/configs/P2041RDB_SDCARD_defconfig
> +++ b/configs/P2041RDB_SDCARD_defconfig
> @@ -42,3 +42,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig
> index 098f40fea5..8e80f45a6d 100644
> --- a/configs/P2041RDB_SECURE_BOOT_defconfig
> +++ b/configs/P2041RDB_SECURE_BOOT_defconfig
> @@ -45,3 +45,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig
> index e8698e8456..dc095cf3d5 100644
> --- a/configs/P2041RDB_SPIFLASH_defconfig
> +++ b/configs/P2041RDB_SPIFLASH_defconfig
> @@ -42,3 +42,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
> index 75dedf3474..91d12a38f9 100644
> --- a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
> +++ b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
> @@ -38,3 +38,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig
> index 07c212b6ed..f5fa7b9478 100644
> --- a/configs/P2041RDB_defconfig
> +++ b/configs/P2041RDB_defconfig
> @@ -41,3 +41,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P3041DS_SDCARD_defconfig b/configs/P3041DS_SDCARD_defconfig
> index 40b40fc073..e47f017fc1 100644
> --- a/configs/P3041DS_SDCARD_defconfig
> +++ b/configs/P3041DS_SDCARD_defconfig
> @@ -42,3 +42,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P3041DS_SECURE_BOOT_defconfig b/configs/P3041DS_SECURE_BOOT_defconfig
> index 06555e806e..6cbd4e2b53 100644
> --- a/configs/P3041DS_SECURE_BOOT_defconfig
> +++ b/configs/P3041DS_SECURE_BOOT_defconfig
> @@ -45,3 +45,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P3041DS_SPIFLASH_defconfig b/configs/P3041DS_SPIFLASH_defconfig
> index 84b5d76a2d..c724dee23c 100644
> --- a/configs/P3041DS_SPIFLASH_defconfig
> +++ b/configs/P3041DS_SPIFLASH_defconfig
> @@ -42,3 +42,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
> index 8e39410e8f..f3d7de364b 100644
> --- a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
> +++ b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
> @@ -38,3 +38,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig
> index 2d72e76f3c..0b3a3e6955 100644
> --- a/configs/P3041DS_defconfig
> +++ b/configs/P3041DS_defconfig
> @@ -41,3 +41,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5020DS_SDCARD_defconfig b/configs/P5020DS_SDCARD_defconfig
> index 0116c2d3a8..eb44a9ed82 100644
> --- a/configs/P5020DS_SDCARD_defconfig
> +++ b/configs/P5020DS_SDCARD_defconfig
> @@ -43,3 +43,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5020DS_SECURE_BOOT_defconfig b/configs/P5020DS_SECURE_BOOT_defconfig
> index ce172a9332..70dae971e6 100644
> --- a/configs/P5020DS_SECURE_BOOT_defconfig
> +++ b/configs/P5020DS_SECURE_BOOT_defconfig
> @@ -46,3 +46,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5020DS_SPIFLASH_defconfig b/configs/P5020DS_SPIFLASH_defconfig
> index 28ac033e97..0dad89590d 100644
> --- a/configs/P5020DS_SPIFLASH_defconfig
> +++ b/configs/P5020DS_SPIFLASH_defconfig
> @@ -43,3 +43,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
> index e81af0e779..a90597b6a9 100644
> --- a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
> +++ b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
> @@ -39,3 +39,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5020DS_defconfig b/configs/P5020DS_defconfig
> index 7177716222..2f80126e86 100644
> --- a/configs/P5020DS_defconfig
> +++ b/configs/P5020DS_defconfig
> @@ -42,3 +42,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5040DS_SDCARD_defconfig b/configs/P5040DS_SDCARD_defconfig
> index b12bb8f6a5..cb625a2971 100644
> --- a/configs/P5040DS_SDCARD_defconfig
> +++ b/configs/P5040DS_SDCARD_defconfig
> @@ -43,3 +43,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig
> index 66c116f426..6d57fbb180 100644
> --- a/configs/P5040DS_SECURE_BOOT_defconfig
> +++ b/configs/P5040DS_SECURE_BOOT_defconfig
> @@ -46,3 +46,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5040DS_SPIFLASH_defconfig b/configs/P5040DS_SPIFLASH_defconfig
> index 1c3495967c..19d712f2f8 100644
> --- a/configs/P5040DS_SPIFLASH_defconfig
> +++ b/configs/P5040DS_SPIFLASH_defconfig
> @@ -43,3 +43,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig
> index 314d05b210..092c038d8b 100644
> --- a/configs/P5040DS_defconfig
> +++ b/configs/P5040DS_defconfig
> @@ -42,3 +42,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
> index de99d16636..6f1af63ddb 100644
> --- a/configs/T1023RDB_SDCARD_defconfig
> +++ b/configs/T1023RDB_SDCARD_defconfig
> @@ -59,3 +59,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
> index 60c8a4782b..c595a1487f 100644
> --- a/configs/T1023RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1023RDB_SECURE_BOOT_defconfig
> @@ -52,3 +52,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
> index b0434ea5d0..c8e569c82e 100644
> --- a/configs/T1023RDB_SPIFLASH_defconfig
> +++ b/configs/T1023RDB_SPIFLASH_defconfig
> @@ -60,3 +60,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig
> index 7a57a75908..a123d149ea 100644
> --- a/configs/T1023RDB_defconfig
> +++ b/configs/T1023RDB_defconfig
> @@ -48,3 +48,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> index c38fee0757..1732066c3d 100644
> --- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> +++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> @@ -56,3 +56,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
> index 9a9a25b174..8f1773d99c 100644
> --- a/configs/T1024QDS_DDR4_defconfig
> +++ b/configs/T1024QDS_DDR4_defconfig
> @@ -50,3 +50,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
> index be461fc8ad..9fcbb9c8fb 100644
> --- a/configs/T1024QDS_SDCARD_defconfig
> +++ b/configs/T1024QDS_SDCARD_defconfig
> @@ -64,3 +64,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
> index ecebd48e72..e3f4f95b2c 100644
> --- a/configs/T1024QDS_SECURE_BOOT_defconfig
> +++ b/configs/T1024QDS_SECURE_BOOT_defconfig
> @@ -57,3 +57,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
> index 8ad4d35f30..ec2c70f13f 100644
> --- a/configs/T1024QDS_SPIFLASH_defconfig
> +++ b/configs/T1024QDS_SPIFLASH_defconfig
> @@ -65,3 +65,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
> index 23ed39e240..78dbf3d11d 100644
> --- a/configs/T1024QDS_defconfig
> +++ b/configs/T1024QDS_defconfig
> @@ -53,3 +53,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
> index e31578c6b5..09b742da68 100644
> --- a/configs/T1024RDB_SDCARD_defconfig
> +++ b/configs/T1024RDB_SDCARD_defconfig
> @@ -61,3 +61,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
> index 4269133c8c..77467b9381 100644
> --- a/configs/T1024RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1024RDB_SECURE_BOOT_defconfig
> @@ -54,3 +54,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
> index 148eef0719..e636142df1 100644
> --- a/configs/T1024RDB_SPIFLASH_defconfig
> +++ b/configs/T1024RDB_SPIFLASH_defconfig
> @@ -62,3 +62,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
> index cb1f2640aa..7946c59ccf 100644
> --- a/configs/T1024RDB_defconfig
> +++ b/configs/T1024RDB_defconfig
> @@ -50,3 +50,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig
> index 88f3c287ec..b271e7f638 100644
> --- a/configs/T1040D4RDB_SDCARD_defconfig
> +++ b/configs/T1040D4RDB_SDCARD_defconfig
> @@ -58,3 +58,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig
> index 030f72a1d5..39562b8d0f 100644
> --- a/configs/T1040D4RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig
> @@ -51,3 +51,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig
> index 7adf65cc8a..3918c5f272 100644
> --- a/configs/T1040D4RDB_SPIFLASH_defconfig
> +++ b/configs/T1040D4RDB_SPIFLASH_defconfig
> @@ -59,3 +59,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig
> index c9032c24fe..e772b1e025 100644
> --- a/configs/T1040D4RDB_defconfig
> +++ b/configs/T1040D4RDB_defconfig
> @@ -47,3 +47,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig
> index fd2c74f4d8..e2a0d2f528 100644
> --- a/configs/T1040QDS_DDR4_defconfig
> +++ b/configs/T1040QDS_DDR4_defconfig
> @@ -53,3 +53,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
> index 719a1e459a..0da9b7fd82 100644
> --- a/configs/T1040QDS_SECURE_BOOT_defconfig
> +++ b/configs/T1040QDS_SECURE_BOOT_defconfig
> @@ -58,3 +58,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
> index 81454ab735..c0d2601306 100644
> --- a/configs/T1040QDS_defconfig
> +++ b/configs/T1040QDS_defconfig
> @@ -54,3 +54,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
> index 57d214da3b..8bf5b0765c 100644
> --- a/configs/T1040RDB_SDCARD_defconfig
> +++ b/configs/T1040RDB_SDCARD_defconfig
> @@ -59,3 +59,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
> index 62d1c3068b..e5b796681a 100644
> --- a/configs/T1040RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1040RDB_SECURE_BOOT_defconfig
> @@ -52,3 +52,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
> index c086a9fe99..772df82b62 100644
> --- a/configs/T1040RDB_SPIFLASH_defconfig
> +++ b/configs/T1040RDB_SPIFLASH_defconfig
> @@ -60,3 +60,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
> index 0209fb8747..6c0d3aa4e1 100644
> --- a/configs/T1040RDB_defconfig
> +++ b/configs/T1040RDB_defconfig
> @@ -48,3 +48,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
> index 1f7cf60695..738cdd2ef7 100644
> --- a/configs/T1042D4RDB_SDCARD_defconfig
> +++ b/configs/T1042D4RDB_SDCARD_defconfig
> @@ -61,3 +61,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_CFB_CONSOLE_ANSI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
> index ef9b243446..a022bc5568 100644
> --- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
> @@ -54,3 +54,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
> index a2a7d67c80..f21976f7ba 100644
> --- a/configs/T1042D4RDB_SPIFLASH_defconfig
> +++ b/configs/T1042D4RDB_SPIFLASH_defconfig
> @@ -62,3 +62,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_CFB_CONSOLE_ANSI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
> index 5d600225bd..e14f1b1832 100644
> --- a/configs/T1042D4RDB_defconfig
> +++ b/configs/T1042D4RDB_defconfig
> @@ -50,3 +50,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_CFB_CONSOLE_ANSI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
> index 4b2d1828ef..29f6e4c59d 100644
> --- a/configs/T1042RDB_PI_SDCARD_defconfig
> +++ b/configs/T1042RDB_PI_SDCARD_defconfig
> @@ -63,3 +63,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_CFB_CONSOLE_ANSI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
> index 8c36654544..357e955d7d 100644
> --- a/configs/T1042RDB_PI_SPIFLASH_defconfig
> +++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
> @@ -64,3 +64,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_CFB_CONSOLE_ANSI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
> index ec816e732b..afdef8ad5c 100644
> --- a/configs/T1042RDB_PI_defconfig
> +++ b/configs/T1042RDB_PI_defconfig
> @@ -52,3 +52,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO=y
> CONFIG_CFB_CONSOLE_ANSI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
> index 2e40362e9e..4b0e9e1ab3 100644
> --- a/configs/T1042RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1042RDB_SECURE_BOOT_defconfig
> @@ -51,3 +51,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
> index 515dec4c55..694db3024e 100644
> --- a/configs/T1042RDB_defconfig
> +++ b/configs/T1042RDB_defconfig
> @@ -47,3 +47,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
> index 30e87df3bb..a588b7b8bf 100644
> --- a/configs/T2080QDS_SDCARD_defconfig
> +++ b/configs/T2080QDS_SDCARD_defconfig
> @@ -58,3 +58,4 @@ CONFIG_SPI=y
> CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
> index 9e155ee6ae..87bde020c1 100644
> --- a/configs/T2080QDS_SECURE_BOOT_defconfig
> +++ b/configs/T2080QDS_SECURE_BOOT_defconfig
> @@ -50,3 +50,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
> index 0cccb3a85d..3f75c1ca9c 100644
> --- a/configs/T2080QDS_SPIFLASH_defconfig
> +++ b/configs/T2080QDS_SPIFLASH_defconfig
> @@ -59,3 +59,4 @@ CONFIG_SPI=y
> CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
> index 9c9a436d81..a395703db4 100644
> --- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
> +++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
> @@ -39,3 +39,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig
> index 79cf4424b4..c76c7b01d8 100644
> --- a/configs/T2080QDS_defconfig
> +++ b/configs/T2080QDS_defconfig
> @@ -48,3 +48,4 @@ CONFIG_SPI=y
> CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
> index dfe5e8bf0c..4fd1c3fb41 100644
> --- a/configs/T2080RDB_SDCARD_defconfig
> +++ b/configs/T2080RDB_SDCARD_defconfig
> @@ -57,3 +57,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig
> index 5ec495aae4..181828ab9c 100644
> --- a/configs/T2080RDB_SECURE_BOOT_defconfig
> +++ b/configs/T2080RDB_SECURE_BOOT_defconfig
> @@ -50,3 +50,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
> index 6d6d6408e5..9271804daf 100644
> --- a/configs/T2080RDB_SPIFLASH_defconfig
> +++ b/configs/T2080RDB_SPIFLASH_defconfig
> @@ -58,3 +58,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
> index 297c31f3c5..3a844b6734 100644
> --- a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
> +++ b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
> @@ -39,3 +39,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig
> index 4f155dee23..a9e8cc6aa6 100644
> --- a/configs/T2080RDB_defconfig
> +++ b/configs/T2080RDB_defconfig
> @@ -46,3 +46,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig
> index 4dd0e909d3..068bed63cf 100644
> --- a/configs/T2081QDS_SDCARD_defconfig
> +++ b/configs/T2081QDS_SDCARD_defconfig
> @@ -57,3 +57,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig
> index 6dc7d6db65..9721f4ff36 100644
> --- a/configs/T2081QDS_SPIFLASH_defconfig
> +++ b/configs/T2081QDS_SPIFLASH_defconfig
> @@ -58,3 +58,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
> index 43fe470320..ba8157525a 100644
> --- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
> +++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
> @@ -39,3 +39,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig
> index 24b616b3c6..4c63d63ae7 100644
> --- a/configs/T2081QDS_defconfig
> +++ b/configs/T2081QDS_defconfig
> @@ -46,3 +46,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4160QDS_SDCARD_defconfig b/configs/T4160QDS_SDCARD_defconfig
> index b29c069102..5212da7efd 100644
> --- a/configs/T4160QDS_SDCARD_defconfig
> +++ b/configs/T4160QDS_SDCARD_defconfig
> @@ -51,3 +51,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig
> index 4463386c07..58ee288090 100644
> --- a/configs/T4160QDS_SECURE_BOOT_defconfig
> +++ b/configs/T4160QDS_SECURE_BOOT_defconfig
> @@ -44,3 +44,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4160QDS_defconfig b/configs/T4160QDS_defconfig
> index 4f45229895..7f5672f9c1 100644
> --- a/configs/T4160QDS_defconfig
> +++ b/configs/T4160QDS_defconfig
> @@ -40,3 +40,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4160RDB_defconfig b/configs/T4160RDB_defconfig
> index 06c80381a7..33d35311bb 100644
> --- a/configs/T4160RDB_defconfig
> +++ b/configs/T4160RDB_defconfig
> @@ -40,3 +40,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4240QDS_SDCARD_defconfig b/configs/T4240QDS_SDCARD_defconfig
> index b461e0880b..cb86348206 100644
> --- a/configs/T4240QDS_SDCARD_defconfig
> +++ b/configs/T4240QDS_SDCARD_defconfig
> @@ -51,3 +51,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4240QDS_SECURE_BOOT_defconfig b/configs/T4240QDS_SECURE_BOOT_defconfig
> index 416b415bb5..504e9f0d94 100644
> --- a/configs/T4240QDS_SECURE_BOOT_defconfig
> +++ b/configs/T4240QDS_SECURE_BOOT_defconfig
> @@ -44,3 +44,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
> index 1169b66a6d..0ccc1931c7 100644
> --- a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
> +++ b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
> @@ -37,3 +37,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4240QDS_defconfig b/configs/T4240QDS_defconfig
> index d1f33d79be..c1afbba0a0 100644
> --- a/configs/T4240QDS_defconfig
> +++ b/configs/T4240QDS_defconfig
> @@ -40,3 +40,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
> index 8bde983738..44b33faea9 100644
> --- a/configs/T4240RDB_SDCARD_defconfig
> +++ b/configs/T4240RDB_SDCARD_defconfig
> @@ -51,3 +51,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig
> index d9f5845756..d6908c2842 100644
> --- a/configs/T4240RDB_defconfig
> +++ b/configs/T4240RDB_defconfig
> @@ -40,3 +40,4 @@ CONFIG_FSL_ESPI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/cat b/configs/cat
> new file mode 100644
> index 0000000000..58429a4cfc
> --- /dev/null
> +++ b/configs/cat
> @@ -0,0 +1 @@
> +CONFIG_NAND=y
> diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
> index a3eea926fd..c33f38094e 100644
> --- a/configs/colibri_t20_defconfig
> +++ b/configs/colibri_t20_defconfig
> @@ -63,3 +63,4 @@ CONFIG_DM_VIDEO=y
> CONFIG_VIDEO_TEGRA20=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_NAND=y
> diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
> index 5a76698160..176d5ea1ef 100644
> --- a/configs/dns325_defconfig
> +++ b/configs/dns325_defconfig
> @@ -39,3 +39,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
> index 41dfbd3263..38f12b5079 100644
> --- a/configs/dockstar_defconfig
> +++ b/configs/dockstar_defconfig
> @@ -31,3 +31,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
> index c04bf0ea57..d753a98b95 100644
> --- a/configs/goflexhome_defconfig
> +++ b/configs/goflexhome_defconfig
> @@ -40,3 +40,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
> index 9998e48ab9..94b6b257cc 100644
> --- a/configs/guruplug_defconfig
> +++ b/configs/guruplug_defconfig
> @@ -41,3 +41,4 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_LZMA=y
> +CONFIG_NAND=y
> diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
> index 1b89580b82..3a520301c5 100644
> --- a/configs/harmony_defconfig
> +++ b/configs/harmony_defconfig
> @@ -51,3 +51,4 @@ CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_DM_VIDEO=y
> CONFIG_VIDEO_TEGRA20=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> +CONFIG_NAND=y
> diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
> index 985d85e027..bb93eec08e 100644
> --- a/configs/ib62x0_defconfig
> +++ b/configs/ib62x0_defconfig
> @@ -36,3 +36,4 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_LZMA=y
> +CONFIG_NAND=y
> diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
> index c075bfb2cf..25cfc9357e 100644
> --- a/configs/iconnect_defconfig
> +++ b/configs/iconnect_defconfig
> @@ -31,3 +31,4 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_LZMA=y
> +CONFIG_NAND=y
> diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
> index 0d055e395d..0e6bce363e 100644
> --- a/configs/ids8313_defconfig
> +++ b/configs/ids8313_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_MPC8XXX_SPI=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
> index b55b8b0424..88d8fdfdfc 100644
> --- a/configs/km_kirkwood_128m16_defconfig
> +++ b/configs/km_kirkwood_128m16_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> +CONFIG_NAND=y
> diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
> index b47b9e36fb..a0f0d452de 100644
> --- a/configs/km_kirkwood_defconfig
> +++ b/configs/km_kirkwood_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> +CONFIG_NAND=y
> diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
> index fb18630874..87aae1ab6e 100644
> --- a/configs/km_kirkwood_pci_defconfig
> +++ b/configs/km_kirkwood_pci_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> +CONFIG_NAND=y
> diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
> index a3cc06bd43..ac4497fe4f 100644
> --- a/configs/kmcoge4_defconfig
> +++ b/configs/kmcoge4_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPI=y
> CONFIG_FSL_ESPI=y
> CONFIG_BCH=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
> index cb47b0b7fd..1829834f67 100644
> --- a/configs/kmcoge5ne_defconfig
> +++ b/configs/kmcoge5ne_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_FLASH_CFI=y
> CONFIG_SYS_NS16550=y
> CONFIG_BCH=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
> index 598af88cd9..77de52a2c6 100644
> --- a/configs/kmcoge5un_defconfig
> +++ b/configs/kmcoge5un_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> +CONFIG_NAND=y
> diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
> index 75e5204ff5..b052c80727 100644
> --- a/configs/kmlion1_defconfig
> +++ b/configs/kmlion1_defconfig
> @@ -51,3 +51,4 @@ CONFIG_SPI=y
> CONFIG_FSL_ESPI=y
> CONFIG_BCH=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
> index 8b3fa7efac..1c5606de62 100644
> --- a/configs/kmnusa_defconfig
> +++ b/configs/kmnusa_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> +CONFIG_NAND=y
> diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
> index d2206b4c3c..a29257b92e 100644
> --- a/configs/kmsugp1_defconfig
> +++ b/configs/kmsugp1_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> +CONFIG_NAND=y
> diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
> index 62d3a0a1d0..da893c3964 100644
> --- a/configs/kmsuv31_defconfig
> +++ b/configs/kmsuv31_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> +CONFIG_NAND=y
> diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
> index 40181758e9..58fe3d717f 100644
> --- a/configs/kmtegr1_defconfig
> +++ b/configs/kmtegr1_defconfig
> @@ -43,3 +43,4 @@ CONFIG_SYS_FLASH_CFI=y
> CONFIG_SYS_NS16550=y
> CONFIG_BCH=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
> index 296cd094a3..86b249ae96 100644
> --- a/configs/ls1021aqds_ddr4_nor_defconfig
> +++ b/configs/ls1021aqds_ddr4_nor_defconfig
> @@ -62,3 +62,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO_FSL_DCU_FB=y
> CONFIG_VIDEO=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> +CONFIG_NAND=y
> diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> index 187c534ffc..ce598182c7 100644
> --- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> +++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> @@ -62,3 +62,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO_FSL_DCU_FB=y
> CONFIG_VIDEO=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> +CONFIG_NAND=y
> diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> index 702d849a89..9003b288ce 100644
> --- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> @@ -63,3 +63,4 @@ CONFIG_VIDEO=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
> index 2fd8d6e340..85b04c4494 100644
> --- a/configs/ls1021aqds_nor_defconfig
> +++ b/configs/ls1021aqds_nor_defconfig
> @@ -63,3 +63,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO_FSL_DCU_FB=y
> CONFIG_VIDEO=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> +CONFIG_NAND=y
> diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
> index e00084cc04..9312fdb71f 100644
> --- a/configs/ls1021aqds_nor_lpuart_defconfig
> +++ b/configs/ls1021aqds_nor_lpuart_defconfig
> @@ -63,3 +63,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO_FSL_DCU_FB=y
> CONFIG_VIDEO=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> +CONFIG_NAND=y
> diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig
> index 55793783d0..d07d4f36ad 100644
> --- a/configs/ls1021aqds_sdcard_ifc_defconfig
> +++ b/configs/ls1021aqds_sdcard_ifc_defconfig
> @@ -74,3 +74,4 @@ CONFIG_USB_STORAGE=y
> CONFIG_VIDEO_FSL_DCU_FB=y
> CONFIG_VIDEO=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> +CONFIG_NAND=y
> diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig
> index a0f9d62d3b..c9dc2a2db8 100644
> --- a/configs/ls1043aqds_defconfig
> +++ b/configs/ls1043aqds_defconfig
> @@ -54,3 +54,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043aqds_lpuart_defconfig b/configs/ls1043aqds_lpuart_defconfig
> index ff5ea65ffe..d21b5270d8 100644
> --- a/configs/ls1043aqds_lpuart_defconfig
> +++ b/configs/ls1043aqds_lpuart_defconfig
> @@ -56,3 +56,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig
> index e9394b3916..eaca1df3cb 100644
> --- a/configs/ls1043aqds_nor_ddr3_defconfig
> +++ b/configs/ls1043aqds_nor_ddr3_defconfig
> @@ -55,3 +55,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043aqds_sdcard_ifc_defconfig b/configs/ls1043aqds_sdcard_ifc_defconfig
> index e876db3297..412de66dee 100644
> --- a/configs/ls1043aqds_sdcard_ifc_defconfig
> +++ b/configs/ls1043aqds_sdcard_ifc_defconfig
> @@ -69,3 +69,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
> index 9a6e7dae28..2d042cb7c3 100644
> --- a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
> +++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
> @@ -58,3 +58,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig
> index a6bc1e28d6..f2ca7a78ba 100644
> --- a/configs/ls1043aqds_tfa_defconfig
> +++ b/configs/ls1043aqds_tfa_defconfig
> @@ -59,3 +59,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig
> index 3f5e0b720a..08e76d863d 100644
> --- a/configs/ls1043ardb_SECURE_BOOT_defconfig
> +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig
> @@ -49,3 +49,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig
> index b1b46b1737..4fe2091b71 100644
> --- a/configs/ls1043ardb_defconfig
> +++ b/configs/ls1043ardb_defconfig
> @@ -47,3 +47,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
> index 753957f658..d2ba216e21 100644
> --- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
> +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
> @@ -64,3 +64,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig
> index 23e54603bb..87bed696c2 100644
> --- a/configs/ls1043ardb_sdcard_defconfig
> +++ b/configs/ls1043ardb_sdcard_defconfig
> @@ -62,3 +62,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
> index ef01a167c4..c7ba12739b 100644
> --- a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
> +++ b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
> @@ -51,3 +51,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig
> index 43cb6f92bd..f2948fefdf 100644
> --- a/configs/ls1043ardb_tfa_defconfig
> +++ b/configs/ls1043ardb_tfa_defconfig
> @@ -51,3 +51,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046aqds_SECURE_BOOT_defconfig b/configs/ls1046aqds_SECURE_BOOT_defconfig
> index 5ba600ee67..ddcd2c78ff 100644
> --- a/configs/ls1046aqds_SECURE_BOOT_defconfig
> +++ b/configs/ls1046aqds_SECURE_BOOT_defconfig
> @@ -56,3 +56,4 @@ CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_RSA=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig
> index b815fc9819..6323ce2844 100644
> --- a/configs/ls1046aqds_defconfig
> +++ b/configs/ls1046aqds_defconfig
> @@ -56,3 +56,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig
> index 9c7e6904ae..50d517e8e0 100644
> --- a/configs/ls1046aqds_lpuart_defconfig
> +++ b/configs/ls1046aqds_lpuart_defconfig
> @@ -58,3 +58,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046aqds_sdcard_ifc_defconfig b/configs/ls1046aqds_sdcard_ifc_defconfig
> index f11da29c79..75d5f12368 100644
> --- a/configs/ls1046aqds_sdcard_ifc_defconfig
> +++ b/configs/ls1046aqds_sdcard_ifc_defconfig
> @@ -72,3 +72,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
> index 44d90576c1..cec4bea83e 100644
> --- a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
> +++ b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
> @@ -58,3 +58,4 @@ CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_RSA=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig
> index e4ccdc6d85..b9fad82517 100644
> --- a/configs/ls1046aqds_tfa_defconfig
> +++ b/configs/ls1046aqds_tfa_defconfig
> @@ -62,3 +62,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046ardb_emmc_defconfig b/configs/ls1046ardb_emmc_defconfig
> index 4b45289869..992ce63053 100644
> --- a/configs/ls1046ardb_emmc_defconfig
> +++ b/configs/ls1046ardb_emmc_defconfig
> @@ -64,3 +64,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
> index 27309bfa33..9bce5fbdc8 100644
> --- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
> +++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
> @@ -50,3 +50,4 @@ CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_RSA=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig
> index d2850480d6..c0e6bae0cb 100644
> --- a/configs/ls1046ardb_qspi_defconfig
> +++ b/configs/ls1046ardb_qspi_defconfig
> @@ -50,3 +50,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046ardb_qspi_spl_defconfig b/configs/ls1046ardb_qspi_spl_defconfig
> index 975cc580bd..5090847469 100644
> --- a/configs/ls1046ardb_qspi_spl_defconfig
> +++ b/configs/ls1046ardb_qspi_spl_defconfig
> @@ -68,3 +68,4 @@ CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_SPL_GZIP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
> index 643a52039a..ccfe65128e 100644
> --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
> +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
> @@ -62,3 +62,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046ardb_sdcard_defconfig b/configs/ls1046ardb_sdcard_defconfig
> index a7624967cf..529d17b365 100644
> --- a/configs/ls1046ardb_sdcard_defconfig
> +++ b/configs/ls1046ardb_sdcard_defconfig
> @@ -63,3 +63,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
> index 93efb5c3a9..00858300f4 100644
> --- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
> +++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
> @@ -51,3 +51,4 @@ CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_RSA=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig
> index c86e182459..9e79ae0fec 100644
> --- a/configs/ls1046ardb_tfa_defconfig
> +++ b/configs/ls1046ardb_tfa_defconfig
> @@ -52,3 +52,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088aqds_defconfig b/configs/ls1088aqds_defconfig
> index dbc0bdf7c9..a8be21a1c8 100644
> --- a/configs/ls1088aqds_defconfig
> +++ b/configs/ls1088aqds_defconfig
> @@ -54,3 +54,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
> index 0254a861d8..bd7d093b2a 100644
> --- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
> +++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
> @@ -58,3 +58,4 @@ CONFIG_USB_GADGET=y
> CONFIG_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig
> index 9160de255d..47d2dfbbcd 100644
> --- a/configs/ls1088aqds_qspi_defconfig
> +++ b/configs/ls1088aqds_qspi_defconfig
> @@ -56,3 +56,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_USB_GADGET=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088aqds_sdcard_ifc_defconfig b/configs/ls1088aqds_sdcard_ifc_defconfig
> index c022ebf357..a7169582fb 100644
> --- a/configs/ls1088aqds_sdcard_ifc_defconfig
> +++ b/configs/ls1088aqds_sdcard_ifc_defconfig
> @@ -61,3 +61,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig
> index 6a9577aba2..0875f1cdc2 100644
> --- a/configs/ls1088aqds_sdcard_qspi_defconfig
> +++ b/configs/ls1088aqds_sdcard_qspi_defconfig
> @@ -65,3 +65,4 @@ CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088aqds_tfa_defconfig b/configs/ls1088aqds_tfa_defconfig
> index 891810a583..db494462f5 100644
> --- a/configs/ls1088aqds_tfa_defconfig
> +++ b/configs/ls1088aqds_tfa_defconfig
> @@ -65,3 +65,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_USB_GADGET=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
> index 78aec38a12..4b8c41ccd4 100644
> --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
> +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
> @@ -59,3 +59,4 @@ CONFIG_USB_GADGET=y
> CONFIG_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig
> index 5503a71d3c..8a14c6b60c 100644
> --- a/configs/ls1088ardb_qspi_defconfig
> +++ b/configs/ls1088ardb_qspi_defconfig
> @@ -57,3 +57,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_USB_GADGET=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
> index b53f212125..74bc78408f 100644
> --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
> +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
> @@ -66,3 +66,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig
> index a7cdead46e..1868f33ec5 100644
> --- a/configs/ls1088ardb_sdcard_qspi_defconfig
> +++ b/configs/ls1088ardb_sdcard_qspi_defconfig
> @@ -66,3 +66,4 @@ CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
> index 1163399c74..090bd56703 100644
> --- a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
> +++ b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
> @@ -62,3 +62,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls1088ardb_tfa_defconfig b/configs/ls1088ardb_tfa_defconfig
> index 7263471685..288073399a 100644
> --- a/configs/ls1088ardb_tfa_defconfig
> +++ b/configs/ls1088ardb_tfa_defconfig
> @@ -60,3 +60,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_USB_DWC3=y
> CONFIG_USB_GADGET=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2080a_simu_defconfig b/configs/ls2080a_simu_defconfig
> index 17460a2198..3278b4bf1b 100644
> --- a/configs/ls2080a_simu_defconfig
> +++ b/configs/ls2080a_simu_defconfig
> @@ -39,3 +39,4 @@ CONFIG_SYS_FLASH_CFI=y
> CONFIG_SYS_NS16550=y
> CONFIG_OF_LIBFDT=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig
> index a7d6c98b0e..58361cfa82 100644
> --- a/configs/ls2080aqds_SECURE_BOOT_defconfig
> +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig
> @@ -61,3 +61,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig
> index 9e0e66c124..69d1e264be 100644
> --- a/configs/ls2080aqds_defconfig
> +++ b/configs/ls2080aqds_defconfig
> @@ -60,3 +60,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig
> index a3e35bd77d..136173f526 100644
> --- a/configs/ls2080aqds_qspi_defconfig
> +++ b/configs/ls2080aqds_qspi_defconfig
> @@ -57,3 +57,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2080aqds_sdcard_defconfig b/configs/ls2080aqds_sdcard_defconfig
> index d4c64a52f1..bb577bb0f4 100644
> --- a/configs/ls2080aqds_sdcard_defconfig
> +++ b/configs/ls2080aqds_sdcard_defconfig
> @@ -64,3 +64,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig
> index 647edeaed7..d7582accbf 100644
> --- a/configs/ls2080ardb_SECURE_BOOT_defconfig
> +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig
> @@ -61,3 +61,4 @@ CONFIG_USB_XHCI_DWC3=y
> CONFIG_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig
> index a1ddc1add6..c79dc8eb1d 100644
> --- a/configs/ls2080ardb_defconfig
> +++ b/configs/ls2080ardb_defconfig
> @@ -60,3 +60,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2088aqds_tfa_defconfig b/configs/ls2088aqds_tfa_defconfig
> index 85e6a01f5d..34acec7be2 100644
> --- a/configs/ls2088aqds_tfa_defconfig
> +++ b/configs/ls2088aqds_tfa_defconfig
> @@ -63,3 +63,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
> index 058b3dd938..38610d46e2 100644
> --- a/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
> +++ b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
> @@ -68,3 +68,4 @@ CONFIG_RSA=y
> CONFIG_SPL_RSA=y
> CONFIG_RSA_SOFTWARE_EXP=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/ls2088ardb_tfa_defconfig b/configs/ls2088ardb_tfa_defconfig
> index e15156be3e..52f37a454c 100644
> --- a/configs/ls2088ardb_tfa_defconfig
> +++ b/configs/ls2088ardb_tfa_defconfig
> @@ -69,3 +69,4 @@ CONFIG_DM_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_DWC3=y
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> +CONFIG_NAND=y
> diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
> index 0a3250988a..7981406a21 100644
> --- a/configs/medcom-wide_defconfig
> +++ b/configs/medcom-wide_defconfig
> @@ -37,3 +37,4 @@ CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_DM_VIDEO=y
> CONFIG_VIDEO_TEGRA20=y
> +CONFIG_NAND=y
> diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
> index 0c2785c095..6dcaf0ccbd 100644
> --- a/configs/mgcoge3un_defconfig
> +++ b/configs/mgcoge3un_defconfig
> @@ -42,3 +42,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> +CONFIG_NAND=y
> diff --git a/configs/nand.sh b/configs/nand.sh
> new file mode 100755
> index 0000000000..e34e709a3d
> --- /dev/null
> +++ b/configs/nand.sh
> @@ -0,0 +1,4 @@
> +for file in `cat ../moveconfig.suspicious`; do
> +
> + echo 'CONFIG_NAND=y' >> "$file"
> +done
> diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
> index 6bd308bb82..bdea7a5fa7 100644
> --- a/configs/nas220_defconfig
> +++ b/configs/nas220_defconfig
> @@ -40,3 +40,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
> index eb29a70157..d42ef089e2 100644
> --- a/configs/nsa310s_defconfig
> +++ b/configs/nsa310s_defconfig
> @@ -34,3 +34,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_LZMA=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
> index a01f1fe94e..965e9e3408 100644
> --- a/configs/openrd_base_defconfig
> +++ b/configs/openrd_base_defconfig
> @@ -37,3 +37,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
> index 0d17485fbb..f321e5cad4 100644
> --- a/configs/openrd_client_defconfig
> +++ b/configs/openrd_client_defconfig
> @@ -37,3 +37,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
> index 79c8f7fb08..b23273a3d3 100644
> --- a/configs/openrd_ultimate_defconfig
> +++ b/configs/openrd_ultimate_defconfig
> @@ -37,3 +37,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
> index 318eada004..9121276f3a 100644
> --- a/configs/plutux_defconfig
> +++ b/configs/plutux_defconfig
> @@ -30,3 +30,4 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_EHCI_TEGRA=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_NAND=y
> diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
> index 3aef5b590a..866761cf9d 100644
> --- a/configs/pogo_e02_defconfig
> +++ b/configs/pogo_e02_defconfig
> @@ -30,3 +30,4 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> +CONFIG_NAND=y
> diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
> index 7d2e97a6f0..723da886f2 100644
> --- a/configs/portl2_defconfig
> +++ b/configs/portl2_defconfig
> @@ -41,3 +41,4 @@ CONFIG_SPI=y
> CONFIG_KIRKWOOD_SPI=y
> CONFIG_BCH=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
> index 0a2c7d9510..c9bc6e7bbe 100644
> --- a/configs/seaboard_defconfig
> +++ b/configs/seaboard_defconfig
> @@ -43,3 +43,4 @@ CONFIG_DM_VIDEO=y
> CONFIG_VIDEO_TEGRA20=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> CONFIG_AES=y
> +CONFIG_NAND=y
> diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
> index 04b00cdea9..feb945aa63 100644
> --- a/configs/sheevaplug_defconfig
> +++ b/configs/sheevaplug_defconfig
> @@ -42,3 +42,4 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_LZMA=y
> +CONFIG_NAND=y
> diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig
> index 72f460c912..038260dcfa 100644
> --- a/configs/spear300_defconfig
> +++ b/configs/spear300_defconfig
> @@ -27,3 +27,4 @@ CONFIG_PHY_GIGE=y
> CONFIG_ETH_DESIGNWARE=y
> CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> +CONFIG_NAND=y
> diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig
> index cb115fecb7..981c79310a 100644
> --- a/configs/spear300_usbtty_defconfig
> +++ b/configs/spear300_usbtty_defconfig
> @@ -29,3 +29,4 @@ CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig
> index 0fc0d0e939..d84aaec291 100644
> --- a/configs/spear310_defconfig
> +++ b/configs/spear310_defconfig
> @@ -27,3 +27,4 @@ CONFIG_PHY_GIGE=y
> CONFIG_ETH_DESIGNWARE=y
> CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> +CONFIG_NAND=y
> diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig
> index 906d813453..98ed3aa870 100644
> --- a/configs/spear310_pnor_defconfig
> +++ b/configs/spear310_pnor_defconfig
> @@ -30,3 +30,4 @@ CONFIG_PHY_GIGE=y
> CONFIG_ETH_DESIGNWARE=y
> CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> +CONFIG_NAND=y
> diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig
> index 9373df83f7..2d299514f9 100644
> --- a/configs/spear310_usbtty_defconfig
> +++ b/configs/spear310_usbtty_defconfig
> @@ -29,3 +29,4 @@ CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig
> index 8263454de6..4051968a64 100644
> --- a/configs/spear310_usbtty_pnor_defconfig
> +++ b/configs/spear310_usbtty_pnor_defconfig
> @@ -32,3 +32,4 @@ CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig
> index 9c66bcf424..bd46d5460e 100644
> --- a/configs/spear320_defconfig
> +++ b/configs/spear320_defconfig
> @@ -27,3 +27,4 @@ CONFIG_PHY_GIGE=y
> CONFIG_ETH_DESIGNWARE=y
> CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> +CONFIG_NAND=y
> diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig
> index 7177efea10..dd132f5dce 100644
> --- a/configs/spear320_pnor_defconfig
> +++ b/configs/spear320_pnor_defconfig
> @@ -30,3 +30,4 @@ CONFIG_PHY_GIGE=y
> CONFIG_ETH_DESIGNWARE=y
> CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> +CONFIG_NAND=y
> diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig
> index 80acff0cce..50bafcd639 100644
> --- a/configs/spear320_usbtty_defconfig
> +++ b/configs/spear320_usbtty_defconfig
> @@ -29,3 +29,4 @@ CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig
> index 916321c60c..c4c59c1dc3 100644
> --- a/configs/spear320_usbtty_pnor_defconfig
> +++ b/configs/spear320_usbtty_pnor_defconfig
> @@ -32,3 +32,4 @@ CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig
> index d2972c1f04..46505d1c03 100644
> --- a/configs/spear600_defconfig
> +++ b/configs/spear600_defconfig
> @@ -30,3 +30,4 @@ CONFIG_PHY_GIGE=y
> CONFIG_ETH_DESIGNWARE=y
> CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> +CONFIG_NAND=y
> diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig
> index d0bdc7587d..80b28963dc 100644
> --- a/configs/spear600_usbtty_defconfig
> +++ b/configs/spear600_usbtty_defconfig
> @@ -29,3 +29,4 @@ CONFIG_MII=y
> CONFIG_CONS_INDEX=0
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_NAND=y
> diff --git a/configs/tec_defconfig b/configs/tec_defconfig
> index 7017aade68..ccf198818b 100644
> --- a/configs/tec_defconfig
> +++ b/configs/tec_defconfig
> @@ -37,3 +37,4 @@ CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_SMSC95XX=y
> CONFIG_DM_VIDEO=y
> CONFIG_VIDEO_TEGRA20=y
> +CONFIG_NAND=y
> diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig
> index 584aafb08f..c4aabff2d9 100644
> --- a/configs/ve8313_defconfig
> +++ b/configs/ve8313_defconfig
> @@ -23,3 +23,4 @@ CONFIG_PHY_MARVELL=y
> CONFIG_TSEC_ENET=y
> CONFIG_SYS_NS16550=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig
> index 105e51a400..594f39592c 100644
> --- a/configs/work_92105_defconfig
> +++ b/configs/work_92105_defconfig
> @@ -39,3 +39,4 @@ CONFIG_PHY_ADDR_ENABLE=y
> CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_LPC32XX_SSP=y
> +CONFIG_NAND=y
> diff --git a/configs/x600_defconfig b/configs/x600_defconfig
> index a96f54c737..4a43764f83 100644
> --- a/configs/x600_defconfig
> +++ b/configs/x600_defconfig
> @@ -61,3 +61,4 @@ CONFIG_BCH=y
> CONFIG_USE_TINY_PRINTF=y
> CONFIG_OF_LIBFDT=y
> # CONFIG_EFI_LOADER is not set
> +CONFIG_NAND=y
> diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig
> index e009aabb55..c280b4bb91 100644
> --- a/configs/xpedite537x_defconfig
> +++ b/configs/xpedite537x_defconfig
> @@ -41,3 +41,4 @@ CONFIG_TSEC_ENET=y
> CONFIG_SYS_NS16550=y
> CONFIG_PANIC_HANG=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig
> index 5d3569b34d..077788fc7d 100644
> --- a/configs/xpedite550x_defconfig
> +++ b/configs/xpedite550x_defconfig
> @@ -41,3 +41,4 @@ CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_PANIC_HANG=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_NAND=y
> --
> 2.17.1
>
More information about the U-Boot
mailing list