Skip to contentSkip to conversation

cmd: Make CMD_NAND imply NAND

PATCH In review Adam Ford 2 participants 2 messages Jul 8, 2018 – Jul 23, 2018

Subsystems (3)
Arm i.MX and Layerscape Arm/Microchip (AT91) SoC support Arm/Zynq architecture
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 cmd: Make CMD_NAND imply NAND

Many boards check for CMD_NAND and not NAND. This makes CMD_NAND imply NAND which will make some Kconfig migration of some NAND options easier later.

Rsync all defconfig files using moveconfig.py

Signed-off-by Adam Ford <[email protected]>
---
 cmd/Kconfig                                      | 1 +
 configs/MPC8313ERDB_NAND_33_defconfig            | 1 -
 configs/MPC8313ERDB_NAND_66_defconfig            | 1 -
 configs/P1022DS_36BIT_NAND_defconfig             | 1 -
 configs/P1022DS_NAND_defconfig                   | 1 -
 configs/P1025RDB_NAND_defconfig                  | 1 -
 configs/P5020DS_NAND_SECURE_BOOT_defconfig       | 1 -
 configs/P5020DS_NAND_defconfig                   | 1 -
 configs/P5040DS_NAND_SECURE_BOOT_defconfig       | 1 -
 configs/P5040DS_NAND_defconfig                   | 1 -
 configs/am335x_baltos_defconfig                  | 1 -
 configs/am335x_evm_defconfig                     | 1 -
 configs/am335x_evm_nor_defconfig                 | 1 -
 configs/am335x_evm_usbspl_defconfig              | 1 -
 configs/am335x_hs_evm_defconfig                  | 1 -
 configs/am335x_hs_evm_uart_defconfig             | 1 -
 configs/am335x_igep003x_defconfig                | 1 -
 configs/am3517_crane_defconfig                   | 1 -
 configs/am3517_evm_defconfig                     | 1 -
 configs/am43xx_evm_defconfig                     | 1 -
 configs/am43xx_evm_ethboot_defconfig             | 1 -
 configs/am43xx_evm_rtconly_defconfig             | 1 -
 configs/am43xx_evm_usbhost_boot_defconfig        | 1 -
 configs/am43xx_hs_evm_defconfig                  | 1 -
 configs/apf27_defconfig                          | 4 +---
 configs/aristainetos2_defconfig                  | 6 ++++--
 configs/aristainetos2b_defconfig                 | 6 ++++--
 configs/aristainetos_defconfig                   | 6 ++++--
 configs/at91sam9260ek_dataflash_cs0_defconfig    | 1 -
 configs/at91sam9260ek_dataflash_cs1_defconfig    | 1 -
 configs/at91sam9260ek_nandflash_defconfig        | 1 -
 configs/at91sam9261ek_dataflash_cs0_defconfig    | 1 -
 configs/at91sam9261ek_dataflash_cs3_defconfig    | 1 -
 configs/at91sam9261ek_nandflash_defconfig        | 1 -
 configs/at91sam9263ek_dataflash_cs0_defconfig    | 1 -
 configs/at91sam9263ek_dataflash_defconfig        | 1 -
 configs/at91sam9263ek_nandflash_defconfig        | 1 -
 configs/at91sam9263ek_norflash_boot_defconfig    | 1 -
 configs/at91sam9263ek_norflash_defconfig         | 1 -
 configs/at91sam9g10ek_dataflash_cs0_defconfig    | 1 -
 configs/at91sam9g10ek_dataflash_cs3_defconfig    | 1 -
 configs/at91sam9g10ek_nandflash_defconfig        | 1 -
 configs/at91sam9g20ek_2mmc_defconfig             | 1 -
 configs/at91sam9g20ek_2mmc_nandflash_defconfig   | 1 -
 configs/at91sam9g20ek_dataflash_cs0_defconfig    | 1 -
 configs/at91sam9g20ek_dataflash_cs1_defconfig    | 1 -
 configs/at91sam9g20ek_nandflash_defconfig        | 1 -
 configs/at91sam9m10g45ek_mmc_defconfig           | 1 -
 configs/at91sam9n12ek_mmc_defconfig              | 1 -
 configs/at91sam9n12ek_spiflash_defconfig         | 1 -
 configs/at91sam9rlek_dataflash_defconfig         | 1 -
 configs/at91sam9rlek_mmc_defconfig               | 1 -
 configs/at91sam9rlek_nandflash_defconfig         | 1 -
 configs/at91sam9x5ek_dataflash_defconfig         | 1 -
 configs/at91sam9x5ek_mmc_defconfig               | 1 -
 configs/at91sam9x5ek_spiflash_defconfig          | 1 -
 configs/at91sam9xeek_dataflash_cs0_defconfig     | 1 -
 configs/at91sam9xeek_dataflash_cs1_defconfig     | 1 -
 configs/at91sam9xeek_nandflash_defconfig         | 1 -
 configs/axm_defconfig                            | 1 -
 configs/bg0900_defconfig                         | 4 ++--
 configs/bitmain_antminer_s9_defconfig            | 4 +---
 configs/bk4r1_defconfig                          | 3 +--
 configs/brppt1_nand_defconfig                    | 1 -
 configs/cairo_defconfig                          | 1 -
 configs/chiliboard_defconfig                     | 1 -
 configs/cm_t335_defconfig                        | 1 -
 configs/cm_t3517_defconfig                       | 1 -
 configs/cm_t35_defconfig                         | 1 -
 configs/cm_t43_defconfig                         | 1 -
 configs/colibri_imx7_defconfig                   | 6 ++++--
 configs/corvus_defconfig                         | 1 -
 configs/devkit3250_defconfig                     | 1 -
 configs/devkit8000_defconfig                     | 1 -
 configs/draco_defconfig                          | 1 -
 configs/ea20_defconfig                           | 1 -
 configs/eco5pk_defconfig                         | 1 -
 configs/etamin_defconfig                         | 1 -
 configs/ethernut5_defconfig                      | 1 -
 configs/gurnard_defconfig                        | 1 -
 configs/gwventana_nand_defconfig                 | 6 ++++--
 configs/igep0032_defconfig                       | 1 -
 configs/igep00x0_defconfig                       | 1 -
 configs/imx6q_logic_defconfig                    | 6 ++++--
 configs/ipam390_defconfig                        | 1 -
 configs/k2e_evm_defconfig                        | 1 -
 configs/k2e_hs_evm_defconfig                     | 1 -
 configs/k2hk_evm_defconfig                       | 1 -
 configs/k2hk_hs_evm_defconfig                    | 1 -
 configs/k2l_evm_defconfig                        | 1 -
 configs/k2l_hs_evm_defconfig                     | 1 -
 configs/mcx_defconfig                            | 1 -
 configs/meesc_defconfig                          | 1 -
 configs/mt_ventoux_defconfig                     | 1 -
 configs/mx28evk_auart_console_defconfig          | 3 +--
 configs/mx28evk_defconfig                        | 3 +--
 configs/mx28evk_nand_defconfig                   | 3 +--
 configs/mx28evk_spi_defconfig                    | 3 +--
 configs/mx6sabreauto_defconfig                   | 6 ++++--
 configs/mx6sxsabreauto_defconfig                 | 6 ++++--
 configs/omap3_beagle_defconfig                   | 1 -
 configs/omap3_evm_defconfig                      | 1 -
 configs/omap3_ha_defconfig                       | 1 -
 configs/omap3_logic_defconfig                    | 1 -
 configs/omap3_overo_defconfig                    | 1 -
 configs/omap3_pandora_defconfig                  | 1 -
 configs/omap3_zoom1_defconfig                    | 1 -
 configs/omapl138_lcdk_defconfig                  | 1 -
 configs/pcm052_defconfig                         | 3 +--
 configs/pcm058_defconfig                         | 6 ++++--
 configs/pengwyn_defconfig                        | 3 +--
 configs/pfla02_defconfig                         | 5 +++--
 configs/platinum_picon_defconfig                 | 6 ++++--
 configs/platinum_titanium_defconfig              | 6 ++++--
 configs/pm9261_defconfig                         | 1 -
 configs/pm9263_defconfig                         | 1 -
 configs/pm9g45_defconfig                         | 1 -
 configs/pxm2_defconfig                           | 1 -
 configs/rastaban_defconfig                       | 1 -
 configs/rut_defconfig                            | 1 -
 configs/sama5d2_ptc_ek_mmc_defconfig             | 1 -
 configs/sama5d36ek_cmp_mmc_defconfig             | 1 -
 configs/sama5d36ek_cmp_spiflash_defconfig        | 1 -
 configs/sama5d3_xplained_mmc_defconfig           | 1 -
 configs/sama5d3xek_mmc_defconfig                 | 1 -
 configs/sama5d3xek_spiflash_defconfig            | 1 -
 configs/sama5d4_xplained_mmc_defconfig           | 1 -
 configs/sama5d4_xplained_spiflash_defconfig      | 1 -
 configs/sama5d4ek_mmc_defconfig                  | 1 -
 configs/sama5d4ek_spiflash_defconfig             | 1 -
 configs/sheevaplug_defconfig                     | 2 +-
 configs/smartweb_defconfig                       | 1 -
 configs/snapper9260_defconfig                    | 1 -
 configs/snapper9g20_defconfig                    | 1 -
 configs/spear300_nand_defconfig                  | 1 -
 configs/spear300_usbtty_nand_defconfig           | 1 -
 configs/spear310_nand_defconfig                  | 1 -
 configs/spear310_usbtty_nand_defconfig           | 1 -
 configs/spear320_nand_defconfig                  | 1 -
 configs/spear320_usbtty_nand_defconfig           | 1 -
 configs/spear600_nand_defconfig                  | 1 -
 configs/spear600_usbtty_nand_defconfig           | 1 -
 configs/tao3530_defconfig                        | 1 -
 configs/taurus_defconfig                         | 1 -
 configs/thuban_defconfig                         | 1 -
 configs/ti816x_evm_defconfig                     | 1 -
 configs/titanium_defconfig                       | 6 ++++--
 configs/tricorder_defconfig                      | 1 -
 configs/tricorder_flash_defconfig                | 1 -
 configs/twister_defconfig                        | 1 -
 configs/usb_a9263_dataflash_defconfig            | 1 -
 configs/vf610twr_defconfig                       | 3 +--
 configs/vf610twr_nand_defconfig                  | 3 +--
 configs/wb45n_defconfig                          | 1 -
 configs/wb50n_defconfig                          | 1 -
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 3 +--
 configs/zynq_zc770_xm011_defconfig               | 3 +--
 configs/zynq_zc770_xm011_x16_defconfig           | 3 +--
 158 files changed, 69 insertions(+), 187 deletions(-)
cmd/Kconfig +1 -0
index aec209006d..cc66891ac4 100644
@@ -851,6 +851,7 @@ config CMD_MMC_SWRITE
 config CMD_NAND
 	bool "nand"
 	default y if NAND_SUNXI
+	select NAND
 	help
 	  NAND support.
configs/MPC8313ERDB_NAND_33_defconfig +0 -1
index 08587b7538..d4a1f09a81 100644
@@ -29,7 +29,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e2800000.flash:512k(uboot),128k(env),6m at 1m(ker
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_NETDEVICES=y
 CONFIG_TSEC_ENET=y
configs/MPC8313ERDB_NAND_66_defconfig +0 -1
index a6bd729a5a..4b6a455f5d 100644
@@ -29,7 +29,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e2800000.flash:512k(uboot),128k(env),6m at 1m(ker
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_NETDEVICES=y
 CONFIG_TSEC_ENET=y
configs/P1022DS_36BIT_NAND_defconfig +0 -1
index 45acdcb979..3e4bdecec7 100644
@@ -42,7 +42,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m(
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1022DS_NAND_defconfig +0 -1
index 47a3bbd2ad..7121446515 100644
@@ -41,7 +41,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(d
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1025RDB_NAND_defconfig +0 -1
index cc55f3e466..f5c7a26ab3 100644
@@ -40,7 +40,6 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P5020DS_NAND_SECURE_BOOT_defconfig +0 -1
index eb1799e753..c685eef973 100644
@@ -28,7 +28,6 @@ CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P5020DS_NAND_defconfig +0 -1
index b60ae5d097..963acce3be 100644
@@ -27,7 +27,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P5040DS_NAND_SECURE_BOOT_defconfig +0 -1
index f7f56fe0ae..4158f48bda 100644
@@ -28,7 +28,6 @@ CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P5040DS_NAND_defconfig +0 -1
index 71ecf0f990..b59244a9e2 100644
@@ -27,7 +27,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/am335x_baltos_defconfig +0 -1
index 5400a4cff1..807b610a71 100644
@@ -42,7 +42,6 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_OMAP24_I2C_SPEED=1000
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_SYS_NS16550=y
configs/am335x_evm_defconfig +0 -1
index c982bed138..87ffb08db4 100644
@@ -35,7 +35,6 @@ CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
configs/am335x_evm_nor_defconfig +0 -1
index aed312e451..84a766fcaa 100644
@@ -27,7 +27,6 @@ CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am335x_evm_usbspl_defconfig +0 -1
index 88003b5852..8a7e04be9c 100644
@@ -35,7 +35,6 @@ CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am335x_hs_evm_defconfig +0 -1
index f02bd37a18..46a8b8148f 100644
@@ -43,7 +43,6 @@ CONFIG_MISC=y
 CONFIG_DM_MMC=y
 # CONFIG_MMC_HW_PARTITIONING is not set
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
configs/am335x_hs_evm_uart_defconfig +0 -1
index 06177faa9a..c728fa4c61 100644
@@ -40,7 +40,6 @@ CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
configs/am335x_igep003x_defconfig +0 -1
index aaa5397641..666d10401d 100644
@@ -41,7 +41,6 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_UBI=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_SYS_NS16550=y
configs/am3517_crane_defconfig +0 -1
index 23b3441505..152340d439 100644
@@ -24,7 +24,6 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/am3517_evm_defconfig +0 -1
index 3b8e2900eb..d87a1e4670 100644
@@ -35,7 +35,6 @@ CONFIG_SPL_OF_PLATDATA=y
 # CONFIG_ENV_IS_IN_FAT is not set
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/am43xx_evm_defconfig +0 -1
index 06e6c0d5b0..d0166fb301 100644
@@ -33,7 +33,6 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_evm_ethboot_defconfig +0 -1
index c6f6d4f9ac..07f9ae3a42 100644
@@ -39,7 +39,6 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_evm_rtconly_defconfig +0 -1
index a4d0210930..c29d8d65f2 100644
@@ -34,7 +34,6 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_evm_usbhost_boot_defconfig +0 -1
index f2c20ab40f..03fc0858fb 100644
@@ -47,7 +47,6 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_hs_evm_defconfig +0 -1
index a6fa2e54be..e86819c799 100644
@@ -44,7 +44,6 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/apf27_defconfig +1 -3
index 5f688f0be8..4c27d895db 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_DHCP=y

@@ -38,7 +39,4 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
 CONFIG_MXC_GPIO=y
 CONFIG_MMC_MXC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXC=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_OF_LIBFDT=y
configs/aristainetos2_defconfig +4 -2
index 60fd211ce9..c9077dc104 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y

@@ -32,9 +33,10 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/aristainetos2b_defconfig +4 -2
index a3537c1211..b7608f9833 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y

@@ -32,9 +33,10 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/aristainetos_defconfig +4 -2
index 990aa499f7..d10a77699c 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y

@@ -32,9 +33,10 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/at91sam9260ek_dataflash_cs0_defconfig +0 -1
index c77b8d8a20..cb6624987a 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9260ek_dataflash_cs1_defconfig +0 -1
index 254d159185..5d1c5e2b6a 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9260ek_nandflash_defconfig +0 -1
index 9079a668bd..bd8b8acaa0 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9261ek_dataflash_cs0_defconfig +0 -1
index c5b37fcbd3..8caac814fb 100644
@@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9261ek_dataflash_cs3_defconfig +0 -1
index 43fb85cc11..cc4d1c95bc 100644
@@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9261ek_nandflash_defconfig +0 -1
index a62617afbe..a3c1351aca 100644
@@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_dataflash_cs0_defconfig +0 -1
index c49f3871fd..edcad95262 100644
@@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_dataflash_defconfig +0 -1
index c49f3871fd..edcad95262 100644
@@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_nandflash_defconfig +0 -1
index 1592a7ccd6..8399c8553d 100644
@@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_norflash_boot_defconfig +0 -1
index 0009a9cbea..7ecbbc0ca9 100644
@@ -38,7 +38,6 @@ CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_norflash_defconfig +0 -1
index e035589582..024fc09b60 100644
@@ -38,7 +38,6 @@ CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g10ek_dataflash_cs0_defconfig +0 -1
index 632031a6ab..c5f32f75ea 100644
@@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g10ek_dataflash_cs3_defconfig +0 -1
index 1fdbbe0419..d6cff69374 100644
@@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g10ek_nandflash_defconfig +0 -1
index c9c0d88bad..e016dbaae8 100644
@@ -35,7 +35,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_2mmc_defconfig +0 -1
index 01f9347bd1..de945206d5 100644
@@ -36,7 +36,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_2mmc_nandflash_defconfig +0 -1
index 522d2086d7..a8fb9b7c7c 100644
@@ -36,7 +36,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_dataflash_cs0_defconfig +0 -1
index e7aa23201e..b3a668e857 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_dataflash_cs1_defconfig +0 -1
index 94ed68d51e..ab44a27eb4 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_nandflash_defconfig +0 -1
index d6bcf695fd..99cb69e877 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9m10g45ek_mmc_defconfig +0 -1
index aa01be0104..eb3bbb09a4 100644
@@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/at91sam9n12ek_mmc_defconfig +0 -1
index 19cca1096b..48d237e6c4 100644
@@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9n12ek_spiflash_defconfig +0 -1
index ba50e7a070..070e766ce9 100644
@@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9rlek_dataflash_defconfig +0 -1
index c1ff8a179c..b4bf22bcd6 100644
@@ -37,7 +37,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9rlek_mmc_defconfig +0 -1
index 80d596145a..be0ac1a814 100644
@@ -37,7 +37,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9rlek_nandflash_defconfig +0 -1
index 3ed0aa18be..3e6419f5ac 100644
@@ -37,7 +37,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9x5ek_dataflash_defconfig +0 -1
index 54b4a3316a..01befd2de5 100644
@@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9x5ek_mmc_defconfig +0 -1
index 3a2d6f4fcc..2414a2c1d0 100644
@@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9x5ek_spiflash_defconfig +0 -1
index b2c5783fef..7079fc2375 100644
@@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9xeek_dataflash_cs0_defconfig +0 -1
index 4140eb30bb..45238f9e5e 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9xeek_dataflash_cs1_defconfig +0 -1
index 12818c6189..19539ef5b5 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9xeek_nandflash_defconfig +0 -1
index fb079e8088..c3a744d4fa 100644
@@ -34,7 +34,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/axm_defconfig +0 -1
index f1bdd0f04c..54ea636115 100644
@@ -37,7 +37,6 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/bg0900_defconfig +2 -2
index fa8f6dcba8..bc46fd96f2 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y

@@ -27,9 +28,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_DOS_PARTITION=y
+CONFIG_APBH_DMA=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/bitmain_antminer_s9_defconfig +1 -3
index 40bce4e374..398fa60543 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_FPGA_LOADMK=y
 CONFIG_CMD_FPGA_LOADP=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_PART=y
 # CONFIG_CMD_SETEXPR is not set

@@ -53,9 +54,6 @@ CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
-CONFIG_NAND=y
-CONFIG_NAND_ZYNQ=y
-CONFIG_NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
configs/bk4r1_defconfig +1 -2
index c90ed96ef0..a27a50f961 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_DHCP=y

@@ -30,8 +31,6 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_VYBRID_GPIO=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND_VF610_NFC=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/brppt1_nand_defconfig +0 -1
index ac50abc661..9e289b6d3e 100644
@@ -52,7 +52,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_NETCONSOLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
configs/cairo_defconfig +0 -1
index 0a772a284c..b15255c37d 100644
@@ -27,7 +27,6 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
configs/chiliboard_defconfig +0 -1
index 09d7452ae4..9956f0b332 100644
@@ -33,7 +33,6 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/cm_t335_defconfig +0 -1
index a9848a588e..54862db970 100644
@@ -44,7 +44,6 @@ CONFIG_LED_STATUS_BIT=64
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_SYS_NS16550=y
 CONFIG_FAT_WRITE=y
configs/cm_t3517_defconfig +0 -1
index f41f267d5f..4c38f11680 100644
@@ -39,7 +39,6 @@ CONFIG_LED_STATUS_STATE=2
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x2D000000
configs/cm_t35_defconfig +0 -1
index 8548ceba71..b17f673489 100644
@@ -39,7 +39,6 @@ CONFIG_LED_STATUS_STATE=2
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
configs/cm_t43_defconfig +0 -1
index 0f9b0ca0c8..2a4ab6496e 100644
@@ -46,7 +46,6 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/colibri_imx7_defconfig +4 -2
index b6139c0c38..621df51768 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_NAND_TORTURE=y
 CONFIG_CMD_USB=y

@@ -45,11 +46,12 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DFU_MMC=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/corvus_defconfig +0 -1
index 16999b6de1..43e2ab0696 100644
@@ -40,7 +40,6 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
 CONFIG_ATMEL_USART=y
configs/devkit3250_defconfig +0 -1
index 8a37122104..330c28bf9a 100644
@@ -33,7 +33,6 @@ CONFIG_SPL_DM=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_LPC32XX_SLC=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_PHYLIB=y
configs/devkit8000_defconfig +0 -1
index 4a096b9265..7621159473 100644
@@ -25,7 +25,6 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/draco_defconfig +0 -1
index 5c61659fe5..ca5008a3ea 100644
@@ -58,7 +58,6 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/ea20_defconfig +0 -1
index 43292a126d..c1169655d8 100644
@@ -30,7 +30,6 @@ CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/eco5pk_defconfig +0 -1
index 44e83a2d4b..275abc3294 100644
@@ -28,7 +28,6 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/etamin_defconfig +0 -1
index 3bb9b2e34e..09a9785a03 100644
@@ -58,7 +58,6 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/ethernut5_defconfig +0 -1
index fd5a6f66e9..ec37c93254 100644
@@ -49,7 +49,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/gurnard_defconfig +0 -1
index f00a06a29b..5574cd5dac 100644
@@ -24,7 +24,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
 CONFIG_TIMER=y
configs/gwventana_nand_defconfig +4 -2
index f4d35a62b8..a84f9cc246 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y

@@ -58,10 +59,11 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
configs/igep0032_defconfig +0 -1
index ace2f64f6f..ac17895aa5 100644
@@ -30,7 +30,6 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
configs/igep00x0_defconfig +0 -1
index 5b3d24d066..89954d0c6f 100644
@@ -30,7 +30,6 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/imx6q_logic_defconfig +4 -2
index f0974bfa15..5a20edf237 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_PMIC=y

@@ -25,10 +26,11 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:4m(uboot),1m(env),16m(kernel),1m(dtb),-(fs)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_SMSC=y
 CONFIG_FEC_MXC=y
configs/ipam390_defconfig +0 -1
index d1a6e542cb..5ce7c9f296 100644
@@ -34,6 +34,5 @@ CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SYS_NS16550=y
configs/k2e_evm_defconfig +0 -1
index c5bb84a8d6..50462f1d34 100644
@@ -36,7 +36,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2e_hs_evm_defconfig +0 -1
index a86eeb8b14..106baf6046 100644
@@ -29,7 +29,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2hk_evm_defconfig +0 -1
index 942e44e7a9..378ed5367b 100644
@@ -36,7 +36,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2hk_hs_evm_defconfig +0 -1
index 12be37f0b7..df6bcec110 100644
@@ -29,7 +29,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2l_evm_defconfig +0 -1
index 5381e9f7cc..6eef497192 100644
@@ -36,7 +36,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2l_hs_evm_defconfig +0 -1
index 0381a7240c..565762e968 100644
@@ -28,7 +28,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/mcx_defconfig +0 -1
index e14780927c..6a0bf4ff5b 100644
@@ -34,7 +34,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),2
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/meesc_defconfig +0 -1
index a009b25789..7698b4c495 100644
@@ -25,7 +25,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/mt_ventoux_defconfig +0 -1
index 81ed01e61d..b9fa17be3f 100644
@@ -34,7 +34,6 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
configs/mx28evk_auart_console_defconfig +1 -2
index 69089a5d6c..bca9870c5e 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y

@@ -38,8 +39,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_MMC_MXS=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_CONS_INDEX=0
configs/mx28evk_defconfig +1 -2
index aa51974e7d..cbe639e718 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y

@@ -38,8 +39,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_MMC_MXS=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_CONS_INDEX=0
configs/mx28evk_nand_defconfig +1 -2
index e0e328589b..475d9f2a38 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y

@@ -37,8 +38,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_MXS=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_CONS_INDEX=0
configs/mx28evk_spi_defconfig +1 -2
index 0b6c27f4cd..1cd09fe297 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y

@@ -37,8 +38,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),5
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC_MXS=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_CONS_INDEX=0
configs/mx6sabreauto_defconfig +4 -2
index 66507f31ec..903e62d5a3 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PART=y
 CONFIG_CMD_SF=y

@@ -42,9 +43,10 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/mx6sxsabreauto_defconfig +4 -2
index be95cc0916..66295e2ed3 100644
@@ -12,6 +12,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y

@@ -28,13 +29,14 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/omap3_beagle_defconfig +0 -1
index a37a38f881..2f5a7f60e2 100644
@@ -52,7 +52,6 @@ CONFIG_LED_STATUS_GREEN_ENABLE=y
 CONFIG_LED_STATUS_GREEN=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/omap3_evm_defconfig +0 -1
index cd517b418d..3432378752 100644
@@ -39,7 +39,6 @@ CONFIG_SPL_DM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/omap3_ha_defconfig +0 -1
index e4b16c6872..8cbbef5fbb 100644
@@ -25,7 +25,6 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/omap3_logic_defconfig +0 -1
index cd8ffd5adf..0cf42cfffb 100644
@@ -37,7 +37,6 @@ CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP36XX_PINS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/omap3_overo_defconfig +0 -1
index 21aaa03b34..49b0f46834 100644
@@ -31,7 +31,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1792k(u-boot),256k(
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
configs/omap3_pandora_defconfig +0 -1
index a2cb46e6b8..5d5334feff 100644
@@ -25,7 +25,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1920k(uboot),128k(u
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
configs/omap3_zoom1_defconfig +0 -1
index 4ca55cb531..b9e6f34986 100644
@@ -22,7 +22,6 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
configs/omapl138_lcdk_defconfig +0 -1
index 4a97269dd4..9c30d41bea 100644
@@ -34,7 +34,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
-CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
configs/pcm052_defconfig +1 -2
index 0b3d93eee9..b6dc2d2847 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y

@@ -29,8 +30,6 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_VYBRID_GPIO=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND_VF610_NFC=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_DM_SERIAL=y
configs/pcm058_defconfig +4 -2
index 6318a6a83c..b129c0a07b 100644
@@ -29,6 +29,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_CACHE=y

@@ -39,10 +40,11 @@ CONFIG_CMD_UBI=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/pengwyn_defconfig +1 -2
index 76b5715a99..15f267a46e 100644
@@ -37,8 +37,8 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
-CONFIG_CMD_WOL=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_WOL=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"

@@ -47,7 +47,6 @@ CONFIG_CMD_DIAG=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/pfla02_defconfig +3 -2
index 0a03854e70..94dcb59068 100644
@@ -29,7 +29,6 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
-# CONFIG_CMD_NAND is not set
 CONFIG_CMD_SF=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y

@@ -38,10 +37,12 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:-(nand);spi2.0:1024k(bootloader),64k
 CONFIG_CMD_UBI=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DM=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/platinum_picon_defconfig +4 -2
index 3dc70ec550..b64cb947de 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set

@@ -42,9 +43,10 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),495M(ubi0),14M(res0),2M(res1),512k(res2),512k(res3),-(ubi1)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/platinum_titanium_defconfig +4 -2
index 63123c3081..6bf0d4d059 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set

@@ -42,9 +43,10 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(env2),-(ubi)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
configs/pm9261_defconfig +0 -1
index 1afa7807a1..6b1d81285a 100644
@@ -35,7 +35,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/pm9263_defconfig +0 -1
index 836563864a..f212c1e0fb 100644
@@ -35,7 +35,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/pm9g45_defconfig +0 -1
index 99acd20917..b8f55ab18b 100644
@@ -21,7 +21,6 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/pxm2_defconfig +0 -1
index 459f8fe48e..5229acc9b2 100644
@@ -60,7 +60,6 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/rastaban_defconfig +0 -1
index 7fdd6ddc56..ce7eb0947f 100644
@@ -58,7 +58,6 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/rut_defconfig +0 -1
index 07710d272d..53ab8dc690 100644
@@ -61,7 +61,6 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/sama5d2_ptc_ek_mmc_defconfig +0 -1
index 27606be8ba..c4a6fdfae7 100644
@@ -45,7 +45,6 @@ CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ATMEL=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/sama5d36ek_cmp_mmc_defconfig +0 -1
index 4ec6f4ee46..fdacfea04c 100644
@@ -40,7 +40,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d36ek_cmp_spiflash_defconfig +0 -1
index 157c3aefc9..c38f00cb9c 100644
@@ -40,7 +40,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d3_xplained_mmc_defconfig +0 -1
index 3e8cf67819..e5b32371d7 100644
@@ -57,7 +57,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/sama5d3xek_mmc_defconfig +0 -1
index dcc7ed868c..989a9bfc9d 100644
@@ -61,7 +61,6 @@ CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d3xek_spiflash_defconfig +0 -1
index be95e25edd..f714d0820e 100644
@@ -56,7 +56,6 @@ CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4_xplained_mmc_defconfig +0 -1
index 3b756b1e21..7830eedf0d 100644
@@ -55,7 +55,6 @@ CONFIG_SYS_I2C_AT91=y
 CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4_xplained_spiflash_defconfig +0 -1
index 18ed099f18..968b274030 100644
@@ -55,7 +55,6 @@ CONFIG_SYS_I2C_AT91=y
 CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4ek_mmc_defconfig +0 -1
index 86e5db6e6b..89d8dc8bd9 100644
@@ -55,7 +55,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4ek_spiflash_defconfig +0 -1
index 9dc639c38d..6c8d025cdc 100644
@@ -52,7 +52,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sheevaplug_defconfig +1 -1
index d77d198f18..d27698fcce 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_SYS_THUMB_BUILD=y
 CONFIG_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_SHEEVAPLUG=y

@@ -36,4 +37,3 @@ CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_LZMA=y
-CONFIG_SYS_THUMB_BUILD=y
configs/smartweb_defconfig +0 -1
index bb9feed094..991f324024 100644
@@ -43,7 +43,6 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
 CONFIG_USB=y
configs/snapper9260_defconfig +0 -1
index e707311069..74b0e46204 100644
@@ -27,7 +27,6 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_PCA953X=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/snapper9g20_defconfig +0 -1
index 073e855f71..1f6fc134c4 100644
@@ -26,7 +26,6 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_PCA953X=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/spear300_nand_defconfig +0 -1
index c28633a013..2d21069f6d 100644
@@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear300_usbtty_nand_defconfig +0 -1
index f1a1ec6978..7cbb7efe3c 100644
@@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear310_nand_defconfig +0 -1
index 4737bb5b25..717d011640 100644
@@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear310_usbtty_nand_defconfig +0 -1
index 071ac55e8d..39e16d878f 100644
@@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear320_nand_defconfig +0 -1
index 3667bf8498..d67d3c4b18 100644
@@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear320_usbtty_nand_defconfig +0 -1
index b39339aec9..426abd172a 100644
@@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear600_nand_defconfig +0 -1
index a279ec2af2..70815e86ba 100644
@@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear600_usbtty_nand_defconfig +0 -1
index fef9abe19f..3f44c91ee4 100644
@@ -20,7 +20,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/tao3530_defconfig +0 -1
index dc26f3667d..c6c84027aa 100644
@@ -25,7 +25,6 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/taurus_defconfig +0 -1
index 8680f85b98..f5f0cb84da 100644
@@ -47,7 +47,6 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/thuban_defconfig +0 -1
index 4eb58015b5..7548f4dfac 100644
@@ -58,7 +58,6 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/ti816x_evm_defconfig +0 -1
index 17d3308991..7468f40b5f 100644
@@ -41,7 +41,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_OMAP24XX=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
configs/titanium_defconfig +4 -2
index 0f658ff315..cf680e3e13 100644
@@ -13,6 +13,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set

@@ -30,9 +31,10 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1),512k(env2),-(ubi)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_APBH_DMA=y
+CONFIG_APBH_DMA_BURST=y
+CONFIG_APBH_DMA_BURST8=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
configs/tricorder_defconfig +0 -1
index f8a87a8242..1d2b602f45 100644
@@ -34,7 +34,6 @@ CONFIG_LED_STATUS_BIT2=4
 CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
configs/tricorder_flash_defconfig +0 -1
index 408814eac7..3f35b31a66 100644
@@ -33,7 +33,6 @@ CONFIG_LED_STATUS_BIT2=4
 CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
configs/twister_defconfig +0 -1
index dffd8254fb..64a73807e3 100644
@@ -33,7 +33,6 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_NETDEVICES=y
configs/usb_a9263_dataflash_defconfig +0 -1
index 31712c1984..9d977aec8e 100644
@@ -30,7 +30,6 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/vf610twr_defconfig +1 -2
index 833fcdfb80..c69de9c975 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y

@@ -30,8 +31,6 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_VYBRID_GPIO=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND_VF610_NFC=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/vf610twr_nand_defconfig +1 -2
index 7544624c9a..202c887beb 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y

@@ -30,8 +31,6 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_VYBRID_GPIO=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND_VF610_NFC=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/wb45n_defconfig +0 -1
index f52d46ebe9..c0ae60c150 100644
@@ -23,7 +23,6 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y
configs/wb50n_defconfig +0 -1
index ea27852df7..ecb42b30f2 100644
@@ -24,7 +24,6 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +1 -2
index b614acd79e..c1cb16b4a9 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_FPGA_LOADP=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_TFTPPUT=y

@@ -54,8 +55,6 @@ CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_DM_MMC=y
-CONFIG_NAND=y
-CONFIG_NAND_ARASAN=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SST=y
configs/zynq_zc770_xm011_defconfig +1 -2
index af79f6ead2..3f944a1b8d 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FPGA_LOADFS=y
 CONFIG_CMD_FPGA_LOADMK=y
 CONFIG_CMD_FPGA_LOADP=y
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set

@@ -36,8 +37,6 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
-CONFIG_NAND_ZYNQ=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ZYNQ_SERIAL=y
configs/zynq_zc770_xm011_x16_defconfig +1 -2
index ac7a079ca0..03ed214afa 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FPGA_LOADFS=y
 CONFIG_CMD_FPGA_LOADMK=y
 CONFIG_CMD_FPGA_LOADP=y
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set

@@ -36,8 +37,6 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
-CONFIG_NAND_ZYNQ=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ZYNQ_SERIAL=y
Signature · 1 line
2.17.1
#1 lore raw
Quoted 7 lines · Adam Ford

Many boards check for CMD_NAND and not NAND. This makes CMD_NAND imply NAND which will make some Kconfig migration of some NAND options easier later.

Rsync all defconfig files using moveconfig.py

Signed-off-by Adam Ford <[email protected]>

As-is, I get a Kconfig dependency loop. Please re-spin this and then I'll do a size-check on it, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180723/6c3f0d4d/attachment.sig>