Skip to contentSkip to conversation

MTD defconfigs/Kconfigs/Makefiles heavy cleanup

PATCH Superseded Miquel Raynal 8 participants 83 messages Dec 4, 2018 – Dec 9, 2018 Page 1 of 2

Subsystems (16)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Miquel Raynal

author maintainer
#0 lore raw

v3 cover MTD defconfigs/Kconfigs/Makefiles heavy cleanup

Hello,

During my last project about SPI-NAND support in U-Boot, I discovered when modifying Makefiles a confusing organization where:
* Sub-directories/files are compiled from the root Makefile
* Commands are at the root of everything

I sent a fist series a few weeks ago to move Makefile entries in their respective directories (which needed to be reworked). Since then, I have been working on clarifying all this for the MTD subsystem and here are the main points of such re-organization:
* Rename CONFIG_MTD into CONFIG_DM_MTD to reserve CONFIG_MTD to what is called today CONFIG_MTD_DEVICE.
* Fix build dependencies in defconfigs, like: "UBI and NAND depend on MTD".
* Fix the Kconfig files to reflect these dependencies (as defconfigs have been updated, nothing should break).
* Simplify the Makefiles: compiling the drivers/mtd/nand/raw/ sub-directory should just depend on MTD being compiled and the NAND core as well, there is absolutely no logic to make it depend on CMD_NAND.

New green Travis CI build for the third version of this series:
https://travis-ci.org/miquelraynal/u-boot/builds/463486099
There are three Sandbox tests that are failing, they have not been break by this series. The following Travis test has been done on the commit on which has been based the series and shows the same errors:
https://travis-ci.org/miquelraynal/u-boot/builds/463593006

Thanks,
Miquèl

Note: as the number of Cc:'ed people reached 184 with get_maintainers.pl I decided to trim the list to:
* People interested by the MTD subsystem.
* A few maintainers: I had to tweak some defconfigs after more digging than with other boards (k2g, bcm11130, M54418TWR). Maintainers of these platforms are Cc:'ed.

Changes since v2:
=================
* Cleanup also applied to the SPL in an additional patch.
* NOR dependency on MTD extracted from the patch adding MTD dependencies on commands only to do it in a separate change.
* Typo s/copile/compile/ in "rename CONFIG_MTD_DEVICE..." commit log.
* No more MTD depencency on SPI_FLASH, only kept on SPI_FLASH_MTD.
* Same applies to the sf command.
* Avoid compiling the NAND core while it is not needed (not speaking about the raw NAND core, really what is in drivers/mtd/nand:).
* Last patch dropping CONFIG_MTD_PARTITIONS forgotten. We need them in order to reduce the final binary size.
* Additional fixes in cmd/Kconfig.

Changes since v1:
=================
* Squashed both patches from the first series and included them in "mtd: simplify Makefiles".
* Added all other patches.
* Renamed CONFIG_NAND into CONFIG_MTD_RAW_NAND as suggested.

Miquel Raynal (28):
Makefile: move MTD-related lines in coherent Makefiles
mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND
mtd: rename CONFIG_MTD -> CONFIG_DM_MTD
mtd: rename CONFIG_MTD_DEVICE -> CONFIG_MTD
mtd: ensure MTD is compiled when there is a NOR flash
mtd: ensure MTD/the raw NAND core are compiled when there is a NAND
flash
mtd: ensure MTD is compiled when there is a SPI NOR flash using MTD
mtd: ensure UBI is compiled when using fastmap
mtd: ensure MTD is compiled when UBI is used
mtd: ensure UBI is compiled when CMD_UBI is selected
mtd: ensure UBI is compiled when ENV_IS_IN_UBI is selected
mtd: ensure MTD_RAW_NAND is compiled when ENV_IS_IN_NAND is selected
mtd: ensure MTD is compiled when ENV_IS_IN_FLASH is selected
mtd: ensure CMD_NAND is compiled when its options are selected
mtd: ensure MTD is compiled when CMD_MTDPARTS is selected
configs: move CONFIG_MTD in defconfigs when set in arch includes
configs: remove raw NAND core from k2g defconfigs
configs: remove MTD support from bcm11130 and M54418TWR defconfigs
mtd: nand: add includes in NAND core to avoid warnings
dfu: add dependency on the NAND core
mtd: nor: NOR flashes depend on MTD
mtd: nand: remove dependency on commands in Kconfig
mtd: ubi: remove dependency on command in Kconfig
cmd: mtdparts: show Kconfig options only if the command is selected
cmd: nand/sf: isolate legacy code
cmd: make MTD commands depend on MTD
mtd: simplify Makefile
mtd: properly handle SPL kbuild lines

 Makefile                                      |  5 -
 arch/arm/mach-omap2/mem-common.c              |  6 +-
 board/BuR/brppt1/board.c                      |  2 +-
 board/BuR/brppt1/mux.c                        |  6 +-
 board/birdland/bav335x/board.c                |  2 +-
 board/bosch/shc/board.c                       |  2 +-
 board/freescale/ls2080aqds/ls2080aqds.c       |  2 +-
 board/freescale/t102xrdb/t102xrdb.c           |  2 +-
 board/phytec/pcm051/mux.c                     |  4 +-
 board/siemens/pxm2/mux.c                      |  4 +-
 board/sunxi/README.nand                       |  2 +-
 board/ti/am335x/board.c                       |  2 +-
 board/ti/am335x/mux.c                         |  8 +-
 board/ti/am43xx/mux.c                         |  8 +-
 board/ti/ti816x/evm.c                         |  2 +-
 board/vscom/baltos/board.c                    |  2 +-
 board/vscom/baltos/mux.c                      |  2 +-
 cmd/Kconfig                                   | 31 +++---
 cmd/Makefile                                  |  4 +-
 cmd/legacy-mtd-utils.c                        | 99 +++++++++++++++++++
 cmd/legacy-mtd-utils.h                        | 14 +++
 cmd/nand.c                                    |  2 +
 cmd/sf.c                                      |  2 +
 configs/10m50_defconfig                       |  2 +-
 configs/3c120_defconfig                       |  1 +
 configs/B4420QDS_NAND_defconfig               |  3 +-
 configs/B4420QDS_SPIFLASH_defconfig           |  1 +
 configs/B4420QDS_defconfig                    |  1 +
 configs/B4860QDS_NAND_defconfig               |  3 +-
 configs/B4860QDS_SECURE_BOOT_defconfig        |  1 +
 configs/B4860QDS_SPIFLASH_defconfig           |  1 +
 configs/B4860QDS_defconfig                    |  1 +
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig   |  3 +-
 configs/BSC9131RDB_NAND_defconfig             |  3 +-
 .../BSC9131RDB_SPIFLASH_SYSCLK100_defconfig   |  1 +
 configs/BSC9131RDB_SPIFLASH_defconfig         |  1 +
 ...BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |  2 +
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig   |  3 +-
 ...BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |  2 +
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig   |  3 +-
 .../BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig    |  1 +
 .../BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig    |  1 +
 ...C9132QDS_SDCARD_DDRCLK100_SECURE_defconfig |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig |  1 +
 ...C9132QDS_SDCARD_DDRCLK133_SECURE_defconfig |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig |  1 +
 ...132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  1 +
 .../BSC9132QDS_SPIFLASH_DDRCLK100_defconfig   |  1 +
 ...132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  1 +
 .../BSC9132QDS_SPIFLASH_DDRCLK133_defconfig   |  1 +
 configs/C29XPCIE_NAND_defconfig               |  3 +-
 configs/C29XPCIE_NOR_SECBOOT_defconfig        |  1 +
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig   |  1 +
 configs/C29XPCIE_SPIFLASH_defconfig           |  1 +
 configs/C29XPCIE_defconfig                    |  1 +
 configs/CHIP_pro_defconfig                    |  5 +-
 configs/M5208EVBE_defconfig                   |  1 +
 configs/M52277EVB_defconfig                   |  1 +
 configs/M52277EVB_stmicro_defconfig           |  1 +
 configs/M5235EVB_Flash32_defconfig            |  1 +
 configs/M5235EVB_defconfig                    |  1 +
 configs/M5249EVB_defconfig                    |  1 +
 configs/M5253DEMO_defconfig                   |  1 +
 configs/M5272C3_defconfig                     |  1 +
 configs/M5275EVB_defconfig                    |  1 +
 configs/M5282EVB_defconfig                    |  1 +
 configs/M53017EVB_defconfig                   |  1 +
 configs/M5329AFEE_defconfig                   |  1 +
 configs/M5329BFEE_defconfig                   |  1 +
 configs/M5373EVB_defconfig                    |  1 +
 configs/M54418TWR_nand_mii_defconfig          |  1 +
 configs/M54418TWR_nand_rmii_defconfig         |  1 +
 configs/M54418TWR_nand_rmii_lowfreq_defconfig |  1 +
 configs/M54451EVB_defconfig                   |  1 +
 configs/M54451EVB_stmicro_defconfig           |  1 +
 configs/M54455EVB_a66_defconfig               |  1 +
 configs/M54455EVB_defconfig                   |  1 +
 configs/M54455EVB_i66_defconfig               |  1 +
 configs/M54455EVB_intel_defconfig             |  1 +
 configs/M54455EVB_stm33_defconfig             |  1 +
 configs/M5475AFE_defconfig                    |  1 +
 configs/M5475BFE_defconfig                    |  1 +
 configs/M5475CFE_defconfig                    |  1 +
 configs/M5475DFE_defconfig                    |  1 +
 configs/M5475EFE_defconfig                    |  1 +
 configs/M5475FFE_defconfig                    |  1 +
 configs/M5475GFE_defconfig                    |  1 +
 configs/M5485AFE_defconfig                    |  1 +
 configs/M5485BFE_defconfig                    |  1 +
 configs/M5485CFE_defconfig                    |  1 +
 configs/M5485DFE_defconfig                    |  1 +
 configs/M5485EFE_defconfig                    |  1 +
 configs/M5485FFE_defconfig                    |  1 +
 configs/M5485GFE_defconfig                    |  1 +
 configs/M5485HFE_defconfig                    |  1 +
 configs/MCR3000_defconfig                     |  1 +
 configs/MPC8308RDB_defconfig                  |  1 +
 configs/MPC8313ERDB_33_defconfig              |  1 +
 configs/MPC8313ERDB_66_defconfig              |  1 +
 configs/MPC8313ERDB_NAND_33_defconfig         |  3 +-
 configs/MPC8313ERDB_NAND_66_defconfig         |  3 +-
 configs/MPC8315ERDB_defconfig                 |  1 +
 configs/MPC8323ERDB_defconfig                 |  1 +
 configs/MPC832XEMDS_ATM_defconfig             |  1 +
 configs/MPC832XEMDS_HOST_33_defconfig         |  1 +
 configs/MPC832XEMDS_HOST_66_defconfig         |  1 +
 configs/MPC832XEMDS_SLAVE_defconfig           |  1 +
 configs/MPC832XEMDS_defconfig                 |  1 +
 configs/MPC8349EMDS_defconfig                 |  1 +
 configs/MPC8349ITXGP_defconfig                |  1 +
 configs/MPC8349ITX_LOWBOOT_defconfig          |  1 +
 configs/MPC8349ITX_defconfig                  |  1 +
 configs/MPC837XEMDS_HOST_defconfig            |  1 +
 configs/MPC837XEMDS_defconfig                 |  1 +
 configs/MPC837XERDB_defconfig                 |  1 +
 configs/MPC8536DS_36BIT_defconfig             |  1 +
 configs/MPC8536DS_SDCARD_defconfig            |  1 +
 configs/MPC8536DS_SPIFLASH_defconfig          |  1 +
 configs/MPC8536DS_defconfig                   |  1 +
 configs/MPC8541CDS_defconfig                  |  1 +
 configs/MPC8541CDS_legacy_defconfig           |  1 +
 configs/MPC8544DS_defconfig                   |  1 +
 configs/MPC8548CDS_36BIT_defconfig            |  1 +
 configs/MPC8548CDS_defconfig                  |  1 +
 configs/MPC8548CDS_legacy_defconfig           |  1 +
 configs/MPC8555CDS_defconfig                  |  1 +
 configs/MPC8555CDS_legacy_defconfig           |  1 +
 configs/MPC8568MDS_defconfig                  |  1 +
 configs/MPC8569MDS_ATM_defconfig              |  1 +
 configs/MPC8569MDS_defconfig                  |  1 +
 configs/MPC8572DS_36BIT_defconfig             |  1 +
 configs/MPC8572DS_defconfig                   |  1 +
 configs/MPC8610HPCD_defconfig                 |  1 +
 configs/MPC8641HPCN_36BIT_defconfig           |  1 +
 configs/MPC8641HPCN_defconfig                 |  1 +
 configs/MigoR_defconfig                       |  1 +
 .../Nintendo_NES_Classic_Edition_defconfig    |  3 +-
 .../P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig  |  2 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig      |  3 +-
 .../P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig   |  1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig       |  1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig    |  1 +
 ...010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig    |  2 +
 configs/P1010RDB-PA_NAND_defconfig            |  3 +-
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig     |  1 +
 configs/P1010RDB-PA_NOR_defconfig             |  1 +
 configs/P1010RDB-PA_SDCARD_defconfig          |  1 +
 .../P1010RDB-PA_SPIFLASH_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig        |  1 +
 .../P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig  |  2 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig      |  3 +-
 .../P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig   |  1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig       |  1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig    |  1 +
 ...010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig    |  2 +
 configs/P1010RDB-PB_NAND_defconfig            |  3 +-
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig     |  1 +
 configs/P1010RDB-PB_NOR_defconfig             |  1 +
 configs/P1010RDB-PB_SDCARD_defconfig          |  1 +
 .../P1010RDB-PB_SPIFLASH_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig        |  1 +
 configs/P1020MBG-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P1020MBG-PC_36BIT_defconfig           |  1 +
 configs/P1020MBG-PC_SDCARD_defconfig          |  1 +
 configs/P1020MBG-PC_defconfig                 |  1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig      |  3 +-
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1020RDB-PC_36BIT_defconfig           |  1 +
 configs/P1020RDB-PC_NAND_defconfig            |  3 +-
 configs/P1020RDB-PC_SDCARD_defconfig          |  1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PC_defconfig                 |  1 +
 configs/P1020RDB-PD_NAND_defconfig            |  3 +-
 configs/P1020RDB-PD_SDCARD_defconfig          |  1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PD_defconfig                 |  1 +
 configs/P1020UTM-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P1020UTM-PC_36BIT_defconfig           |  1 +
 configs/P1020UTM-PC_SDCARD_defconfig          |  1 +
 configs/P1020UTM-PC_defconfig                 |  1 +
 configs/P1021RDB-PC_36BIT_NAND_defconfig      |  3 +-
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1021RDB-PC_36BIT_defconfig           |  1 +
 configs/P1021RDB-PC_NAND_defconfig            |  3 +-
 configs/P1021RDB-PC_SDCARD_defconfig          |  1 +
 configs/P1021RDB-PC_SPIFLASH_defconfig        |  1 +
 configs/P1021RDB-PC_defconfig                 |  1 +
 configs/P1022DS_36BIT_NAND_defconfig          |  3 +-
 configs/P1022DS_36BIT_SDCARD_defconfig        |  1 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig      |  1 +
 configs/P1022DS_36BIT_defconfig               |  1 +
 configs/P1022DS_NAND_defconfig                |  3 +-
 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_NAND_defconfig               |  3 +-
 configs/P1024RDB_SDCARD_defconfig             |  1 +
 configs/P1024RDB_SPIFLASH_defconfig           |  1 +
 configs/P1024RDB_defconfig                    |  1 +
 configs/P1025RDB_36BIT_defconfig              |  1 +
 configs/P1025RDB_NAND_defconfig               |  3 +-
 configs/P1025RDB_SDCARD_defconfig             |  1 +
 configs/P1025RDB_SPIFLASH_defconfig           |  1 +
 configs/P1025RDB_defconfig                    |  1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig      |  3 +-
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P2020RDB-PC_36BIT_defconfig           |  1 +
 configs/P2020RDB-PC_NAND_defconfig            |  3 +-
 configs/P2020RDB-PC_SDCARD_defconfig          |  1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig        |  1 +
 configs/P2020RDB-PC_defconfig                 |  1 +
 configs/P2041RDB_NAND_defconfig               |  3 +-
 configs/P2041RDB_SDCARD_defconfig             |  1 +
 configs/P2041RDB_SECURE_BOOT_defconfig        |  1 +
 configs/P2041RDB_SPIFLASH_defconfig           |  1 +
 configs/P2041RDB_defconfig                    |  1 +
 configs/P3041DS_NAND_SECURE_BOOT_defconfig    |  3 +-
 configs/P3041DS_NAND_defconfig                |  3 +-
 configs/P3041DS_SDCARD_defconfig              |  1 +
 configs/P3041DS_SECURE_BOOT_defconfig         |  1 +
 configs/P3041DS_SPIFLASH_defconfig            |  1 +
 configs/P3041DS_defconfig                     |  1 +
 configs/P4080DS_SDCARD_defconfig              |  1 +
 configs/P4080DS_SECURE_BOOT_defconfig         |  1 +
 configs/P4080DS_SPIFLASH_defconfig            |  1 +
 configs/P4080DS_defconfig                     |  1 +
 configs/P5020DS_NAND_SECURE_BOOT_defconfig    |  3 +-
 configs/P5020DS_NAND_defconfig                |  3 +-
 configs/P5020DS_SDCARD_defconfig              |  1 +
 configs/P5020DS_SECURE_BOOT_defconfig         |  1 +
 configs/P5020DS_SPIFLASH_defconfig            |  1 +
 configs/P5020DS_defconfig                     |  1 +
 configs/P5040DS_NAND_SECURE_BOOT_defconfig    |  3 +-
 configs/P5040DS_NAND_defconfig                |  3 +-
 configs/P5040DS_SDCARD_defconfig              |  1 +
 configs/P5040DS_SECURE_BOOT_defconfig         |  1 +
 configs/P5040DS_SPIFLASH_defconfig            |  1 +
 configs/P5040DS_defconfig                     |  1 +
 configs/T1023RDB_NAND_defconfig               |  3 +-
 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_NAND_defconfig               |  3 +-
 configs/T1024QDS_SDCARD_defconfig             |  1 +
 configs/T1024QDS_SECURE_BOOT_defconfig        |  1 +
 configs/T1024QDS_SPIFLASH_defconfig           |  1 +
 configs/T1024QDS_defconfig                    |  1 +
 configs/T1024RDB_NAND_defconfig               |  3 +-
 configs/T1024RDB_SDCARD_defconfig             |  1 +
 configs/T1024RDB_SECURE_BOOT_defconfig        |  1 +
 configs/T1024RDB_SPIFLASH_defconfig           |  1 +
 configs/T1024RDB_defconfig                    |  1 +
 configs/T1040D4RDB_NAND_defconfig             |  3 +-
 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_NAND_defconfig               |  3 +-
 configs/T1040RDB_SDCARD_defconfig             |  1 +
 configs/T1040RDB_SECURE_BOOT_defconfig        |  1 +
 configs/T1040RDB_SPIFLASH_defconfig           |  1 +
 configs/T1040RDB_defconfig                    |  1 +
 configs/T1042D4RDB_NAND_defconfig             |  3 +-
 configs/T1042D4RDB_SDCARD_defconfig           |  1 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig      |  1 +
 configs/T1042D4RDB_SPIFLASH_defconfig         |  1 +
 configs/T1042D4RDB_defconfig                  |  1 +
 .../T1042RDB_PI_NAND_SECURE_BOOT_defconfig    |  3 +-
 configs/T1042RDB_PI_NAND_defconfig            |  3 +-
 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_NAND_defconfig               |  3 +-
 configs/T2080QDS_SDCARD_defconfig             |  1 +
 configs/T2080QDS_SECURE_BOOT_defconfig        |  1 +
 configs/T2080QDS_SPIFLASH_defconfig           |  1 +
 configs/T2080QDS_defconfig                    |  1 +
 configs/T2080RDB_NAND_defconfig               |  3 +-
 configs/T2080RDB_SDCARD_defconfig             |  1 +
 configs/T2080RDB_SECURE_BOOT_defconfig        |  1 +
 configs/T2080RDB_SPIFLASH_defconfig           |  1 +
 configs/T2080RDB_defconfig                    |  1 +
 configs/T2081QDS_NAND_defconfig               |  3 +-
 configs/T2081QDS_SDCARD_defconfig             |  1 +
 configs/T2081QDS_SPIFLASH_defconfig           |  1 +
 configs/T2081QDS_defconfig                    |  1 +
 configs/T4160QDS_NAND_defconfig               |  3 +-
 configs/T4160QDS_SDCARD_defconfig             |  1 +
 configs/T4160QDS_SECURE_BOOT_defconfig        |  1 +
 configs/T4160QDS_defconfig                    |  1 +
 configs/T4160RDB_defconfig                    |  1 +
 configs/T4240QDS_NAND_defconfig               |  3 +-
 configs/T4240QDS_SDCARD_defconfig             |  1 +
 configs/T4240QDS_SECURE_BOOT_defconfig        |  1 +
 configs/T4240QDS_defconfig                    |  1 +
 configs/T4240RDB_SDCARD_defconfig             |  1 +
 configs/T4240RDB_defconfig                    |  1 +
 configs/TQM834x_defconfig                     |  2 +-
 configs/TWR-P1025_defconfig                   |  2 +-
 configs/UCP1020_SPIFLASH_defconfig            |  1 +
 configs/UCP1020_defconfig                     |  1 +
 configs/adp-ae3xx_defconfig                   |  3 +-
 configs/adp-ag101p_defconfig                  |  1 +
 configs/alt_defconfig                         |  2 +-
 configs/am335x_baltos_defconfig               |  4 +-
 configs/am335x_evm_defconfig                  |  3 +-
 configs/am335x_evm_nor_defconfig              |  3 +-
 configs/am335x_evm_norboot_defconfig          |  2 +-
 configs/am335x_evm_spiboot_defconfig          |  2 +-
 configs/am335x_evm_usbspl_defconfig           |  3 +-
 configs/am335x_hs_evm_defconfig               |  3 +-
 configs/am335x_hs_evm_uart_defconfig          |  3 +-
 configs/am335x_igep003x_defconfig             |  4 +-
 configs/am3517_crane_defconfig                |  3 +-
 configs/am3517_evm_defconfig                  |  4 +-
 configs/am43xx_evm_defconfig                  |  3 +-
 configs/am43xx_evm_ethboot_defconfig          |  3 +-
 configs/am43xx_evm_rtconly_defconfig          |  3 +-
 configs/am43xx_evm_usbhost_boot_defconfig     |  3 +-
 configs/am43xx_hs_evm_defconfig               |  3 +-
 configs/amcore_defconfig                      |  1 +
 configs/ap121_defconfig                       |  1 +
 configs/ap143_defconfig                       |  1 +
 configs/ap325rxa_defconfig                    |  1 +
 configs/ap_sh4a_4a_defconfig                  |  1 +
 configs/apf27_defconfig                       |  5 +-
 configs/apx4devkit_defconfig                  |  4 +-
 configs/aristainetos2_defconfig               |  5 +-
 configs/aristainetos2b_defconfig              |  5 +-
 configs/aristainetos_defconfig                |  5 +-
 configs/armadillo-800eva_defconfig            |  1 +
 configs/astro_mcf5373l_defconfig              |  1 +
 configs/at91rm9200ek_defconfig                |  1 +
 configs/at91rm9200ek_ram_defconfig            |  1 +
 configs/at91sam9260ek_dataflash_cs0_defconfig |  3 +-
 configs/at91sam9260ek_dataflash_cs1_defconfig |  3 +-
 configs/at91sam9260ek_nandflash_defconfig     |  3 +-
 configs/at91sam9261ek_dataflash_cs0_defconfig |  3 +-
 configs/at91sam9261ek_dataflash_cs3_defconfig |  3 +-
 configs/at91sam9261ek_nandflash_defconfig     |  3 +-
 configs/at91sam9263ek_dataflash_cs0_defconfig |  3 +-
 configs/at91sam9263ek_dataflash_defconfig     |  3 +-
 configs/at91sam9263ek_nandflash_defconfig     |  3 +-
 configs/at91sam9263ek_norflash_boot_defconfig |  3 +-
 configs/at91sam9263ek_norflash_defconfig      |  3 +-
 configs/at91sam9g10ek_dataflash_cs0_defconfig |  3 +-
 configs/at91sam9g10ek_dataflash_cs3_defconfig |  3 +-
 configs/at91sam9g10ek_nandflash_defconfig     |  3 +-
 configs/at91sam9g20ek_2mmc_defconfig          |  3 +-
 .../at91sam9g20ek_2mmc_nandflash_defconfig    |  3 +-
 configs/at91sam9g20ek_dataflash_cs0_defconfig |  3 +-
 configs/at91sam9g20ek_dataflash_cs1_defconfig |  3 +-
 configs/at91sam9g20ek_nandflash_defconfig     |  3 +-
 configs/at91sam9m10g45ek_mmc_defconfig        |  3 +-
 configs/at91sam9m10g45ek_nandflash_defconfig  |  2 +
 configs/at91sam9n12ek_mmc_defconfig           |  3 +-
 configs/at91sam9n12ek_nandflash_defconfig     |  2 +
 configs/at91sam9n12ek_spiflash_defconfig      |  3 +-
 configs/at91sam9rlek_dataflash_defconfig      |  3 +-
 configs/at91sam9rlek_mmc_defconfig            |  3 +-
 configs/at91sam9rlek_nandflash_defconfig      |  3 +-
 configs/at91sam9x5ek_dataflash_defconfig      |  4 +-
 configs/at91sam9x5ek_mmc_defconfig            |  4 +-
 configs/at91sam9x5ek_nandflash_defconfig      |  3 +
 configs/at91sam9x5ek_spiflash_defconfig       |  4 +-
 configs/at91sam9xeek_dataflash_cs0_defconfig  |  3 +-
 configs/at91sam9xeek_dataflash_cs1_defconfig  |  3 +-
 configs/at91sam9xeek_nandflash_defconfig      |  3 +-
 configs/ax25-ae350_defconfig                  |  1 +
 configs/axm_defconfig                         |  3 +-
 configs/axs101_defconfig                      |  2 +
 configs/axs103_defconfig                      |  2 +
 configs/bcm11130_nand_defconfig               |  1 -
 configs/bg0900_defconfig                      |  4 +-
 configs/bitmain_antminer_s9_defconfig         |  7 +-
 configs/bk4r1_defconfig                       |  4 +
 configs/blanche_defconfig                     |  1 +
 configs/boston32r2_defconfig                  |  1 +
 configs/boston32r2el_defconfig                |  1 +
 configs/boston32r6_defconfig                  |  1 +
 configs/boston32r6el_defconfig                |  1 +
 configs/boston64r2_defconfig                  |  1 +
 configs/boston64r2el_defconfig                |  1 +
 configs/boston64r6_defconfig                  |  1 +
 configs/boston64r6el_defconfig                |  1 +
 configs/brppt1_nand_defconfig                 |  3 +-
 configs/brppt1_spi_defconfig                  |  2 +-
 configs/caddy2_defconfig                      |  1 +
 configs/cairo_defconfig                       |  3 +-
 configs/calimain_defconfig                    |  1 +
 configs/chiliboard_defconfig                  |  3 +-
 configs/clearfog_defconfig                    |  1 +
 configs/cm_fx6_defconfig                      |  3 +-
 configs/cm_t335_defconfig                     |  3 +-
 configs/cm_t3517_defconfig                    |  3 +-
 configs/cm_t35_defconfig                      |  3 +-
 configs/cm_t43_defconfig                      |  3 +-
 configs/cobra5272_defconfig                   |  1 +
 configs/colibri-imx6ull_defconfig             |  7 +-
 configs/colibri_imx7_defconfig                |  5 +-
 configs/colibri_pxa270_defconfig              |  1 +
 configs/colibri_t20_defconfig                 |  3 +
 configs/colibri_vf_defconfig                  |  3 +
 configs/comtrend_ar5315u_ram_defconfig        |  1 +
 configs/comtrend_ar5387un_ram_defconfig       |  1 +
 configs/comtrend_ct5361_ram_defconfig         |  1 +
 configs/comtrend_wap5813n_ram_defconfig       |  1 +
 configs/corvus_defconfig                      |  3 +-
 configs/da850_am18xxevm_defconfig             |  2 +-
 configs/da850evm_defconfig                    |  2 +-
 configs/da850evm_direct_nor_defconfig         |  1 +
 configs/da850evm_nand_defconfig               |  3 +-
 configs/db-88f6820-amc_defconfig              |  3 +-
 configs/db-mv784mp-gp_defconfig               |  3 +-
 configs/devkit3250_defconfig                  |  3 +-
 configs/devkit8000_defconfig                  |  3 +-
 configs/display5_defconfig                    |  2 +-
 configs/display5_factory_defconfig            |  2 +-
 configs/dns325_defconfig                      |  3 +
 configs/dockstar_defconfig                    |  3 +
 configs/draco_defconfig                       |  4 +-
 configs/ds414_defconfig                       |  3 +-
 configs/ea20_defconfig                        |  4 +-
 configs/eb_cpu5282_defconfig                  |  1 +
 configs/eb_cpu5282_internal_defconfig         |  1 +
 configs/eco5pk_defconfig                      |  4 +-
 configs/ecovec_defconfig                      |  1 +
 configs/edb9315a_defconfig                    |  1 +
 configs/edminiv2_defconfig                    |  1 +
 configs/espt_defconfig                        |  1 +
 configs/etamin_defconfig                      |  4 +-
 configs/ethernut5_defconfig                   |  4 +-
 configs/evb-rv1108_defconfig                  |  1 +
 configs/flea3_defconfig                       |  3 +-
 ...gardena-smart-gateway-mt7688-ram_defconfig |  2 +
 .../gardena-smart-gateway-mt7688_defconfig    |  2 +
 configs/goflexhome_defconfig                  |  3 +
 configs/gose_defconfig                        |  2 +-
 configs/gurnard_defconfig                     |  3 +-
 configs/guruplug_defconfig                    |  3 +
 configs/gwventana_emmc_defconfig              |  3 +-
 configs/gwventana_gw5904_defconfig            |  3 +-
 configs/gwventana_nand_defconfig              |  5 +-
 configs/harmony_defconfig                     |  3 +
 configs/helios4_defconfig                     |  1 +
 configs/hrcon_defconfig                       |  1 +
 configs/hrcon_dh_defconfig                    |  1 +
 configs/huawei_hg556a_ram_defconfig           |  1 +
 configs/ib62x0_defconfig                      |  3 +
 configs/iconnect_defconfig                    |  3 +
 configs/ids8313_defconfig                     |  3 +
 configs/igep0032_defconfig                    |  4 +-
 configs/igep00x0_defconfig                    |  4 +-
 configs/imx6dl_icore_nand_defconfig           |  4 +-
 configs/imx6q_icore_nand_defconfig            |  4 +-
 configs/imx6q_logic_defconfig                 |  5 +-
 configs/imx6qdl_icore_mmc_defconfig           |  4 +-
 configs/imx6qdl_icore_nand_defconfig          |  4 +-
 configs/imx6ul_geam_nand_defconfig            |  4 +-
 configs/imx6ul_isiot_nand_defconfig           |  4 +-
 configs/integratorap_cm720t_defconfig         |  1 +
 configs/integratorap_cm920t_defconfig         |  1 +
 configs/integratorap_cm926ejs_defconfig       |  1 +
 configs/integratorap_cm946es_defconfig        |  1 +
 configs/integratorcp_cm1136_defconfig         |  1 +
 configs/integratorcp_cm920t_defconfig         |  1 +
 configs/integratorcp_cm926ejs_defconfig       |  1 +
 configs/integratorcp_cm946es_defconfig        |  1 +
 configs/ipam390_defconfig                     |  4 +-
 configs/k2e_evm_defconfig                     |  4 +-
 configs/k2e_hs_evm_defconfig                  |  4 +-
 configs/k2g_evm_defconfig                     |  5 +-
 configs/k2g_hs_evm_defconfig                  |  5 +-
 configs/k2hk_evm_defconfig                    |  4 +-
 configs/k2hk_hs_evm_defconfig                 |  4 +-
 configs/k2l_evm_defconfig                     |  4 +-
 configs/k2l_hs_evm_defconfig                  |  4 +-
 configs/khadas-vim2_defconfig                 |  2 +-
 configs/km_kirkwood_128m16_defconfig          |  3 +
 configs/km_kirkwood_defconfig                 |  3 +
 configs/km_kirkwood_pci_defconfig             |  3 +
 configs/kmcoge4_defconfig                     |  2 +
 configs/kmcoge5ne_defconfig                   |  2 +
 configs/kmcoge5un_defconfig                   |  3 +
 configs/kmeter1_defconfig                     |  3 +-
 configs/kmlion1_defconfig                     |  2 +
 configs/kmnusa_defconfig                      |  3 +
 configs/kmopti2_defconfig                     |  3 +-
 configs/kmsugp1_defconfig                     |  3 +
 configs/kmsupx5_defconfig                     |  3 +-
 configs/kmsuv31_defconfig                     |  3 +
 configs/kmtegr1_defconfig                     |  2 +
 configs/kmtepr2_defconfig                     |  3 +-
 configs/kmvect1_defconfig                     |  3 +-
 configs/koelsch_defconfig                     |  2 +-
 configs/kzm9g_defconfig                       |  1 +
 configs/lager_defconfig                       |  2 +-
 configs/linkit-smart-7688-ram_defconfig       |  1 +
 configs/linkit-smart-7688_defconfig           |  1 +
 configs/lion-rk3368_defconfig                 |  1 +
 configs/ls1021aqds_ddr4_nor_defconfig         |  1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig  |  1 +
 configs/ls1021aqds_nand_defconfig             |  2 +
 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/ls1021atwr_nor_SECURE_BOOT_defconfig  |  1 +
 configs/ls1021atwr_nor_defconfig              |  1 +
 configs/ls1021atwr_nor_lpuart_defconfig       |  1 +
 ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig |  1 +
 configs/ls1021atwr_sdcard_ifc_defconfig       |  1 +
 configs/ls1043aqds_defconfig                  |  1 +
 configs/ls1043aqds_lpuart_defconfig           |  1 +
 configs/ls1043aqds_nand_defconfig             |  2 +
 configs/ls1043aqds_nor_ddr3_defconfig         |  1 +
 configs/ls1043aqds_sdcard_ifc_defconfig       |  1 +
 configs/ls1043ardb_SECURE_BOOT_defconfig      |  1 +
 configs/ls1043ardb_defconfig                  |  1 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig |  2 +
 configs/ls1043ardb_nand_defconfig             |  2 +
 .../ls1043ardb_sdcard_SECURE_BOOT_defconfig   |  1 +
 configs/ls1043ardb_sdcard_defconfig           |  1 +
 configs/ls1046aqds_SECURE_BOOT_defconfig      |  1 +
 configs/ls1046aqds_defconfig                  |  1 +
 configs/ls1046aqds_lpuart_defconfig           |  1 +
 configs/ls1046aqds_nand_defconfig             |  2 +
 configs/ls1046aqds_sdcard_ifc_defconfig       |  1 +
 configs/ls1046ardb_emmc_defconfig             |  2 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig |  2 +
 configs/ls1046ardb_qspi_defconfig             |  2 +
 configs/ls1046ardb_qspi_spl_defconfig         |  2 +
 .../ls1046ardb_sdcard_SECURE_BOOT_defconfig   |  2 +
 configs/ls1046ardb_sdcard_defconfig           |  2 +
 configs/ls1088aqds_defconfig                  |  2 +
 configs/ls1088aqds_qspi_SECURE_BOOT_defconfig |  2 +
 configs/ls1088aqds_qspi_defconfig             |  2 +
 configs/ls1088aqds_sdcard_ifc_defconfig       |  2 +
 configs/ls1088aqds_sdcard_qspi_defconfig      |  2 +
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig |  2 +
 configs/ls1088ardb_qspi_defconfig             |  2 +
 ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig |  2 +
 configs/ls1088ardb_sdcard_qspi_defconfig      |  2 +
 configs/ls2080a_simu_defconfig                |  1 +
 configs/ls2080aqds_SECURE_BOOT_defconfig      |  1 +
 configs/ls2080aqds_defconfig                  |  1 +
 configs/ls2080aqds_nand_defconfig             |  2 +
 configs/ls2080aqds_qspi_defconfig             |  2 +
 configs/ls2080aqds_sdcard_defconfig           |  2 +
 configs/ls2080ardb_SECURE_BOOT_defconfig      |  1 +
 configs/ls2080ardb_defconfig                  |  1 +
 configs/ls2080ardb_nand_defconfig             |  2 +
 configs/m53menlo_defconfig                    |  5 +-
 configs/malta64_defconfig                     |  1 +
 configs/malta64el_defconfig                   |  1 +
 configs/malta_defconfig                       |  1 +
 configs/maltael_defconfig                     |  1 +
 configs/mccmon6_nor_defconfig                 |  4 +-
 configs/mccmon6_sd_defconfig                  |  4 +-
 configs/mcx_defconfig                         |  4 +-
 configs/medcom-wide_defconfig                 |  2 +
 configs/meesc_defconfig                       |  3 +-
 configs/mgcoge3un_defconfig                   |  3 +
 configs/microblaze-generic_defconfig          |  2 +-
 configs/mpc8308_p1m_defconfig                 |  1 +
 configs/mpr2_defconfig                        |  1 +
 configs/ms7720se_defconfig                    |  1 +
 configs/ms7722se_defconfig                    |  1 +
 configs/ms7750se_defconfig                    |  1 +
 configs/mt_ventoux_defconfig                  |  4 +-
 configs/mx28evk_auart_console_defconfig       |  5 +-
 configs/mx28evk_defconfig                     |  5 +-
 configs/mx28evk_nand_defconfig                |  5 +-
 configs/mx28evk_spi_defconfig                 |  5 +-
 configs/mx31pdk_defconfig                     |  3 +-
 configs/mx35pdk_defconfig                     |  3 +-
 configs/mx53ard_defconfig                     |  3 +-
 configs/mx6sabreauto_defconfig                |  4 +-
 configs/mx6sxsabreauto_defconfig              |  4 +-
 configs/nas220_defconfig                      |  3 +
 configs/netgear_cg3100d_ram_defconfig         |  1 +
 configs/nsa310s_defconfig                     |  3 +
 configs/omap35_logic_defconfig                |  4 +-
 configs/omap35_logic_somlv_defconfig          |  4 +-
 configs/omap3_beagle_defconfig                |  4 +-
 configs/omap3_evm_defconfig                   |  4 +-
 configs/omap3_ha_defconfig                    |  3 +-
 configs/omap3_logic_defconfig                 |  4 +-
 configs/omap3_logic_somlv_defconfig           |  4 +-
 configs/omap3_overo_defconfig                 |  4 +-
 configs/omap3_pandora_defconfig               |  4 +-
 configs/omap3_zoom1_defconfig                 |  3 +-
 configs/omapl138_lcdk_defconfig               |  4 +-
 configs/openrd_base_defconfig                 |  3 +
 configs/openrd_client_defconfig               |  3 +
 configs/openrd_ultimate_defconfig             |  3 +
 configs/pcm052_defconfig                      |  4 +
 configs/pcm058_defconfig                      |  5 +-
 configs/pengwyn_defconfig                     |  3 +-
 configs/pfla02_defconfig                      |  4 +-
 configs/platinum_picon_defconfig              |  5 +-
 configs/platinum_titanium_defconfig           |  5 +-
 configs/plutux_defconfig                      |  2 +
 configs/pm9261_defconfig                      |  3 +-
 configs/pm9263_defconfig                      |  3 +-
 configs/pm9g45_defconfig                      |  3 +-
 configs/pogo_e02_defconfig                    |  3 +
 configs/porter_defconfig                      |  2 +-
 configs/portl2_defconfig                      |  3 +
 configs/pxm2_defconfig                        |  4 +-
 configs/qemu_mips64_defconfig                 |  1 +
 configs/qemu_mips64el_defconfig               |  1 +
 configs/qemu_mips_defconfig                   |  1 +
 configs/qemu_mipsel_defconfig                 |  1 +
 configs/r0p7734_defconfig                     |  1 +
 configs/r2dplus_defconfig                     |  1 +
 configs/r7780mp_defconfig                     |  1 +
 configs/r8a77995_draak_defconfig              |  2 +-
 configs/rastaban_defconfig                    |  4 +-
 configs/rsk7203_defconfig                     |  1 +
 configs/rsk7264_defconfig                     |  1 +
 configs/rsk7269_defconfig                     |  1 +
 configs/rut_defconfig                         |  4 +-
 configs/s5pc210_universal_defconfig           |  2 +-
 configs/sagem_f at st1704_ram_defconfig          |  1 +
 configs/sama5d2_ptc_ek_mmc_defconfig          |  3 +-
 configs/sama5d2_ptc_ek_nandflash_defconfig    |  2 +
 configs/sama5d36ek_cmp_mmc_defconfig          |  3 +-
 configs/sama5d36ek_cmp_nandflash_defconfig    |  2 +
 configs/sama5d36ek_cmp_spiflash_defconfig     |  3 +-
 configs/sama5d3_xplained_mmc_defconfig        |  4 +-
 configs/sama5d3_xplained_nandflash_defconfig  |  3 +
 configs/sama5d3xek_mmc_defconfig              |  3 +-
 configs/sama5d3xek_nandflash_defconfig        |  2 +
 configs/sama5d3xek_spiflash_defconfig         |  3 +-
 configs/sama5d4_xplained_mmc_defconfig        |  3 +-
 configs/sama5d4_xplained_nandflash_defconfig  |  2 +
 configs/sama5d4_xplained_spiflash_defconfig   |  3 +-
 configs/sama5d4ek_mmc_defconfig               |  3 +-
 configs/sama5d4ek_nandflash_defconfig         |  2 +
 configs/sama5d4ek_spiflash_defconfig          |  3 +-
 configs/sandbox64_defconfig                   |  1 +
 configs/sandbox_defconfig                     |  1 +
 configs/sbc8349_PCI_33_defconfig              |  1 +
 configs/sbc8349_PCI_66_defconfig              |  1 +
 configs/sbc8349_defconfig                     |  1 +
 configs/sbc8548_PCI_33_PCIE_defconfig         |  1 +
 configs/sbc8548_PCI_33_defconfig              |  1 +
 configs/sbc8548_PCI_66_PCIE_defconfig         |  1 +
 configs/sbc8548_PCI_66_defconfig              |  1 +
 configs/sbc8548_defconfig                     |  1 +
 configs/sbc8641d_defconfig                    |  1 +
 configs/seaboard_defconfig                    |  2 +
 configs/sfr_nb4-ser_ram_defconfig             |  1 +
 configs/sh7763rdp_defconfig                   |  1 +
 configs/sh7785lcr_32bit_defconfig             |  1 +
 configs/sh7785lcr_defconfig                   |  1 +
 configs/sheevaplug_defconfig                  |  3 +
 configs/shmin_defconfig                       |  1 +
 configs/silk_defconfig                        |  2 +-
 configs/smartweb_defconfig                    |  3 +-
 configs/smdkc100_defconfig                    |  2 +-
 configs/snapper9260_defconfig                 |  3 +-
 configs/snapper9g20_defconfig                 |  3 +-
 configs/socfpga_arria10_defconfig             |  2 +-
 configs/socfpga_arria5_defconfig              |  3 +-
 configs/socfpga_cyclone5_defconfig            |  3 +-
 configs/socfpga_dbm_soc1_defconfig            |  2 +-
 configs/socfpga_de0_nano_soc_defconfig        |  3 +-
 configs/socfpga_de10_nano_defconfig           |  2 +-
 configs/socfpga_de1_soc_defconfig             |  2 +-
 configs/socfpga_is1_defconfig                 |  3 +-
 configs/socfpga_sockit_defconfig              |  3 +-
 configs/socfpga_socrates_defconfig            |  3 +-
 configs/socfpga_sr1500_defconfig              |  3 +-
 configs/socfpga_stratix10_defconfig           |  1 +
 configs/socfpga_vining_fpga_defconfig         |  3 +-
 configs/socrates_defconfig                    |  1 +
 configs/spear300_defconfig                    |  2 +-
 configs/spear300_nand_defconfig               |  4 +-
 configs/spear300_usbtty_defconfig             |  2 +-
 configs/spear300_usbtty_nand_defconfig        |  4 +-
 configs/spear310_defconfig                    |  2 +-
 configs/spear310_nand_defconfig               |  4 +-
 configs/spear310_pnor_defconfig               |  2 +-
 configs/spear310_usbtty_defconfig             |  2 +-
 configs/spear310_usbtty_nand_defconfig        |  4 +-
 configs/spear310_usbtty_pnor_defconfig        |  2 +-
 configs/spear320_defconfig                    |  2 +-
 configs/spear320_nand_defconfig               |  4 +-
 configs/spear320_pnor_defconfig               |  2 +-
 configs/spear320_usbtty_defconfig             |  2 +-
 configs/spear320_usbtty_nand_defconfig        |  4 +-
 configs/spear320_usbtty_pnor_defconfig        |  2 +-
 configs/spear600_defconfig                    |  2 +-
 configs/spear600_nand_defconfig               |  4 +-
 configs/spear600_usbtty_defconfig             |  2 +-
 configs/spear600_usbtty_nand_defconfig        |  4 +-
 configs/stm32f429-discovery_defconfig         |  1 +
 configs/stm32f429-evaluation_defconfig        |  1 +
 configs/stm32f469-discovery_defconfig         |  1 +
 configs/stm32f746-disco_defconfig             |  3 +-
 configs/stmark2_defconfig                     |  2 +-
 configs/stout_defconfig                       |  2 +-
 configs/strider_con_defconfig                 |  1 +
 configs/strider_con_dp_defconfig              |  1 +
 configs/strider_cpu_defconfig                 |  1 +
 configs/strider_cpu_dp_defconfig              |  1 +
 configs/suvd3_defconfig                       |  3 +-
 configs/tao3530_defconfig                     |  3 +-
 configs/taurus_defconfig                      |  3 +-
 configs/tec_defconfig                         |  2 +
 configs/thuban_defconfig                      |  4 +-
 configs/ti816x_evm_defconfig                  |  3 +-
 configs/titanium_defconfig                    |  5 +-
 configs/tplink_wdr4300_defconfig              |  1 +
 configs/tricorder_defconfig                   |  4 +-
 configs/tricorder_flash_defconfig             |  4 +-
 configs/tuge1_defconfig                       |  3 +-
 configs/turris_mox_defconfig                  |  1 +
 configs/tuxx1_defconfig                       |  3 +-
 configs/twister_defconfig                     |  4 +-
 configs/uniphier_ld4_sld8_defconfig           |  4 +-
 configs/uniphier_v7_defconfig                 |  4 +-
 configs/uniphier_v8_defconfig                 |  4 +-
 configs/usb_a9263_dataflash_defconfig         |  3 +-
 configs/vct_platinum_defconfig                |  1 +
 configs/vct_platinum_onenand_defconfig        |  3 +-
 configs/vct_platinum_onenand_small_defconfig  |  3 +-
 configs/vct_platinum_small_defconfig          |  1 +
 configs/vct_platinumavc_defconfig             |  1 +
 configs/vct_platinumavc_onenand_defconfig     |  3 +-
 .../vct_platinumavc_onenand_small_defconfig   |  3 +-
 configs/vct_platinumavc_small_defconfig       |  1 +
 configs/vct_premium_defconfig                 |  1 +
 configs/vct_premium_onenand_defconfig         |  3 +-
 configs/vct_premium_onenand_small_defconfig   |  3 +-
 configs/vct_premium_small_defconfig           |  1 +
 configs/ve8313_defconfig                      |  1 +
 configs/vexpress_aemv8a_dram_defconfig        |  1 +
 configs/vexpress_aemv8a_juno_defconfig        |  1 +
 configs/vexpress_aemv8a_semi_defconfig        |  1 +
 configs/vexpress_ca15_tc2_defconfig           |  1 +
 configs/vexpress_ca5x2_defconfig              |  1 +
 configs/vexpress_ca9x4_defconfig              |  1 +
 configs/vf610twr_defconfig                    |  4 +
 configs/vf610twr_nand_defconfig               |  4 +
 configs/vme8349_defconfig                     |  1 +
 configs/wb45n_defconfig                       |  3 +-
 configs/wb50n_defconfig                       |  3 +-
 configs/woodburn_defconfig                    |  3 +-
 configs/woodburn_sd_defconfig                 |  3 +-
 configs/work_92105_defconfig                  |  2 +
 configs/x600_defconfig                        |  3 +
 configs/xilinx_zynqmp_mini_nand_defconfig     |  3 +-
 .../xilinx_zynqmp_zc1751_xm016_dc2_defconfig  |  5 +-
 .../xilinx_zynqmp_zc1751_xm017_dc3_defconfig  |  4 +-
 configs/xpedite517x_defconfig                 |  1 +
 configs/xpedite520x_defconfig                 |  1 +
 configs/xpedite537x_defconfig                 |  1 +
 configs/xpedite550x_defconfig                 |  1 +
 configs/xtfpga_defconfig                      |  1 +
 configs/zipitz2_defconfig                     |  1 +
 configs/zmx25_defconfig                       |  1 +
 configs/zynq_cse_nand_defconfig               |  4 +-
 configs/zynq_cse_nor_defconfig                |  1 +
 configs/zynq_zc770_xm011_defconfig            |  5 +-
 configs/zynq_zc770_xm011_x16_defconfig        |  5 +-
 configs/zynq_zc770_xm012_defconfig            |  1 +
 drivers/Makefile                              |  7 +-
 drivers/dfu/Kconfig                           |  1 +
 drivers/mtd/Kconfig                           | 13 +--
 drivers/mtd/Makefile                          | 50 +++++++---
 drivers/mtd/mtd_uboot.c                       | 96 +-----------------
 drivers/mtd/nand/Makefile                     |  5 +
 drivers/mtd/nand/bbt.c                        |  1 +
 drivers/mtd/nand/core.c                       |  1 +
 drivers/mtd/nand/raw/Kconfig                  |  4 +-
 drivers/mtd/nand/raw/nand.c                   |  2 +-
 drivers/mtd/onenand/onenand_uboot.c           |  2 +-
 env/Kconfig                                   |  2 +
 include/configs/B4860QDS.h                    | 10 +-
 include/configs/BSC9131RDB.h                  |  4 +-
 include/configs/BSC9132QDS.h                  |  8 +-
 include/configs/C29XPCIE.h                    |  8 +-
 include/configs/MPC8313ERDB.h                 | 14 +--
 include/configs/P1010RDB.h                    | 12 +--
 include/configs/P1022DS.h                     | 10 +-
 include/configs/P2041RDB.h                    |  6 +-
 include/configs/T102xQDS.h                    |  8 +-
 include/configs/T102xRDB.h                    |  8 +-
 include/configs/T1040QDS.h                    |  6 +-
 include/configs/T104xRDB.h                    | 12 +--
 include/configs/T208xQDS.h                    |  8 +-
 include/configs/T208xRDB.h                    |  8 +-
 include/configs/T4240QDS.h                    | 10 +-
 include/configs/T4240RDB.h                    |  6 +-
 include/configs/am335x_evm.h                  |  6 +-
 include/configs/am3517_evm.h                  |  6 +-
 include/configs/am43xx_evm.h                  |  6 +-
 include/configs/baltos.h                      |  6 +-
 include/configs/bav335x.h                     |  8 +-
 include/configs/brppt1.h                      | 16 +--
 include/configs/corenet_ds.h                  |  8 +-
 include/configs/da850evm.h                    |  4 +-
 include/configs/dra7xx_evm.h                  |  4 +-
 include/configs/ls2080ardb.h                  |  2 +-
 include/configs/mvebu_armada-37xx.h           |  1 -
 include/configs/omap3_beagle.h                | 10 +-
 include/configs/omap3_evm.h                   | 10 +-
 include/configs/omap3_logic.h                 |  2 +-
 include/configs/omap3_overo.h                 |  6 +-
 include/configs/omap3_pandora.h               |  2 +-
 include/configs/omapl138_lcdk.h               |  4 +-
 include/configs/p1_p2_rdb_pc.h                |  8 +-
 include/configs/siemens-am33x-common.h        |  2 +-
 include/configs/socfpga_stratix10_socdk.h     |  1 -
 include/configs/ti_armv7_common.h             |  2 +-
 include/configs/ti_armv7_omap.h               |  2 +-
 include/configs/ti_omap3_common.h             |  2 +-
 include/environment.h                         |  4 +-
 include/environment/ti/dfu.h                  |  2 +-
 include/flash.h                               |  2 +-
 include/linux/mtd/mtd.h                       |  6 --
 843 files changed, 1584 insertions(+), 620 deletions(-)
 create mode 100644 cmd/legacy-mtd-utils.c
 create mode 100644 cmd/legacy-mtd-utils.h
Signature · 1 line
2.19.1
author maintainer
#1 lore raw

PATCH v3 1/28 Makefile: move MTD-related lines in coherent Makefiles

Move MTD-related lines out of the root Makefile. Put them in their respective directories.

Enclose some of these new lines to skip them when building the SPL (the SPL directly points to what is needed).

CONFIG_CMD_NAND is the symbol indicating support for raw NAND devices. This logic is broken and will be fixed afterwards. To let the 'mtd' command also use the raw NAND core, we add it in the condition. This will be cleaned later.

---
 Makefile                  | 5 -----
 drivers/Makefile          | 3 ++-
 drivers/mtd/Makefile      | 6 ++++++
 drivers/mtd/nand/Makefile | 3 +++
 4 files changed, 11 insertions(+), 6 deletions(-)
Makefile +0 -5
index 552687db53..435d0257dd 100644
@@ -688,11 +688,6 @@ libs-y += drivers/
 libs-y += drivers/dma/
 libs-y += drivers/gpio/
 libs-y += drivers/i2c/
-libs-y += drivers/mtd/
-libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/raw/
-libs-y += drivers/mtd/onenand/
-libs-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/
-libs-y += drivers/mtd/spi/
 libs-y += drivers/net/
 libs-y += drivers/net/phy/
 libs-y += drivers/pci/
drivers/Makefile +2 -1
index 4453c62ad3..e7c93875bb 100644
@@ -6,7 +6,7 @@ obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC_SUPPORT) += misc/ sysreset/ firmware/
 obj-$(CONFIG_$(SPL_TPL_)I2C_SUPPORT) += i2c/
 obj-$(CONFIG_$(SPL_TPL_)LED) += led/
 obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += mmc/
-obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += mtd/nand/raw/
+obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += mtd/nand/
 obj-$(CONFIG_$(SPL_TPL_)PHY) += phy/
 obj-$(CONFIG_$(SPL_TPL_)PINCTRL) += pinctrl/
 obj-$(CONFIG_$(SPL_TPL_)RAM) += ram/
@@ -99,6 +99,7 @@ obj-$(CONFIG_QE) += qe/
 obj-$(CONFIG_U_QE) += qe/
 obj-y += mailbox/
 obj-y += memory/
+obj-y += mtd/
 obj-y += pwm/
 obj-y += reset/
 obj-y += input/
drivers/mtd/Makefile +6 -0
index 22ceda93c0..aca3a0b811 100644
@@ -19,4 +19,10 @@ obj-$(CONFIG_ST_SMI) += st_smi.o
 obj-$(CONFIG_STM32_FLASH) += stm32_flash.o
 obj-$(CONFIG_RENESAS_RPC_HF) += renesas_rpc_hf.o
 
+# SPL will manually build the files it needs
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
 obj-y += nand/
+obj-y += onenand/
+obj-y += spi/
+obj-$(CONFIG_CMD_UBI) += ubi/
+endif
drivers/mtd/nand/Makefile +3 -0
index a358bc680e..99ca69ef95 100644
@@ -2,4 +2,7 @@
 
 nandcore-objs := core.o bbt.o
 obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o
+ifneq (,$(findstring y,$(CONFIG_CMD_NAND)$(CONFIG_CMD_MTD)))
+obj-y += raw/
+endif
 obj-$(CONFIG_MTD_SPI_NAND) += spi/
Signature · 1 line
2.19.1
#2 lore raw

PATCH v3 1/28 Makefile: move MTD-related lines in coherent Makefiles

Quoted 40 lines · On Wed, 5 Dec 2018 00:56:47 +0100 Miquel Raynal <[email protected]>…

Move MTD-related lines out of the root Makefile. Put them in their respective directories.

Enclose some of these new lines to skip them when building the SPL (the SPL directly points to what is needed).

CONFIG_CMD_NAND is the symbol indicating support for raw NAND devices. This logic is broken and will be fixed afterwards. To let the 'mtd' command also use the raw NAND core, we add it in the condition. This will be cleaned later.

---
 Makefile                  | 5 -----
 drivers/Makefile          | 3 ++-
 drivers/mtd/Makefile      | 6 ++++++
 drivers/mtd/nand/Makefile | 3 +++
 4 files changed, 11 insertions(+), 6 deletions(-)
Makefile +0 -5
index 552687db53..435d0257dd 100644
@@ -688,11 +688,6 @@ libs-y += drivers/
 libs-y += drivers/dma/
 libs-y += drivers/gpio/
 libs-y += drivers/i2c/
-libs-y += drivers/mtd/
-libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/raw/
-libs-y += drivers/mtd/onenand/
-libs-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/
-libs-y += drivers/mtd/spi/
 libs-y += drivers/net/
 libs-y += drivers/net/phy/
 libs-y += drivers/pci/
drivers/Makefile +0 -0
index 4453c62ad3..e7c93875bb 100644

drivers/Makefile obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC_SUPPORT) += misc/ sysreset/ firmware/ · line 9

Quoted 5 lines
drivers/Makefile +1 -1
@@ -6,7 +6,7 @@ obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC_SUPPORT) += misc/ sysreset/ firmware/
 obj-$(CONFIG_$(SPL_TPL_)I2C_SUPPORT) += i2c/
 obj-$(CONFIG_$(SPL_TPL_)LED) += led/
 obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += mmc/
-obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += mtd/nand/raw/
+obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += mtd/nand/

I know re-ordering those patches is painful, but I'd prefer to have this patch moved at the end so that you directly include mtd instead of having the Makefile layering partially fixed (fixed for the non-SPL case, but not for the SPL/TPL case).

Quoted 38 lines
drivers/Makefile +1 -0
 obj-$(CONFIG_$(SPL_TPL_)PHY) += phy/
 obj-$(CONFIG_$(SPL_TPL_)PINCTRL) += pinctrl/
 obj-$(CONFIG_$(SPL_TPL_)RAM) += ram/
@@ -99,6 +99,7 @@ obj-$(CONFIG_QE) += qe/
 obj-$(CONFIG_U_QE) += qe/
 obj-y += mailbox/
 obj-y += memory/
+obj-y += mtd/
 obj-y += pwm/
 obj-y += reset/
 obj-y += input/
drivers/mtd/Makefile +6 -0
index 22ceda93c0..aca3a0b811 100644
@@ -19,4 +19,10 @@ obj-$(CONFIG_ST_SMI) += st_smi.o
 obj-$(CONFIG_STM32_FLASH) += stm32_flash.o
 obj-$(CONFIG_RENESAS_RPC_HF) += renesas_rpc_hf.o
 
+# SPL will manually build the files it needs
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
 obj-y += nand/
+obj-y += onenand/
+obj-y += spi/
+obj-$(CONFIG_CMD_UBI) += ubi/
+endif
drivers/mtd/nand/Makefile +3 -0
index a358bc680e..99ca69ef95 100644
@@ -2,4 +2,7 @@
 
 nandcore-objs := core.o bbt.o
 obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o
+ifneq (,$(findstring y,$(CONFIG_CMD_NAND)$(CONFIG_CMD_MTD)))
+obj-y += raw/
+endif
 obj-$(CONFIG_MTD_SPI_NAND) += spi/
author maintainer
#3 lore raw

PATCH v3 2/28 mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND

In reply to Miquel Raynal

Add more clarity by changing the Kconfig entry name.

---
 arch/arm/mach-omap2/mem-common.c                 |  6 +++---
 board/BuR/brppt1/board.c                         |  2 +-
 board/BuR/brppt1/mux.c                           |  6 +++---
 board/birdland/bav335x/board.c                   |  2 +-
 board/bosch/shc/board.c                          |  2 +-
 board/freescale/ls2080aqds/ls2080aqds.c          |  2 +-
 board/freescale/t102xrdb/t102xrdb.c              |  2 +-
 board/phytec/pcm051/mux.c                        |  4 ++--
 board/siemens/pxm2/mux.c                         |  4 ++--
 board/sunxi/README.nand                          |  2 +-
 board/ti/am335x/board.c                          |  2 +-
 board/ti/am335x/mux.c                            |  8 ++++----
 board/ti/am43xx/mux.c                            |  8 ++++----
 board/ti/ti816x/evm.c                            |  2 +-
 board/vscom/baltos/board.c                       |  2 +-
 board/vscom/baltos/mux.c                         |  2 +-
 configs/B4420QDS_NAND_defconfig                  |  2 +-
 configs/B4860QDS_NAND_defconfig                  |  2 +-
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig      |  2 +-
 configs/BSC9131RDB_NAND_defconfig                |  2 +-
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig      |  2 +-
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig      |  2 +-
 configs/C29XPCIE_NAND_defconfig                  |  2 +-
 configs/CHIP_pro_defconfig                       |  2 +-
 configs/MPC8313ERDB_NAND_33_defconfig            |  2 +-
 configs/MPC8313ERDB_NAND_66_defconfig            |  2 +-
 configs/Nintendo_NES_Classic_Edition_defconfig   |  2 +-
 configs/P1010RDB-PA_36BIT_NAND_defconfig         |  2 +-
 configs/P1010RDB-PA_NAND_defconfig               |  2 +-
 configs/P1010RDB-PB_36BIT_NAND_defconfig         |  2 +-
 configs/P1010RDB-PB_NAND_defconfig               |  2 +-
 configs/P1020RDB-PC_36BIT_NAND_defconfig         |  2 +-
 configs/P1020RDB-PC_NAND_defconfig               |  2 +-
 configs/P1020RDB-PD_NAND_defconfig               |  2 +-
 configs/P1021RDB-PC_36BIT_NAND_defconfig         |  2 +-
 configs/P1021RDB-PC_NAND_defconfig               |  2 +-
 configs/P1022DS_36BIT_NAND_defconfig             |  2 +-
 configs/P1022DS_NAND_defconfig                   |  2 +-
 configs/P1024RDB_NAND_defconfig                  |  2 +-
 configs/P1025RDB_NAND_defconfig                  |  2 +-
 configs/P2020RDB-PC_36BIT_NAND_defconfig         |  2 +-
 configs/P2020RDB-PC_NAND_defconfig               |  2 +-
 configs/P2041RDB_NAND_defconfig                  |  2 +-
 configs/P3041DS_NAND_SECURE_BOOT_defconfig       |  2 +-
 configs/P3041DS_NAND_defconfig                   |  2 +-
 configs/P5020DS_NAND_SECURE_BOOT_defconfig       |  2 +-
 configs/P5020DS_NAND_defconfig                   |  2 +-
 configs/P5040DS_NAND_SECURE_BOOT_defconfig       |  2 +-
 configs/P5040DS_NAND_defconfig                   |  2 +-
 configs/T1023RDB_NAND_defconfig                  |  2 +-
 configs/T1024QDS_NAND_defconfig                  |  2 +-
 configs/T1024RDB_NAND_defconfig                  |  2 +-
 configs/T1040D4RDB_NAND_defconfig                |  2 +-
 configs/T1040RDB_NAND_defconfig                  |  2 +-
 configs/T1042D4RDB_NAND_defconfig                |  2 +-
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig   |  2 +-
 configs/T1042RDB_PI_NAND_defconfig               |  2 +-
 configs/T2080QDS_NAND_defconfig                  |  2 +-
 configs/T2080RDB_NAND_defconfig                  |  2 +-
 configs/T2081QDS_NAND_defconfig                  |  2 +-
 configs/T4160QDS_NAND_defconfig                  |  2 +-
 configs/T4240QDS_NAND_defconfig                  |  2 +-
 configs/am335x_baltos_defconfig                  |  2 +-
 configs/am335x_evm_defconfig                     |  2 +-
 configs/am335x_evm_nor_defconfig                 |  2 +-
 configs/am335x_evm_usbspl_defconfig              |  2 +-
 configs/am335x_hs_evm_defconfig                  |  2 +-
 configs/am335x_hs_evm_uart_defconfig             |  2 +-
 configs/am335x_igep003x_defconfig                |  2 +-
 configs/am3517_crane_defconfig                   |  2 +-
 configs/am3517_evm_defconfig                     |  2 +-
 configs/am43xx_evm_defconfig                     |  2 +-
 configs/am43xx_evm_ethboot_defconfig             |  2 +-
 configs/am43xx_evm_rtconly_defconfig             |  2 +-
 configs/am43xx_evm_usbhost_boot_defconfig        |  2 +-
 configs/am43xx_hs_evm_defconfig                  |  2 +-
 configs/apf27_defconfig                          |  2 +-
 configs/apx4devkit_defconfig                     |  2 +-
 configs/aristainetos2_defconfig                  |  2 +-
 configs/aristainetos2b_defconfig                 |  2 +-
 configs/aristainetos_defconfig                   |  2 +-
 configs/at91sam9260ek_dataflash_cs0_defconfig    |  2 +-
 configs/at91sam9260ek_dataflash_cs1_defconfig    |  2 +-
 configs/at91sam9260ek_nandflash_defconfig        |  2 +-
 configs/at91sam9261ek_dataflash_cs0_defconfig    |  2 +-
 configs/at91sam9261ek_dataflash_cs3_defconfig    |  2 +-
 configs/at91sam9261ek_nandflash_defconfig        |  2 +-
 configs/at91sam9263ek_dataflash_cs0_defconfig    |  2 +-
 configs/at91sam9263ek_dataflash_defconfig        |  2 +-
 configs/at91sam9263ek_nandflash_defconfig        |  2 +-
 configs/at91sam9263ek_norflash_boot_defconfig    |  2 +-
 configs/at91sam9263ek_norflash_defconfig         |  2 +-
 configs/at91sam9g10ek_dataflash_cs0_defconfig    |  2 +-
 configs/at91sam9g10ek_dataflash_cs3_defconfig    |  2 +-
 configs/at91sam9g10ek_nandflash_defconfig        |  2 +-
 configs/at91sam9g20ek_2mmc_defconfig             |  2 +-
 configs/at91sam9g20ek_2mmc_nandflash_defconfig   |  2 +-
 configs/at91sam9g20ek_dataflash_cs0_defconfig    |  2 +-
 configs/at91sam9g20ek_dataflash_cs1_defconfig    |  2 +-
 configs/at91sam9g20ek_nandflash_defconfig        |  2 +-
 configs/at91sam9m10g45ek_mmc_defconfig           |  2 +-
 configs/at91sam9n12ek_mmc_defconfig              |  2 +-
 configs/at91sam9n12ek_spiflash_defconfig         |  2 +-
 configs/at91sam9rlek_dataflash_defconfig         |  2 +-
 configs/at91sam9rlek_mmc_defconfig               |  2 +-
 configs/at91sam9rlek_nandflash_defconfig         |  2 +-
 configs/at91sam9x5ek_dataflash_defconfig         |  2 +-
 configs/at91sam9x5ek_mmc_defconfig               |  2 +-
 configs/at91sam9x5ek_spiflash_defconfig          |  2 +-
 configs/at91sam9xeek_dataflash_cs0_defconfig     |  2 +-
 configs/at91sam9xeek_dataflash_cs1_defconfig     |  2 +-
 configs/at91sam9xeek_nandflash_defconfig         |  2 +-
 configs/axm_defconfig                            |  2 +-
 configs/bcm11130_nand_defconfig                  |  2 +-
 configs/bg0900_defconfig                         |  2 +-
 configs/bitmain_antminer_s9_defconfig            |  4 ++--
 configs/brppt1_nand_defconfig                    |  2 +-
 configs/cairo_defconfig                          |  2 +-
 configs/chiliboard_defconfig                     |  2 +-
 configs/cm_fx6_defconfig                         |  2 +-
 configs/cm_t335_defconfig                        |  2 +-
 configs/cm_t3517_defconfig                       |  2 +-
 configs/cm_t35_defconfig                         |  2 +-
 configs/cm_t43_defconfig                         |  2 +-
 configs/colibri-imx6ull_defconfig                |  4 ++--
 configs/colibri_imx7_defconfig                   |  2 +-
 configs/corvus_defconfig                         |  2 +-
 configs/da850evm_nand_defconfig                  |  2 +-
 configs/db-88f6820-amc_defconfig                 |  2 +-
 configs/db-mv784mp-gp_defconfig                  |  2 +-
 configs/devkit3250_defconfig                     |  2 +-
 configs/devkit8000_defconfig                     |  2 +-
 configs/draco_defconfig                          |  2 +-
 configs/ea20_defconfig                           |  2 +-
 configs/eco5pk_defconfig                         |  2 +-
 configs/etamin_defconfig                         |  2 +-
 configs/ethernut5_defconfig                      |  2 +-
 configs/flea3_defconfig                          |  2 +-
 configs/gurnard_defconfig                        |  2 +-
 configs/gwventana_nand_defconfig                 |  2 +-
 configs/igep0032_defconfig                       |  2 +-
 configs/igep00x0_defconfig                       |  2 +-
 configs/imx6dl_icore_nand_defconfig              |  2 +-
 configs/imx6q_icore_nand_defconfig               |  2 +-
 configs/imx6q_logic_defconfig                    |  2 +-
 configs/imx6qdl_icore_mmc_defconfig              |  2 +-
 configs/imx6qdl_icore_nand_defconfig             |  2 +-
 configs/imx6ul_geam_nand_defconfig               |  2 +-
 configs/imx6ul_isiot_nand_defconfig              |  2 +-
 configs/ipam390_defconfig                        |  2 +-
 configs/k2e_evm_defconfig                        |  2 +-
 configs/k2e_hs_evm_defconfig                     |  2 +-
 configs/k2g_evm_defconfig                        |  2 +-
 configs/k2g_hs_evm_defconfig                     |  2 +-
 configs/k2hk_evm_defconfig                       |  2 +-
 configs/k2hk_hs_evm_defconfig                    |  2 +-
 configs/k2l_evm_defconfig                        |  2 +-
 configs/k2l_hs_evm_defconfig                     |  2 +-
 configs/m53menlo_defconfig                       |  2 +-
 configs/mcx_defconfig                            |  2 +-
 configs/meesc_defconfig                          |  2 +-
 configs/mt_ventoux_defconfig                     |  2 +-
 configs/mx28evk_auart_console_defconfig          |  2 +-
 configs/mx28evk_defconfig                        |  2 +-
 configs/mx28evk_nand_defconfig                   |  2 +-
 configs/mx28evk_spi_defconfig                    |  2 +-
 configs/mx31pdk_defconfig                        |  2 +-
 configs/mx35pdk_defconfig                        |  2 +-
 configs/mx53ard_defconfig                        |  2 +-
 configs/mx6sabreauto_defconfig                   |  2 +-
 configs/mx6sxsabreauto_defconfig                 |  2 +-
 configs/omap35_logic_defconfig                   |  2 +-
 configs/omap35_logic_somlv_defconfig             |  2 +-
 configs/omap3_beagle_defconfig                   |  2 +-
 configs/omap3_evm_defconfig                      |  2 +-
 configs/omap3_ha_defconfig                       |  2 +-
 configs/omap3_logic_defconfig                    |  2 +-
 configs/omap3_logic_somlv_defconfig              |  2 +-
 configs/omap3_overo_defconfig                    |  2 +-
 configs/omap3_pandora_defconfig                  |  2 +-
 configs/omap3_zoom1_defconfig                    |  2 +-
 configs/omapl138_lcdk_defconfig                  |  2 +-
 configs/pcm058_defconfig                         |  2 +-
 configs/pengwyn_defconfig                        |  2 +-
 configs/pfla02_defconfig                         |  2 +-
 configs/platinum_picon_defconfig                 |  2 +-
 configs/platinum_titanium_defconfig              |  2 +-
 configs/pm9261_defconfig                         |  2 +-
 configs/pm9263_defconfig                         |  2 +-
 configs/pm9g45_defconfig                         |  2 +-
 configs/pxm2_defconfig                           |  2 +-
 configs/rastaban_defconfig                       |  2 +-
 configs/rut_defconfig                            |  2 +-
 configs/sama5d2_ptc_ek_mmc_defconfig             |  2 +-
 configs/sama5d36ek_cmp_mmc_defconfig             |  2 +-
 configs/sama5d36ek_cmp_spiflash_defconfig        |  2 +-
 configs/sama5d3_xplained_mmc_defconfig           |  2 +-
 configs/sama5d3xek_mmc_defconfig                 |  2 +-
 configs/sama5d3xek_spiflash_defconfig            |  2 +-
 configs/sama5d4_xplained_mmc_defconfig           |  2 +-
 configs/sama5d4_xplained_spiflash_defconfig      |  2 +-
 configs/sama5d4ek_mmc_defconfig                  |  2 +-
 configs/sama5d4ek_spiflash_defconfig             |  2 +-
 configs/smartweb_defconfig                       |  2 +-
 configs/snapper9260_defconfig                    |  2 +-
 configs/snapper9g20_defconfig                    |  2 +-
 configs/spear300_nand_defconfig                  |  2 +-
 configs/spear300_usbtty_nand_defconfig           |  2 +-
 configs/spear310_nand_defconfig                  |  2 +-
 configs/spear310_usbtty_nand_defconfig           |  2 +-
 configs/spear320_nand_defconfig                  |  2 +-
 configs/spear320_usbtty_nand_defconfig           |  2 +-
 configs/spear600_nand_defconfig                  |  2 +-
 configs/spear600_usbtty_nand_defconfig           |  2 +-
 configs/tao3530_defconfig                        |  2 +-
 configs/taurus_defconfig                         |  2 +-
 configs/thuban_defconfig                         |  2 +-
 configs/ti816x_evm_defconfig                     |  2 +-
 configs/titanium_defconfig                       |  2 +-
 configs/tricorder_defconfig                      |  2 +-
 configs/tricorder_flash_defconfig                |  2 +-
 configs/twister_defconfig                        |  2 +-
 configs/uniphier_ld4_sld8_defconfig              |  2 +-
 configs/uniphier_v7_defconfig                    |  2 +-
 configs/uniphier_v8_defconfig                    |  2 +-
 configs/usb_a9263_dataflash_defconfig            |  2 +-
 configs/wb45n_defconfig                          |  2 +-
 configs/wb50n_defconfig                          |  2 +-
 configs/woodburn_defconfig                       |  2 +-
 configs/woodburn_sd_defconfig                    |  2 +-
 configs/xilinx_zynqmp_mini_nand_defconfig        |  2 +-
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig |  2 +-
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig |  2 +-
 configs/zynq_cse_nand_defconfig                  |  2 +-
 configs/zynq_zc770_xm011_defconfig               |  2 +-
 configs/zynq_zc770_xm011_x16_defconfig           |  2 +-
 drivers/mtd/nand/raw/Kconfig                     |  4 ++--
 include/configs/B4860QDS.h                       | 10 +++++-----
 include/configs/BSC9131RDB.h                     |  4 ++--
 include/configs/BSC9132QDS.h                     |  8 ++++----
 include/configs/C29XPCIE.h                       |  8 ++++----
 include/configs/MPC8313ERDB.h                    | 14 +++++++-------
 include/configs/P1010RDB.h                       | 12 ++++++------
 include/configs/P1022DS.h                        | 10 +++++-----
 include/configs/P2041RDB.h                       |  6 +++---
 include/configs/T102xQDS.h                       |  8 ++++----
 include/configs/T102xRDB.h                       |  8 ++++----
 include/configs/T1040QDS.h                       |  6 +++---
 include/configs/T104xRDB.h                       | 12 ++++++------
 include/configs/T208xQDS.h                       |  8 ++++----
 include/configs/T208xRDB.h                       |  8 ++++----
 include/configs/T4240QDS.h                       | 10 +++++-----
 include/configs/T4240RDB.h                       |  6 +++---
 include/configs/am335x_evm.h                     |  6 +++---
 include/configs/am3517_evm.h                     |  6 +++---
 include/configs/am43xx_evm.h                     |  6 +++---
 include/configs/baltos.h                         |  6 +++---
 include/configs/bav335x.h                        |  8 ++++----
 include/configs/brppt1.h                         | 16 ++++++++--------
 include/configs/corenet_ds.h                     |  8 ++++----
 include/configs/da850evm.h                       |  4 ++--
 include/configs/dra7xx_evm.h                     |  4 ++--
 include/configs/ls2080ardb.h                     |  2 +-
 include/configs/omap3_beagle.h                   | 10 +++++-----
 include/configs/omap3_evm.h                      | 10 +++++-----
 include/configs/omap3_logic.h                    |  2 +-
 include/configs/omap3_overo.h                    |  6 +++---
 include/configs/omap3_pandora.h                  |  2 +-
 include/configs/omapl138_lcdk.h                  |  4 ++--
 include/configs/p1_p2_rdb_pc.h                   |  8 ++++----
 include/configs/siemens-am33x-common.h           |  2 +-
 include/configs/ti_armv7_common.h                |  2 +-
 include/configs/ti_armv7_omap.h                  |  2 +-
 include/configs/ti_omap3_common.h                |  2 +-
 include/environment/ti/dfu.h                     |  2 +-
 275 files changed, 380 insertions(+), 380 deletions(-)
arch/arm/mach-omap2/mem-common.c +3 -3
index ff1e3125a0..50d5f3e9eb 100644
@@ -25,7 +25,7 @@ const struct gpmc *gpmc_cfg = (struct gpmc *)GPMC_BASE;
 
 #if defined(CONFIG_NOR)
 char gpmc_cs0_flash = MTD_DEV_TYPE_NOR;
-#elif defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND)
 char gpmc_cs0_flash = MTD_DEV_TYPE_NAND;
 #elif defined(CONFIG_CMD_ONENAND)
 char gpmc_cs0_flash = MTD_DEV_TYPE_ONENAND;
@@ -93,7 +93,7 @@ void set_gpmc_cs0(int flash_type)
 		STNOR_GPMC_CONFIG7
 	};
 #endif
-#if defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND)
 	const u32 gpmc_regs_nand[GPMC_MAX_REG] = {
 		M_NAND_GPMC_CONFIG1,
 		M_NAND_GPMC_CONFIG2,
@@ -128,7 +128,7 @@ void set_gpmc_cs0(int flash_type)
 		                                              GPMC_SIZE_16M)));
 		break;
 #endif
-#if defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND)
+#if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND)
 	case MTD_DEV_TYPE_NAND:
 		gpmc_regs = gpmc_regs_nand;
 		base = CONFIG_SYS_NAND_BASE;
board/BuR/brppt1/board.c +1 -1
index d2e7c72242..4f6cd5c6b6 100644
@@ -148,7 +148,7 @@ int board_init(void)
 	hw_watchdog_init();
 #endif
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 	gpmc_init();
 #endif
 	return 0;
board/BuR/brppt1/mux.c +3 -3
index 87eee709fd..b863d37335 100644
@@ -118,7 +118,7 @@ static struct module_pin_mux mii2_pin_mux[] = {
 	{OFFSET(gpmc_be1n), (MODE(1) | RXACTIVE)},/* MII1_COL */
 	{-1},
 };
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 static struct module_pin_mux nand_pin_mux[] = {
 	{OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD0 */
 	{OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD1 */
@@ -180,7 +180,7 @@ static struct module_pin_mux gpIOs[] = {
 	{OFFSET(mcasp0_axr0),  (MODE(7) | PULLUDDIS) },
 	/* GPIO3_17 (MCASP0_AHCLKR) - ETH2_LEDY */
 	{OFFSET(mcasp0_ahclkr), (MODE(7) | PULLUDDIS) },
-#ifndef CONFIG_NAND
+#ifndef CONFIG_MTD_RAW_NAND
 	/* GPIO2_3 - NAND_OE */
 	{OFFSET(gpmc_oen_ren), (MODE(7) | PULLDOWN_EN | RXACTIVE)},
 	/* GPIO2_4 - NAND_WEN */
@@ -241,7 +241,7 @@ void enable_board_pin_mux(void)
 	configure_module_pin_mux(i2c0_pin_mux);
 	configure_module_pin_mux(mii1_pin_mux);
 	configure_module_pin_mux(mii2_pin_mux);
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 	configure_module_pin_mux(nand_pin_mux);
 #elif defined(CONFIG_MMC)
 	configure_module_pin_mux(mmc1_pin_mux);
board/birdland/bav335x/board.c +1 -1
index b95186026f..e6369b24f5 100644
@@ -290,7 +290,7 @@ int board_init(void)
 #endif
 
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-#if defined(CONFIG_NOR) || defined(CONFIG_NAND)
+#if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
 	gpmc_init();
 #endif
 	return 0;
board/bosch/shc/board.c +1 -1
index 1ec9a3f5ff..c19aa84be9 100644
@@ -444,7 +444,7 @@ int board_init(void)
 		puts("EEPROM Content Invalid.\n");
 
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-#if defined(CONFIG_NOR) || defined(CONFIG_NAND)
+#if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
 	gpmc_init();
 #endif
 	shc_request_gpio();
board/freescale/ls2080aqds/ls2080aqds.c +1 -1
index d336ef840c..33eb3125f1 100644
@@ -211,7 +211,7 @@ int board_init(void)
 	else
 		config_board_mux(MUX_TYPE_SDHC);
 
-#if defined(CONFIG_NAND) && defined(CONFIG_FSL_QSPI)
+#if defined(CONFIG_MTD_RAW_NAND) && defined(CONFIG_FSL_QSPI)
 	val = in_le32(dcfg_ccsr + DCFG_RCWSR15 / 4);
 
 	if (DCFG_RCWSR15_IFCGRPABASE_QSPI == (val & (u32)0x3))
board/freescale/t102xrdb/t102xrdb.c +1 -1
index acc0be07c5..aca578b00b 100644
@@ -74,7 +74,7 @@ int checkboard(void)
 		printf("NOR vBank%d\n", reg);
 	}
 #elif defined(CONFIG_TARGET_T1023RDB)
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 	puts("NAND\n");
 #else
 	printf("NOR vBank%d\n", t1023rdb_ctrl(I2C_GET_BANK));
board/phytec/pcm051/mux.c +2 -2
index 6e9c3d257c..9bca8eae9f 100644
@@ -82,7 +82,7 @@ static struct module_pin_mux cbmux_pin_mux[] = {
 	{-1},
 };
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 static struct module_pin_mux nand_pin_mux[] = {
 	{OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD0 */
 	{OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD1 */
@@ -118,7 +118,7 @@ void enable_board_pin_mux()
 	configure_module_pin_mux(rmii1_pin_mux);
 	configure_module_pin_mux(mmc0_pin_mux);
 	configure_module_pin_mux(cbmux_pin_mux);
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 	configure_module_pin_mux(nand_pin_mux);
 #endif
 #ifdef CONFIG_SPI
board/siemens/pxm2/mux.c +2 -2
index 9b69b6f5c4..2f35bb4a73 100644
@@ -26,7 +26,7 @@ static struct module_pin_mux uart0_pin_mux[] = {
 	{-1},
 };
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 static struct module_pin_mux nand_pin_mux[] = {
 	{OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD0 */
 	{OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD1 */
@@ -169,7 +169,7 @@ void enable_board_pin_mux(void)
 {
 	configure_module_pin_mux(uart0_pin_mux);
 	configure_module_pin_mux(i2c1_pin_mux);
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 	configure_module_pin_mux(nand_pin_mux);
 #endif
 #ifndef CONFIG_NO_ETH
board/sunxi/README.nand +1 -1
index 98ebe5fb7f..0e97316aeb 100644
@@ -21,7 +21,7 @@ In order to accomodate that, we create a tool that will generate an
 SPL image that is ready to be programmed directly embedding the ECCs,
 randomized, and with the necessary bits needed to reduce the number of
 bitflips. The U-Boot build system, when configured for the NAND (with
-CONFIG_NAND=y) will also generate the image sunxi-spl-with-ecc.bin
+CONFIG_MTD_RAW_NAND=y) will also generate the image sunxi-spl-with-ecc.bin
 that will have been generated by that tool.
 
 In order to flash your U-Boot image onto a board, assuming that the
board/ti/am335x/board.c +1 -1
index 13845251af..4bf0123c7e 100644
@@ -696,7 +696,7 @@ int board_init(void)
 #endif
 
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-#if defined(CONFIG_NOR) || defined(CONFIG_NAND)
+#if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
 	gpmc_init();
 #endif
 
board/ti/am335x/mux.c +4 -4
index 41333f93f4..9b75b4bec6 100644
@@ -191,7 +191,7 @@ static struct module_pin_mux rmii1_pin_mux[] = {
 	{-1},
 };
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 static struct module_pin_mux nand_pin_mux[] = {
 	{OFFSET(gpmc_ad0),	(MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD0  */
 	{OFFSET(gpmc_ad1),	(MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD1  */
@@ -345,7 +345,7 @@ void enable_board_pin_mux(void)
 		/* Beaglebone pinmux */
 		configure_module_pin_mux(mii1_pin_mux);
 		configure_module_pin_mux(mmc0_pin_mux);
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 		configure_module_pin_mux(nand_pin_mux);
 #elif defined(CONFIG_NOR)
 		configure_module_pin_mux(bone_norcape_pin_mux);
@@ -361,7 +361,7 @@ void enable_board_pin_mux(void)
 		if (profile & ~PROFILE_2)
 			configure_module_pin_mux(i2c1_pin_mux);
 		/* Profiles 2 & 3 don't have NAND */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 		if (profile & ~(PROFILE_2 | PROFILE_3))
 			configure_module_pin_mux(nand_pin_mux);
 #endif
@@ -390,7 +390,7 @@ void enable_board_pin_mux(void)
 		/* Beaglebone LT pinmux */
 		configure_module_pin_mux(mii1_pin_mux);
 		configure_module_pin_mux(mmc0_pin_mux);
-#if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT)
+#if defined(CONFIG_MTD_RAW_NAND) && defined(CONFIG_EMMC_BOOT)
 		configure_module_pin_mux(nand_pin_mux);
 #elif defined(CONFIG_NOR) && defined(CONFIG_EMMC_BOOT)
 		configure_module_pin_mux(bone_norcape_pin_mux);
board/ti/am43xx/mux.c +4 -4
index a61987e4c6..f59e93a0eb 100644
@@ -73,7 +73,7 @@ static struct module_pin_mux gpio5_7_pin_mux[] = {
 	{-1},
 };
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 static struct module_pin_mux nand_pin_mux[] = {
 	{OFFSET(gpmc_ad0),	(MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD0 */
 	{OFFSET(gpmc_ad1),	(MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD1 */
@@ -128,18 +128,18 @@ void enable_board_pin_mux(void)
 	if (board_is_evm()) {
 		configure_module_pin_mux(gpio5_7_pin_mux);
 		configure_module_pin_mux(rgmii1_pin_mux);
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 		configure_module_pin_mux(nand_pin_mux);
 #endif
 	} else if (board_is_sk() || board_is_idk()) {
 		configure_module_pin_mux(rgmii1_pin_mux);
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 		printf("Error: NAND flash not present on this board\n");
 #endif
 		configure_module_pin_mux(qspi_pin_mux);
 	} else if (board_is_eposevm()) {
 		configure_module_pin_mux(rmii1_pin_mux);
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 		configure_module_pin_mux(nand_pin_mux);
 #else
 		configure_module_pin_mux(qspi_pin_mux);
board/ti/ti816x/evm.c +1 -1
index 07a084bab8..53b0c2ec4e 100644
@@ -26,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int board_init(void)
 {
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 	gpmc_init();
 #endif
 	return 0;
board/vscom/baltos/board.c +1 -1
index df0a2d2b7a..1bbf3dd7f2 100644
@@ -268,7 +268,7 @@ int board_init(void)
 #endif
 
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-#if defined(CONFIG_NOR) || defined(CONFIG_NAND)
+#if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
 	gpmc_init();
 #endif
 	return 0;
board/vscom/baltos/mux.c +1 -1
index 94410ae35e..d2ebd6e6dc 100644
@@ -119,7 +119,7 @@ void enable_board_pin_mux()
 	configure_module_pin_mux(rmii1_pin_mux);
 	configure_module_pin_mux(mmc0_pin_mux);
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 	configure_module_pin_mux(nand_pin_mux);
 #endif
 }
configs/B4420QDS_NAND_defconfig +1 -1
index fd74888d6c..5739f1e776 100644
@@ -39,7 +39,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/B4860QDS_NAND_defconfig +1 -1
index bfd1bcf6f6..2bbb5a2194 100644
@@ -39,7 +39,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/BSC9131RDB_NAND_SYSCLK100_defconfig +1 -1
index 3f271ccca7..96fb6add3f 100644
@@ -30,7 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(uboot),8m(kernel),512k(dtb),
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/BSC9131RDB_NAND_defconfig +1 -1
index 51dc152288..bf6c2572eb 100644
@@ -29,7 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(uboot),8m(kernel),512k(dtb),
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/BSC9132QDS_NAND_DDRCLK100_defconfig +1 -1
index 0db36b004f..a18953de09 100644
@@ -37,7 +37,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/BSC9132QDS_NAND_DDRCLK133_defconfig +1 -1
index a37a8a29fb..8f785f262d 100644
@@ -37,7 +37,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/C29XPCIE_NAND_defconfig +1 -1
index aef42acb16..cfdd0e707e 100644
@@ -38,7 +38,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/CHIP_pro_defconfig +1 -1
index c607adb65b..d5d7877514 100644
@@ -15,7 +15,7 @@ CONFIG_ENV_IS_IN_UBI=y
 CONFIG_ENV_UBI_PART="UBI"
 CONFIG_ENV_UBI_VOLUME="uboot-env"
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x40000
 CONFIG_SYS_NAND_PAGE_SIZE=0x1000
 CONFIG_SYS_NAND_OOBSIZE=0x100
configs/MPC8313ERDB_NAND_33_defconfig +1 -1
index ab28a78cbe..1c62c1878e 100644
@@ -34,7 +34,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_TSEC_ENET=y
 CONFIG_SYS_NS16550=y
configs/MPC8313ERDB_NAND_66_defconfig +1 -1
index a454ec67fc..4c64eacfd8 100644
@@ -34,7 +34,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_TSEC_ENET=y
 CONFIG_SYS_NS16550=y
configs/Nintendo_NES_Classic_Edition_defconfig +1 -1
index be116db00e..12fd157fe0 100644
@@ -15,7 +15,7 @@ CONFIG_CMD_MTDPARTS=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-r16-nintendo-nes-classic-edition"
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
 CONFIG_SYS_NAND_PAGE_SIZE=0x800
 CONFIG_SYS_NAND_OOBSIZE=0x40
configs/P1010RDB-PA_36BIT_NAND_defconfig +1 -1
index 23993301c7..a8763024ea 100644
@@ -45,7 +45,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1010RDB-PA_NAND_defconfig +1 -1
index 0dd4d4a45b..4b1ddf1e94 100644
@@ -44,7 +44,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +1 -1
index 0f7e989b4e..9071081dd9 100644
@@ -45,7 +45,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1010RDB-PB_NAND_defconfig +1 -1
index cdf51c8735..78ca8b3680 100644
@@ -44,7 +44,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +1 -1
index 09fc7d9fb9..748c282949 100644
@@ -44,7 +44,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1020RDB-PC_NAND_defconfig +1 -1
index 2cc48c6a11..9585602590 100644
@@ -43,7 +43,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1020RDB-PD_NAND_defconfig +1 -1
index 58f25714e5..731a63b73f 100644
@@ -47,7 +47,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1021RDB-PC_36BIT_NAND_defconfig +1 -1
index d03cfc0016..bbe4429337 100644
@@ -49,7 +49,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1021RDB-PC_NAND_defconfig +1 -1
index 0ee7a35bee..9e0a71175f 100644
@@ -48,7 +48,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1022DS_36BIT_NAND_defconfig +1 -1
index a28d506a60..b0c885b289 100644
@@ -46,7 +46,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1022DS_NAND_defconfig +1 -1
index c69ae0135b..916f3103e8 100644
@@ -45,7 +45,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1024RDB_NAND_defconfig +1 -1
index ed1b5e5aa2..6890cd0786 100644
@@ -43,7 +43,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P1025RDB_NAND_defconfig +1 -1
index 9e5bf25eac..2f2b158226 100644
@@ -45,7 +45,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +1 -1
index e16c385848..74b806bbfd 100644
@@ -49,7 +49,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P2020RDB-PC_NAND_defconfig +1 -1
index 964f21d7ab..c6d50fa951 100644
@@ -48,7 +48,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHY_MARVELL=y
configs/P2041RDB_NAND_defconfig +1 -1
index 96c388b621..14ad2b1a2d 100644
@@ -30,7 +30,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P3041DS_NAND_SECURE_BOOT_defconfig +1 -1
index 0f38a46201..095c96431a 100644
@@ -31,7 +31,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P3041DS_NAND_defconfig +1 -1
index a8dea7d783..cf51493d33 100644
@@ -30,7 +30,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P5020DS_NAND_SECURE_BOOT_defconfig +1 -1
index 7d420a3710..8152f68b5b 100644
@@ -32,7 +32,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P5020DS_NAND_defconfig +1 -1
index 8c89cca5eb..55a6fce1ce 100644
@@ -31,7 +31,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P5040DS_NAND_SECURE_BOOT_defconfig +1 -1
index 19c41ea799..495ce616a1 100644
@@ -32,7 +32,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/P5040DS_NAND_defconfig +1 -1
index 3e7c1f73d0..5ec567a0cb 100644
@@ -31,7 +31,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/T1023RDB_NAND_defconfig +1 -1
index 22feb6fca7..ea9f096043 100644
@@ -47,7 +47,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
configs/T1024QDS_NAND_defconfig +1 -1
index fa031a988f..4f860b9b37 100644
@@ -49,7 +49,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/T1024RDB_NAND_defconfig +1 -1
index 294d126772..983292f453 100644
@@ -49,7 +49,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/T1040D4RDB_NAND_defconfig +1 -1
index 637fa07836..2c7ab917c6 100644
@@ -46,7 +46,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/T1040RDB_NAND_defconfig +1 -1
index 3287d1b595..31a21c9c80 100644
@@ -47,7 +47,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/T1042D4RDB_NAND_defconfig +1 -1
index 0bb15cc372..fb97ba8ab8 100644
@@ -47,7 +47,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +1 -1
index 245abd225d..cfda28eb27 100644
@@ -52,7 +52,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/T1042RDB_PI_NAND_defconfig +1 -1
index 0d727143a0..fab2eabc28 100644
@@ -49,7 +49,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/T2080QDS_NAND_defconfig +1 -1
index 948a05af89..f8132ec459 100644
@@ -45,7 +45,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/T2080RDB_NAND_defconfig +1 -1
index 4a5a56e5f4..67d94ea1d9 100644
@@ -45,7 +45,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
configs/T2081QDS_NAND_defconfig +1 -1
index d38a1e3716..94d9df87a2 100644
@@ -43,7 +43,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/T4160QDS_NAND_defconfig +1 -1
index af529b2967..525637a10e 100644
@@ -39,7 +39,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/T4240QDS_NAND_defconfig +1 -1
index caeeacbefc..94bf40c519 100644
@@ -39,7 +39,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
configs/am335x_baltos_defconfig +1 -1
index a61b13b6fc..a0d7f744b3 100644
@@ -43,7 +43,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_MII=y
configs/am335x_evm_defconfig +1 -1
index b6cd49a469..52ba1ecd21 100644
@@ -36,7 +36,7 @@ CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
configs/am335x_evm_nor_defconfig +1 -1
index 54dc7dff78..d2b844118e 100644
@@ -32,7 +32,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am335x_evm_usbspl_defconfig +1 -1
index ec72538ddc..7c0d5eca49 100644
@@ -35,7 +35,7 @@ CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am335x_hs_evm_defconfig +1 -1
index aa6e9665d2..4cc2d28be8 100644
@@ -43,7 +43,7 @@ CONFIG_MISC=y
 CONFIG_DM_MMC=y
 # CONFIG_MMC_HW_PARTITIONING is not set
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
configs/am335x_hs_evm_uart_defconfig +1 -1
index 379b9580a2..72fe0be82d 100644
@@ -40,7 +40,7 @@ CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
configs/am335x_igep003x_defconfig +1 -1
index 16affb8a05..6040668744 100644
@@ -42,7 +42,7 @@ 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_RAW_NAND=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_MII=y
configs/am3517_crane_defconfig +1 -1
index 0e210f0687..b2f332a10e 100644
@@ -25,7 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/am3517_evm_defconfig +1 -1
index 14805575ab..e024f192f2 100644
@@ -38,7 +38,7 @@ CONFIG_DEFAULT_DEVICE_TREE="am3517-evm"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM_PCA953X=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/am43xx_evm_defconfig +1 -1
index 7601263be4..cc70f304c2 100644
@@ -34,7 +34,7 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_evm_ethboot_defconfig +1 -1
index ea46236bc4..f77789cdcc 100644
@@ -40,7 +40,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_evm_rtconly_defconfig +1 -1
index 2d54d1aaf0..403dc960dc 100644
@@ -35,7 +35,7 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_evm_usbhost_boot_defconfig +1 -1
index 2713833544..3ac6372b51 100644
@@ -48,7 +48,7 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am43xx_hs_evm_defconfig +1 -1
index aaf8d10fec..4d79ce617e 100644
@@ -45,7 +45,7 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DRIVER_TI_CPSW=y
configs/apf27_defconfig +1 -1
index e482f48e87..554ef44357 100644
@@ -40,7 +40,7 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
 CONFIG_MXC_GPIO=y
 CONFIG_MMC_MXC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_MII=y
configs/apx4devkit_defconfig +1 -1
index baca2a6624..4631f88fb3 100644
@@ -31,7 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:128k(bootstrap),1024k(boot),768k(env
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_MXS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_MII=y
 CONFIG_CONS_INDEX=0
configs/aristainetos2_defconfig +1 -1
index db5008662d..77ba994da0 100644
@@ -35,7 +35,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/aristainetos2b_defconfig +1 -1
index 9a5843b49e..9fff2d4c9a 100644
@@ -35,7 +35,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/aristainetos_defconfig +1 -1
index 42611228df..6677c0e4a1 100644
@@ -35,7 +35,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/at91sam9260ek_dataflash_cs0_defconfig +1 -1
index 7fd844c94b..27a18d59fb 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9260ek_dataflash_cs1_defconfig +1 -1
index c2fc77d78c..d271c18415 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9260ek_nandflash_defconfig +1 -1
index 19995ab369..a1ef067859 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9261ek_dataflash_cs0_defconfig +1 -1
index 431cf280eb..c84bfb0b7e 100644
@@ -36,7 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9261ek_dataflash_cs3_defconfig +1 -1
index e5efad80de..0bb1b1b68c 100644
@@ -36,7 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9261ek_nandflash_defconfig +1 -1
index f6f3288951..8d24fbdcb5 100644
@@ -36,7 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_dataflash_cs0_defconfig +1 -1
index a19f309c4a..872a939d80 100644
@@ -40,7 +40,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_dataflash_defconfig +1 -1
index a19f309c4a..872a939d80 100644
@@ -40,7 +40,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_nandflash_defconfig +1 -1
index 3ecb1b3726..a1e34632eb 100644
@@ -40,7 +40,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_norflash_boot_defconfig +1 -1
index 556fc15418..f621981422 100644
@@ -41,7 +41,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9263ek_norflash_defconfig +1 -1
index 892f6af1b8..4da52491c0 100644
@@ -41,7 +41,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g10ek_dataflash_cs0_defconfig +1 -1
index 7bf0b79e34..f0d48dc0e4 100644
@@ -36,7 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g10ek_dataflash_cs3_defconfig +1 -1
index b4e8892cca..20c0c71d77 100644
@@ -36,7 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g10ek_nandflash_defconfig +1 -1
index c88e55404e..99f5579767 100644
@@ -36,7 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_2mmc_defconfig +1 -1
index 54cfa1faa8..7dbc4fa103 100644
@@ -37,7 +37,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_2mmc_nandflash_defconfig +1 -1
index 7f01e10ac8..c7f10daeed 100644
@@ -37,7 +37,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_dataflash_cs0_defconfig +1 -1
index 688c1828f4..ddd5e0be26 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_dataflash_cs1_defconfig +1 -1
index 1eb437936d..1ac00e2453 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9g20ek_nandflash_defconfig +1 -1
index 695b6e930a..7824b8881d 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9m10g45ek_mmc_defconfig +1 -1
index 7ef4843c72..9e0db2f871 100644
@@ -39,7 +39,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/at91sam9n12ek_mmc_defconfig +1 -1
index 6b2cfe9c42..c2f9e3f211 100644
@@ -39,7 +39,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9n12ek_spiflash_defconfig +1 -1
index 63889355bf..6f3fea95a3 100644
@@ -39,7 +39,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9rlek_dataflash_defconfig +1 -1
index 800a92cf81..d5ef8f1b0d 100644
@@ -38,7 +38,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9rlek_mmc_defconfig +1 -1
index dd5158a034..0a21ab9af9 100644
@@ -38,7 +38,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9rlek_nandflash_defconfig +1 -1
index 6b863d46da..d06423699b 100644
@@ -38,7 +38,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9x5ek_dataflash_defconfig +1 -1
index dc13509715..61d96286db 100644
@@ -41,7 +41,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9x5ek_mmc_defconfig +1 -1
index ff86f93e61..bfadaef6f2 100644
@@ -41,7 +41,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9x5ek_spiflash_defconfig +1 -1
index d0eebcdc75..73950d52c5 100644
@@ -41,7 +41,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9xeek_dataflash_cs0_defconfig +1 -1
index ac6d9def8c..81f76d6465 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9xeek_dataflash_cs1_defconfig +1 -1
index 56c6f12c47..7a082a583a 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/at91sam9xeek_nandflash_defconfig +1 -1
index 436f1a7736..c94f281aa1 100644
@@ -35,7 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/axm_defconfig +1 -1
index 89d6b6f201..0ae4a19c4a 100644
@@ -38,7 +38,7 @@ CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/bcm11130_nand_defconfig +1 -1
index 2d941f339e..e17b6095d5 100644
@@ -24,7 +24,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_KONA=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
configs/bg0900_defconfig +1 -1
index 6de81621cd..f64b672d7d 100644
@@ -29,7 +29,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_DOS_PARTITION=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/bitmain_antminer_s9_defconfig +2 -2
index 545042f4bd..b3eca53fee 100644
@@ -55,9 +55,9 @@ CONFIG_DM_GPIO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ZYNQ=y
-CONFIG_NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS=y
+CONFIG_MTD_RAW_NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS=y
 CONFIG_MII=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_DEBUG_UART_ZYNQ=y
configs/brppt1_nand_defconfig +1 -1
index e03eb37dfe..86ea75ea41 100644
@@ -77,7 +77,7 @@ CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
 CONFIG_MISC=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_PHY_NATSEMI=y
configs/cairo_defconfig +1 -1
index dc1245f1bf..1c177bfd55 100644
@@ -29,7 +29,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=2
 CONFIG_SPI=y
configs/chiliboard_defconfig +1 -1
index b6cde09d6f..66f29dd443 100644
@@ -33,7 +33,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_MII=y
 CONFIG_SPI=y
configs/cm_fx6_defconfig +1 -1
index 4ec74b27cd..ff9a135b06 100644
@@ -53,7 +53,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_DM_KEYBOARD=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/cm_t335_defconfig +1 -1
index 134b093e54..5d8b6e3c1b 100644
@@ -44,7 +44,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_MII=y
 CONFIG_FAT_WRITE=y
configs/cm_t3517_defconfig +1 -1
index 0901fea638..6c987b4da5 100644
@@ -40,7 +40,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_MII=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x2D000000
configs/cm_t35_defconfig +1 -1
index f1fe2d058d..fdfcd3be45 100644
@@ -41,7 +41,7 @@ CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x2C000000
configs/cm_t43_defconfig +1 -1
index eb4a8f5a33..8fca1c64b0 100644
@@ -47,7 +47,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/colibri-imx6ull_defconfig +2 -2
index c26b3b9eb4..96bf1b7742 100644
@@ -49,9 +49,9 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
-CONFIG_NAND_MXS_DT=y
+CONFIG_MTD_RAW_NAND_MXS_DT=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_ADDR_ENABLE=y
configs/colibri_imx7_defconfig +1 -1
index 7b496bcea9..c147e3f19a 100644
@@ -50,7 +50,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/corvus_defconfig +1 -1
index a1af2f1342..9f2f3260cd 100644
@@ -42,7 +42,7 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
 CONFIG_ATMEL_USART=y
configs/da850evm_nand_defconfig +1 -1
index 5c498749d6..bd4f1bb567 100644
@@ -44,7 +44,7 @@ CONFIG_SPL_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DA8XX_GPIO=y
 CONFIG_DM_I2C=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
configs/db-88f6820-amc_defconfig +1 -1
index dd58198a54..9004dfc9f8 100644
@@ -46,7 +46,7 @@ CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_PXA3XX=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/db-mv784mp-gp_defconfig +1 -1
index 3f140986b6..0592daebc2 100644
@@ -45,7 +45,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SATA_MV=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_PXA3XX=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/devkit3250_defconfig +1 -1
index b739f27803..02eb252e01 100644
@@ -34,7 +34,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_LPC32XX_SLC=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_PHYLIB=y
configs/devkit8000_defconfig +1 -1
index ea2aee4ef4..543a46d462 100644
@@ -27,7 +27,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/draco_defconfig +1 -1
index be64c1a8df..0ae74b1955 100644
@@ -61,7 +61,7 @@ CONFIG_BOOTCOUNT_ENV=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/ea20_defconfig +1 -1
index fae7ff9030..8d85a81f08 100644
@@ -34,7 +34,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DA8XX_GPIO=y
 CONFIG_SYS_I2C_DAVINCI=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/eco5pk_defconfig +1 -1
index bc6b85ffae..2e5cf61983 100644
@@ -30,7 +30,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_MII=y
configs/etamin_defconfig +1 -1
index a6b03f9fa3..89a03f1bc0 100644
@@ -61,7 +61,7 @@ CONFIG_BOOTCOUNT_ENV=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/ethernut5_defconfig +1 -1
index b14cf6c8e4..4093496ec5 100644
@@ -51,7 +51,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/flea3_defconfig +1 -1
index 19c96768db..7a2b32cb62 100644
@@ -29,7 +29,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/gurnard_defconfig +1 -1
index 3c3537a77b..c65ef0f0a4 100644
@@ -25,7 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard"
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
 CONFIG_TIMER=y
configs/gwventana_nand_defconfig +1 -1
index 83690f5258..fd72c3c81f 100644
@@ -63,7 +63,7 @@ CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
configs/igep0032_defconfig +1 -1
index 383648789c..1636e21757 100644
@@ -32,7 +32,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SMC911X=y
configs/igep00x0_defconfig +1 -1
index f2989e34e1..d70cb01163 100644
@@ -32,7 +32,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/imx6dl_icore_nand_defconfig +1 -1
index a8b1a7dab4..4402fe2834 100644
@@ -38,7 +38,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_SMSC=y
configs/imx6q_icore_nand_defconfig +1 -1
index 74c6584cff..1c81fd9515 100644
@@ -39,7 +39,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_SMSC=y
configs/imx6q_logic_defconfig +1 -1
index 036069a437..02c05ae8f2 100644
@@ -57,7 +57,7 @@ CONFIG_SYS_I2C_MXC=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_ATHEROS=y
configs/imx6qdl_icore_mmc_defconfig +1 -1
index b8c2dee04a..a30099bf9d 100644
@@ -48,7 +48,7 @@ CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_SMSC=y
configs/imx6qdl_icore_nand_defconfig +1 -1
index 74c6584cff..1c81fd9515 100644
@@ -39,7 +39,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_SMSC=y
configs/imx6ul_geam_nand_defconfig +1 -1
index f3342576b3..645f666177 100644
@@ -40,7 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_SMSC=y
configs/imx6ul_isiot_nand_defconfig +1 -1
index 1c5e7d3983..5ba77dddb0 100644
@@ -40,7 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-nand"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_SMSC=y
configs/ipam390_defconfig +1 -1
index 7244b0f92a..838f8d83c9 100644
@@ -38,7 +38,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DA8XX_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DRIVER_TI_EMAC=y
 CONFIG_SYS_NS16550=y
configs/k2e_evm_defconfig +1 -1
index 67b1f30c8e..8168bed2e5 100644
@@ -38,7 +38,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2e_hs_evm_defconfig +1 -1
index 1abda846a1..4423fb2bf6 100644
@@ -31,7 +31,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2g_evm_defconfig +1 -1
index bc4b92b491..3d3aae3237 100644
@@ -38,7 +38,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2g_hs_evm_defconfig +1 -1
index 66d8220aeb..b627af8b71 100644
@@ -31,7 +31,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2hk_evm_defconfig +1 -1
index f66d922bf1..054065b841 100644
@@ -38,7 +38,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2hk_hs_evm_defconfig +1 -1
index dd91a51414..63e88c5f76 100644
@@ -31,7 +31,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2l_evm_defconfig +1 -1
index 4f04caa1a3..19a289f58d 100644
@@ -38,7 +38,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/k2l_hs_evm_defconfig +1 -1
index 9ce23dec93..c3e546f6ee 100644
@@ -30,7 +30,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/m53menlo_defconfig +1 -1
index 795f8a3ebc..604ba7cb94 100644
@@ -45,7 +45,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(u-boot),512k(env1),512k(env2),-(ub
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/mcx_defconfig +1 -1
index c30a4dd150..da8053b566 100644
@@ -36,7 +36,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_MII=y
configs/meesc_defconfig +1 -1
index 0e49d82ad1..67bc1edbdf 100644
@@ -27,7 +27,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/mt_ventoux_defconfig +1 -1
index 1635c69d1e..4ace7bdbf3 100644
@@ -36,7 +36,7 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_MII=y
configs/mx28evk_auart_console_defconfig +1 -1
index d0572212f1..86bd12b9f4 100644
@@ -40,7 +40,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
configs/mx28evk_defconfig +1 -1
index ab59d7599b..13490ec763 100644
@@ -40,7 +40,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
configs/mx28evk_nand_defconfig +1 -1
index 6b774cf248..d07f41d696 100644
@@ -39,7 +39,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
configs/mx28evk_spi_defconfig +1 -1
index 0a77e6e9f7..621970098e 100644
@@ -39,7 +39,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
configs/mx31pdk_defconfig +1 -1
index c6dcb45f87..5dc4d49103 100644
@@ -21,7 +21,7 @@ CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0xB6000000
configs/mx35pdk_defconfig +1 -1
index 7fec4b6aa0..78ad716be6 100644
@@ -33,7 +33,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_MII=y
 CONFIG_SMC911X=y
configs/mx53ard_defconfig +1 -1
index 96c43e0d2f..ff5b77cb8b 100644
@@ -16,7 +16,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_MII=y
 CONFIG_SMC911X=y
configs/mx6sabreauto_defconfig +1 -1
index 8856567846..b0fe26425b 100644
@@ -44,7 +44,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/mx6sxsabreauto_defconfig +1 -1
index 41fac12d0c..d411a38d3f 100644
@@ -34,7 +34,7 @@ CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/omap35_logic_defconfig +1 -1
index 80219eeacf..6d5b732ff8 100644
@@ -39,7 +39,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/omap35_logic_somlv_defconfig +1 -1
index 8a8c7147c3..a5da1831fd 100644
@@ -45,7 +45,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/omap3_beagle_defconfig +1 -1
index 4fb8aec57d..9a5ad656ce 100644
@@ -53,7 +53,7 @@ CONFIG_LED_STATUS_GREEN=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_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 +1 -1
index 2b8caf2d4a..0bffd156dd 100644
@@ -45,7 +45,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_DM_MMC=y
 # CONFIG_SPL_DM_MMC is not set
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_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 +1 -1
index 6b3fb31aaa..0c7e91a922 100644
@@ -27,7 +27,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/omap3_logic_defconfig +1 -1
index 969387a37c..1e8b072608 100644
@@ -40,7 +40,7 @@ CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP36XX_PINS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/omap3_logic_somlv_defconfig +1 -1
index 396543e56b..8120c97922 100644
@@ -45,7 +45,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_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 +1 -1
index 1e7e5f7d83..c5123665bf 100644
@@ -34,7 +34,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SMC911X=y
configs/omap3_pandora_defconfig +1 -1
index fb87d0da17..242d81b53d 100644
@@ -30,7 +30,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
configs/omap3_zoom1_defconfig +1 -1
index 325c0020ca..2aa761f30f 100644
@@ -24,7 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x08000000
configs/omapl138_lcdk_defconfig +1 -1
index d66af98ba3..31261f3f2d 100644
@@ -39,7 +39,7 @@ CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_DM_MMC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
configs/pcm058_defconfig +1 -1
index 66ee9ed38a..aa93a6f70d 100644
@@ -43,7 +43,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/pengwyn_defconfig +1 -1
index 3c8684ad95..fd416a3270 100644
@@ -47,7 +47,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_MII=y
 CONFIG_SPI=y
configs/pfla02_defconfig +1 -1
index 18d35a130f..79d0919a1f 100644
@@ -42,7 +42,7 @@ CONFIG_CMD_UBI=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/platinum_picon_defconfig +1 -1
index 91487c1464..8083155af9 100644
@@ -46,7 +46,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(e
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/platinum_titanium_defconfig +1 -1
index ee063063e3..81d2e74091 100644
@@ -46,7 +46,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),512k(env1),512k(e
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pm9261_defconfig +1 -1
index d2c4c25672..f9e12bd834 100644
@@ -38,7 +38,7 @@ CONFIG_AT91_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/pm9263_defconfig +1 -1
index ceb7efe503..14a4c9d3bd 100644
@@ -38,7 +38,7 @@ CONFIG_AT91_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/pm9g45_defconfig +1 -1
index 928e446c3f..20238e4339 100644
@@ -22,7 +22,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/pxm2_defconfig +1 -1
index 4a5c3c6710..e61458b326 100644
@@ -63,7 +63,7 @@ CONFIG_BOOTCOUNT_ENV=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/rastaban_defconfig +1 -1
index 09b64a3857..c237b8f83a 100644
@@ -61,7 +61,7 @@ CONFIG_BOOTCOUNT_ENV=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/rut_defconfig +1 -1
index 08eafc235e..a51ba173e4 100644
@@ -64,7 +64,7 @@ CONFIG_BOOTCOUNT_ENV=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/sama5d2_ptc_ek_mmc_defconfig +1 -1
index 4a78b2da3d..982a658d11 100644
@@ -48,7 +48,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ATMEL=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/sama5d36ek_cmp_mmc_defconfig +1 -1
index 3026cab380..7b7cecd39c 100644
@@ -41,7 +41,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d36ek_cmp_spiflash_defconfig +1 -1
index 04ca6a8e34..f6f3dd324d 100644
@@ -41,7 +41,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d3_xplained_mmc_defconfig +1 -1
index eab38ec366..790ae0dfdd 100644
@@ -58,7 +58,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/sama5d3xek_mmc_defconfig +1 -1
index 6faea0ec3f..d78ef725ef 100644
@@ -65,7 +65,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d3xek_spiflash_defconfig +1 -1
index 37f603d528..09f09d769e 100644
@@ -60,7 +60,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4_xplained_mmc_defconfig +1 -1
index bfcea3f519..e6ee4b975c 100644
@@ -56,7 +56,7 @@ CONFIG_SYS_I2C_AT91=y
 CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4_xplained_spiflash_defconfig +1 -1
index a89dd11a8c..84258eaa25 100644
@@ -56,7 +56,7 @@ CONFIG_SYS_I2C_AT91=y
 CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4ek_mmc_defconfig +1 -1
index 45e6539913..b1eb130f3f 100644
@@ -56,7 +56,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4ek_spiflash_defconfig +1 -1
index dad32b5711..f0bd1a9c36 100644
@@ -53,7 +53,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/smartweb_defconfig +1 -1
index e9c2b63509..7216ba55d2 100644
@@ -44,7 +44,7 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
 CONFIG_USB=y
configs/snapper9260_defconfig +1 -1
index 7ce29bfb90..8bf36ece01 100644
@@ -28,7 +28,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_PCA953X=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/snapper9g20_defconfig +1 -1
index 2773c6b41b..4d83736623 100644
@@ -27,7 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_CMD_PCA953X=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/spear300_nand_defconfig +1 -1
index 95ca7de900..441b8085e7 100644
@@ -23,7 +23,7 @@ CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear300_usbtty_nand_defconfig +1 -1
index 9b90cd8638..5288573abb 100644
@@ -23,7 +23,7 @@ CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear310_nand_defconfig +1 -1
index ea65de9a9b..1d4d66f290 100644
@@ -23,7 +23,7 @@ CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear310_usbtty_nand_defconfig +1 -1
index 1d41522b2a..83d1d5c1d7 100644
@@ -23,7 +23,7 @@ CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear320_nand_defconfig +1 -1
index a80208cc68..4326cdd603 100644
@@ -23,7 +23,7 @@ CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear320_usbtty_nand_defconfig +1 -1
index 8fb84bcc60..e363ea9662 100644
@@ -23,7 +23,7 @@ CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear600_nand_defconfig +1 -1
index 170327224e..bc5473a8d3 100644
@@ -23,7 +23,7 @@ CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear600_usbtty_nand_defconfig +1 -1
index 078e934bba..cbd25baa18 100644
@@ -23,7 +23,7 @@ CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/tao3530_defconfig +1 -1
index daca05e84b..8112bb1368 100644
@@ -27,7 +27,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
configs/taurus_defconfig +1 -1
index e53e075d48..aac54c4f2e 100644
@@ -48,7 +48,7 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/thuban_defconfig +1 -1
index b856b9d3c7..63afc1dd00 100644
@@ -61,7 +61,7 @@ CONFIG_BOOTCOUNT_ENV=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_MTD_UBI_FASTMAP=y
configs/ti816x_evm_defconfig +1 -1
index 381f46411b..b669130895 100644
@@ -42,7 +42,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_OMAP24XX=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_EMAC=y
configs/titanium_defconfig +1 -1
index 2136176b69..2375c5e520 100644
@@ -34,7 +34,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1),512k(env2),-(u
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/tricorder_defconfig +1 -1
index 300f3faf6b..1a561a1ab4 100644
@@ -37,7 +37,7 @@ CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
configs/tricorder_flash_defconfig +1 -1
index ab2b15111d..1c3401e5fd 100644
@@ -36,7 +36,7 @@ CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
configs/twister_defconfig +1 -1
index 5632e6d271..8a26dc8992 100644
@@ -35,7 +35,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_MII=y
configs/uniphier_ld4_sld8_defconfig +1 -1
index 6b9e22ac0e..b2027db806 100644
@@ -39,7 +39,7 @@ CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DENALI_DT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_SPL_NAND_DENALI=y
configs/uniphier_v7_defconfig +1 -1
index 4c06f272b1..fc1e931050 100644
@@ -38,7 +38,7 @@ CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DENALI_DT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_SPL_NAND_DENALI=y
configs/uniphier_v8_defconfig +1 -1
index f8f9bdf05c..cafcec4fdb 100644
@@ -37,7 +37,7 @@ CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_CADENCE=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DENALI_DT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_DM_ETH=y
configs/usb_a9263_dataflash_defconfig +1 -1
index 9f7506f70b..3fa40363d3 100644
@@ -31,7 +31,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/wb45n_defconfig +1 -1
index 9d881e5d41..beab78bc19 100644
@@ -26,7 +26,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_LZMA=y
 CONFIG_OF_LIBFDT=y
configs/wb50n_defconfig +1 -1
index c74eba1012..4c3367b7ec 100644
@@ -25,7 +25,7 @@ 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_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/woodburn_defconfig +1 -1
index a5cc579ce5..6fb8325664 100644
@@ -34,7 +34,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/woodburn_sd_defconfig +1 -1
index 00c219f046..b28828d5d6 100644
@@ -45,7 +45,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/xilinx_zynqmp_mini_nand_defconfig +1 -1
index 74ba0c97f3..f3c55b470b 100644
@@ -47,6 +47,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
 # CONFIG_MMC is not set
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ARASAN=y
 # CONFIG_EFI_LOADER is not set
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +1 -1
index c2b3d189ec..38871e5d6a 100644
@@ -55,7 +55,7 @@ CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_DM_MMC=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ARASAN=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +1 -1
index b853e2f56f..b1e4f4b60d 100644
@@ -54,7 +54,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ARASAN=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_NATSEMI=y
configs/zynq_cse_nand_defconfig +1 -1
index 44ad5bd69c..77ccdb529d 100644
@@ -46,6 +46,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand"
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_MMC is not set
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
configs/zynq_zc770_xm011_defconfig +1 -1
index c15877d0ad..29f30c90d0 100644
@@ -37,7 +37,7 @@ CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ZYNQ=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
configs/zynq_zc770_xm011_x16_defconfig +1 -1
index 60627da8e5..7632a876d5 100644
@@ -37,7 +37,7 @@ CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_DEVICE=y
-CONFIG_NAND=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ZYNQ=y
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
drivers/mtd/nand/raw/Kconfig +2 -2
index 008f7b4b4b..a1fd476b0d 100644
@@ -1,7 +1,7 @@
 
-menuconfig NAND
+menuconfig MTD_RAW_NAND
 	bool "Raw NAND Device Support"
-if NAND
+if MTD_RAW_NAND
 
 config SYS_NAND_SELF_INIT
 	bool
include/configs/B4860QDS.h +5 -5
index f758ea7dbe..6aad3d279d 100644
@@ -12,7 +12,7 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_SYS_FSL_PBL_PBI	$(SRCTREE)/board/freescale/b4860qds/b4_pbi.cfg
 #define CONFIG_SYS_FSL_PBL_RCW	$(SRCTREE)/board/freescale/b4860qds/b4_rcw.cfg
-#ifndef CONFIG_NAND
+#ifndef CONFIG_MTD_RAW_NAND
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
 #else
@@ -110,7 +110,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV          0
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(512 * 1097)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -161,7 +161,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_INIT_L3_ADDR		0xFFFC0000
 #define CONFIG_SYS_L3_SIZE		256 << 10
 #define CONFIG_SPL_GD_ADDR		(CONFIG_SYS_INIT_L3_ADDR + 32 * 1024)
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_ENV_ADDR			(CONFIG_SPL_GD_ADDR + 4 * 1024)
 #endif
 #define CONFIG_SPL_RELOC_MALLOC_ADDR	(CONFIG_SPL_GD_ADDR + 12 * 1024)
@@ -338,7 +338,7 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024)
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -600,7 +600,7 @@ unsigned long get_board_ddr_clk(void);
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR	(512 * 1130)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR	(13 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
include/configs/BSC9131RDB.h +2 -2
index 71e840a4b8..2955f5a042 100644
@@ -18,7 +18,7 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
@@ -264,7 +264,7 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_ENV_OFFSET	0x100000	/* 1MB */
 #define CONFIG_ENV_SECT_SIZE	0x10000
 #define CONFIG_ENV_SIZE		0x2000
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE		CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_OFFSET	((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
 #define CONFIG_ENV_RANGE	(3 * CONFIG_ENV_SIZE)
include/configs/BSC9132QDS.h +4 -4
index 49bb38279a..69ad1f0bdb 100644
@@ -20,13 +20,13 @@
 #define CONFIG_SYS_RAMBOOT
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #endif
-#ifdef CONFIG_NAND_SECBOOT
+#ifdef CONFIG_MTD_RAW_NAND_SECBOOT
 #define CONFIG_RAMBOOT_NAND
 #define CONFIG_SYS_RAMBOOT
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
@@ -312,7 +312,7 @@ combinations. this should be removed later
 #endif
 
 /* Set up IFC registers for boot location NOR/NAND */
-#if defined(CONFIG_NAND) || defined(CONFIG_NAND_SECBOOT)
+#if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_MTD_RAW_NAND_SECBOOT)
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
 #define CONFIG_SYS_CSOR0		CONFIG_SYS_NAND_CSOR
@@ -466,7 +466,7 @@ combinations. this should be removed later
 #define CONFIG_ENV_OFFSET	0x100000	/* 1MB */
 #define CONFIG_ENV_SECT_SIZE	0x10000
 #define CONFIG_ENV_SIZE		0x2000
-#elif defined(CONFIG_NAND) || defined(CONFIG_NAND_SECBOOT)
+#elif defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_MTD_RAW_NAND_SECBOOT)
 #define CONFIG_ENV_SIZE		CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_OFFSET	((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
 #define CONFIG_ENV_RANGE	(3 * CONFIG_ENV_SIZE)
include/configs/C29XPCIE.h +4 -4
index caeb34cf0a..41ae33b891 100644
@@ -15,7 +15,7 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
@@ -217,7 +217,7 @@
 #define CONFIG_SYS_NAND_DDR_LAW		11
 
 /* Set up IFC registers for boot location NOR/NAND */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
 #define CONFIG_SYS_CSOR0		CONFIG_SYS_NAND_CSOR
@@ -302,7 +302,7 @@
 #define CONFIG_SPL_RELOC_MALLOC_ADDR	(CONFIG_SYS_INIT_L2_ADDR + 160 * 1024)
 #define CONFIG_SPL_RELOC_MALLOC_SIZE	(96 << 10)
 #define CONFIG_SPL_GD_ADDR		(CONFIG_SYS_INIT_L2_ADDR + 112 * 1024)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SYS_INIT_L2_ADDR		0xf8f80000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS	CONFIG_SYS_INIT_L2_ADDR
@@ -388,7 +388,7 @@
 #define CONFIG_ENV_SECT_SIZE	0x10000
 #define CONFIG_ENV_SIZE		0x2000
 #endif
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
include/configs/MPC8313ERDB.h +7 -7
index cfa5b56524..2bc146b081 100644
@@ -17,7 +17,7 @@
 #define CONFIG_MPC8313		1
 #define CONFIG_MPC8313ERDB	1
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
@@ -42,7 +42,7 @@
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #endif
 
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 #ifndef CONFIG_SYS_MONITOR_BASE
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE	/* start of monitor */
@@ -72,7 +72,7 @@
 
 #define CONFIG_SYS_IMMR		0xE0000000
 
-#if defined(CONFIG_NAND) && !defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_MTD_RAW_NAND) && !defined(CONFIG_SPL_BUILD)
 #define CONFIG_DEFAULT_IMMR	CONFIG_SYS_IMMR
 #endif
 
@@ -237,7 +237,7 @@
 #define CONFIG_SYS_LBC_MRTPR	0x20000000  /*TODO */
 
 /* drivers/mtd/nand/raw/nand.c */
-#if defined(CONFIG_NAND) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_MTD_RAW_NAND) && defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_NAND_BASE		0xFFF00000
 #else
 #define CONFIG_SYS_NAND_BASE		0xE2800000
@@ -265,7 +265,7 @@
 				| OR_FCM_EHTR)
 				/* 0xFFFF8396 */
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_BR0_PRELIM CONFIG_SYS_NAND_BR_PRELIM
 #define CONFIG_SYS_OR0_PRELIM CONFIG_SYS_NAND_OR_PRELIM
 #define CONFIG_SYS_BR1_PRELIM CONFIG_SYS_NOR_BR_PRELIM
@@ -409,7 +409,7 @@
 /*
  * Environment
  */
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 	#define CONFIG_ENV_OFFSET		(512 * 1024)
 	#define CONFIG_ENV_SECT_SIZE	CONFIG_SYS_NAND_BLOCK_SIZE
 	#define CONFIG_ENV_SIZE		CONFIG_ENV_SECT_SIZE
@@ -501,7 +501,7 @@
 	HRCWH_TSEC2M_IN_RGMII |\
 	HRCWH_BIG_ENDIAN)
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_HRCW_HIGH (CONFIG_SYS_HRCW_HIGH_BASE |\
 		       HRCWH_FROM_0XFFF00100 |\
 		       HRCWH_ROM_LOC_NAND_SP_8BIT |\
include/configs/P1010RDB.h +6 -6
index 18f70f04af..ac6a7c0e4a 100644
@@ -55,7 +55,7 @@
 #endif
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_NAND_BOOT
@@ -102,7 +102,7 @@
 #endif
 #endif
 
-#ifdef CONFIG_NAND_SECBOOT	/* NAND Boot */
+#ifdef CONFIG_MTD_RAW_NAND_SECBOOT	/* NAND Boot */
 #define CONFIG_RAMBOOT_NAND
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #endif
@@ -399,7 +399,7 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_NAND_DDR_LAW		11
 
 /* Set up IFC registers for boot location NOR/NAND */
-#if defined(CONFIG_NAND) || defined(CONFIG_NAND_SECBOOT)
+#if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_MTD_RAW_NAND_SECBOOT)
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
 #define CONFIG_SYS_CSOR0		CONFIG_SYS_NAND_CSOR
@@ -495,7 +495,7 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SPL_RELOC_MALLOC_ADDR	(CONFIG_SYS_INIT_L2_ADDR + 128 * 1024)
 #define CONFIG_SPL_RELOC_MALLOC_SIZE	(128 << 10)
 #define CONFIG_SPL_GD_ADDR		(CONFIG_SYS_INIT_L2_ADDR + 96 * 1024)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SYS_INIT_L2_ADDR		0xD0000000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS	CONFIG_SYS_INIT_L2_ADDR
@@ -569,7 +569,7 @@ extern unsigned long get_sdram_size(void);
  * SPI interface will not be available in case of NAND boot SPI CS0 will be
  * used for SLIC
  */
-#if !defined(CONFIG_NAND) || !defined(CONFIG_NAND_SECBOOT)
+#if !defined(CONFIG_MTD_RAW_NAND) || !defined(CONFIG_MTD_RAW_NAND_SECBOOT)
 /* eSPI - Enhanced SPI */
 #define CONFIG_SF_DEFAULT_SPEED		10000000
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
@@ -651,7 +651,7 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_ENV_OFFSET	0x100000	/* 1MB */
 #define CONFIG_ENV_SECT_SIZE	0x10000
 #define CONFIG_ENV_SIZE		0x2000
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
include/configs/P1022DS.h +5 -5
index c9ed70ca4c..fb272120a5 100644
@@ -51,7 +51,7 @@
 #define CONFIG_SYS_NAND_MAX_ECCPOS	56
 #define CONFIG_SYS_NAND_MAX_OOBFREE	5
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
@@ -197,7 +197,7 @@
 	(BR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | BR_PS_16 | BR_V)
 #define CONFIG_FLASH_OR_PRELIM	(OR_AM_128MB | 0xff7)
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_BR1_PRELIM	CONFIG_FLASH_BR_PRELIM	/* NOR Base Address */
 #define CONFIG_SYS_OR1_PRELIM	CONFIG_FLASH_OR_PRELIM	/* NOR Options */
 #else
@@ -250,7 +250,7 @@
 			       | OR_FCM_SCY_1 \
 			       | OR_FCM_TRLX \
 			       | OR_FCM_EHTR)
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_BR0_PRELIM	CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
 #define CONFIG_SYS_OR0_PRELIM	CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
 #else
@@ -306,7 +306,7 @@
 #define CONFIG_SPL_RELOC_MALLOC_ADDR	(CONFIG_SYS_INIT_L2_ADDR + 148 * 1024)
 #define CONFIG_SPL_RELOC_MALLOC_SIZE	(108 << 10)
 #define CONFIG_SPL_GD_ADDR		(CONFIG_SYS_INIT_L2_ADDR + 112 * 1024)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SYS_INIT_L2_ADDR		0xf8f80000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS	CONFIG_SYS_INIT_L2_ADDR
@@ -521,7 +521,7 @@
 #define CONFIG_FSL_FIXED_MMC_LOCATION
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_SYS_MMC_ENV_DEV	0
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
include/configs/P2041RDB.h +3 -3
index bd2913e8d4..c5224d2d2b 100644
@@ -61,7 +61,7 @@
 	#define CONFIG_SYS_MMC_ENV_DEV          0
 	#define CONFIG_ENV_SIZE			0x2000
 	#define CONFIG_ENV_OFFSET		(512 * 1658)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE			CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_OFFSET		(7 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -226,7 +226,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 			       | OR_FCM_TRLX \
 			       | OR_FCM_EHTR)
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_BR0_PRELIM  CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
 #define CONFIG_SYS_OR0_PRELIM  CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
 #define CONFIG_SYS_BR1_PRELIM  CONFIG_SYS_FLASH_BR_PRELIM /* NOR Base Address */
@@ -467,7 +467,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR	(512 * 1680)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR	(8 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
include/configs/T102xQDS.h +4 -4
index 42bfd07f58..91f48f7455 100644
@@ -40,7 +40,7 @@
 #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_NAND_U_BOOT_DST	0x00200000
 #define CONFIG_SYS_NAND_U_BOOT_START	0x00200000
@@ -140,7 +140,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(512 * 0x800)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -347,7 +347,7 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024)
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -668,7 +668,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR		(512 * 0x820)
 #define CONFIG_SYS_QE_FW_ADDR		(512 * 0x920)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR		(11 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #define CONFIG_SYS_QE_FW_ADDR		(12 * CONFIG_SYS_NAND_BLOCK_SIZE)
include/configs/T102xRDB.h +4 -4
index 673d1112e2..faa40b6fc9 100644
@@ -43,7 +43,7 @@
 #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_NAND_U_BOOT_DST	0x30000000
 #define CONFIG_SYS_NAND_U_BOOT_START	0x30000000
@@ -159,7 +159,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(512 * 0x800)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE			0x2000
 #if defined(CONFIG_TARGET_T1024RDB)
 #define CONFIG_ENV_OFFSET		(2 * CONFIG_SYS_NAND_BLOCK_SIZE)
@@ -372,7 +372,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_NAND_BASE_LIST	{ CONFIG_SYS_NAND_BASE }
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -679,7 +679,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR		(512 * 0x820)
 #define CONFIG_SYS_QE_FW_ADDR		(512 * 0x920)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #if defined(CONFIG_TARGET_T1024RDB)
 #define CONFIG_SYS_FMAN_FW_ADDR		(3 * CONFIG_SYS_NAND_BLOCK_SIZE)
include/configs/T1040QDS.h +3 -3
index 7d90797b08..4e766fd8c3 100644
@@ -70,7 +70,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV          0
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(512 * 1658)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE			CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_OFFSET		(7 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #else
@@ -269,7 +269,7 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024)
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -555,7 +555,7 @@ unsigned long get_board_ddr_clk(void);
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR	(512 * 1680)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR	(8 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #else
include/configs/T104xRDB.h +6 -6
index 7375d6ff46..abf6680861 100644
@@ -32,7 +32,7 @@
 #define RESET_VECTOR_OFFSET		0x27FFC
 #define BOOT_PAGE_OFFSET		0x27000
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_U_BOOT_HDR_SIZE		(16 << 10)
 /*
@@ -171,7 +171,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_SYS_MMC_ENV_DEV          0
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(512 * 0x800)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_RAMBOOT_NAND
 #define CONFIG_BOOTSCRIPT_COPY_RAM
@@ -379,7 +379,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(512 * 1024)
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -426,7 +426,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #endif
 
 #ifdef CONFIG_SYS_FSL_ERRATUM_A008044
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_A008044_WORKAROUND
 #endif
 #endif
@@ -662,7 +662,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR	(512 * 0x820)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR	(5 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #else
@@ -674,7 +674,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_SYS_QE_FW_ADDR		0x130000
 #elif defined(CONFIG_SDCARD)
 #define CONFIG_SYS_QE_FW_ADDR		(512 * 0x920)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FW_ADDR		(7 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #else
 #define CONFIG_SYS_QE_FW_ADDR		0xEFF10000
include/configs/T208xQDS.h +4 -4
index 833a0608bf..5c0123d671 100644
@@ -47,7 +47,7 @@
 #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_NAND_U_BOOT_DST	0x00200000
 #define CONFIG_SYS_NAND_U_BOOT_START	0x00200000
@@ -136,7 +136,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV	0
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_OFFSET	(512 * 0x800)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_OFFSET	(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -320,7 +320,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024)
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -607,7 +607,7 @@ unsigned long get_board_ddr_clk(void);
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR	(512 * 0x820)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR	(11 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
include/configs/T208xRDB.h +4 -4
index ddb60b3d6d..3c775c4bb6 100644
@@ -41,7 +41,7 @@
 #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_NAND_U_BOOT_DST	0x00200000
 #define CONFIG_SYS_NAND_U_BOOT_START	0x00200000
@@ -121,7 +121,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV	0
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_OFFSET	(512 * 0x800)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_OFFSET	(2 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -283,7 +283,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(512 * 1024)
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -553,7 +553,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_FMAN_FW_ADDR		(512 * 0x820)
 #define CONFIG_CORTINA_FW_ADDR		(512 * 0x8a0)
 
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_CORTINA_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR		(3 * CONFIG_SYS_NAND_BLOCK_SIZE)
include/configs/T4240QDS.h +5 -5
index 34b3b056ec..9b7caad442 100644
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t4qds/t4_pbi.cfg
-#if !defined(CONFIG_NAND) && !defined(CONFIG_SDCARD)
+#if !defined(CONFIG_MTD_RAW_NAND) && !defined(CONFIG_SDCARD)
 #define CONFIG_RAMBOOT_TEXT_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
@@ -27,7 +27,7 @@
 #define RESET_VECTOR_OFFSET		0x27FFC
 #define BOOT_PAGE_OFFSET		0x27000
 
-#ifdef	CONFIG_NAND
+#ifdef	CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_NAND_U_BOOT_DST	0x00200000
 #define CONFIG_SYS_NAND_U_BOOT_START	0x00200000
@@ -85,7 +85,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV          0
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(512 * 0x800)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(10 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -249,7 +249,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_NAND_MAX_OOBFREE	2
 #define CONFIG_SYS_NAND_MAX_ECCPOS	256
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -415,7 +415,7 @@ unsigned long get_board_ddr_clk(void);
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR	(512 * 0x820)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR	(11 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
include/configs/T4240RDB.h +3 -3
index f5eed0923f..535443e6d2 100644
@@ -292,7 +292,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV          0
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(512 * 0x800)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE			CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_OFFSET		(7 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_ENV_IS_NOWHERE)
@@ -407,7 +407,7 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(512 * 1024)
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CONFIG_SYS_NAND_AMASK
@@ -561,7 +561,7 @@ unsigned long get_board_ddr_clk(void);
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR	(512 * 0x820)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR	(8 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #else
include/configs/am335x_evm.h +3 -3
index 5d5b09bbd1..551ed87a53 100644
@@ -37,7 +37,7 @@
 /* Always 128 KiB env size */
 #define CONFIG_ENV_SIZE			SZ_128K
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define NANDARGS \
 	"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
 	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
@@ -199,7 +199,7 @@
 /* USB gadget RNDIS */
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
@@ -226,7 +226,7 @@
 #ifdef CONFIG_SPL_OS_BOOT
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS	0x00200000 /* kernel offset */
 #endif
-#endif /* !CONFIG_NAND */
+#endif /* !CONFIG_MTD_RAW_NAND */
 
 /*
  * For NOR boot, we must set this to the start of where NOR is mapped
include/configs/am3517_evm.h +3 -3
index 4e7e5209d4..eeb39bb600 100644
@@ -50,7 +50,7 @@
 #define CONFIG_NET_RETRY_COUNT		10
 
 /* Board NAND Info. */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	64
 #define CONFIG_SYS_NAND_PAGE_SIZE	2048
@@ -80,7 +80,7 @@
  *  DTB                  4 * NAND_BLOCK_SIZE = 512 KiB  @ 0xAA0000
  *  RootFS              Remaining Flash Space           @ 0xB20000
  */
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 /* Environment information */
 
@@ -175,7 +175,7 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS	2	/* max number of flash banks */
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* Reserve 2 sectors */
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_FLASH_BASE		NAND_BASE
 #endif
 
include/configs/am43xx_evm.h +3 -3
index 9d0d342478..cd7c8ebeec 100644
@@ -222,7 +222,7 @@
 #define CONFIG_SYS_RX_ETH_BUFFER	64
 
 /* NAND support */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 #define CONFIG_SYS_NAND_PAGE_SIZE	4096
 #define CONFIG_SYS_NAND_OOBSIZE		224
@@ -279,10 +279,10 @@
 		"nand read ${loadaddr} NAND.kernel; " \
 		"bootz ${loadaddr} - ${fdtaddr}\0"
 #define NANDBOOT			"run nandboot; "
-#else /* !CONFIG_NAND */
+#else /* !CONFIG_MTD_RAW_NAND */
 #define NANDARGS
 #define NANDBOOT
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 #if defined(CONFIG_TI_SECURE_DEVICE)
 /* Avoid relocating onto firewalled area at end of DRAM */
include/configs/baltos.h +3 -3
index 006b049d09..cba55409ff 100644
@@ -38,7 +38,7 @@
 
 /* I2C configuration */
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x00080000
 #ifdef CONFIG_SPL_OS_BOOT
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */
@@ -227,7 +227,7 @@
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)
@@ -269,7 +269,7 @@
 #define CONFIG_PHY_ATHEROS
 
 /* NAND support */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define GPMC_NAND_ECC_LP_x8_LAYOUT	1
 #endif
 
include/configs/bav335x.h +4 -4
index df5d5bdc4a..b454a0604e 100644
@@ -37,7 +37,7 @@
 /* Always 128 KiB env size */
 #define CONFIG_ENV_SIZE			(128 << 10)
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define NANDARGS \
 	"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
 	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
@@ -342,7 +342,7 @@ DEFAULT_LINUX_BOOT_ENV \
 /* USB gadget RNDIS */
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
@@ -373,7 +373,7 @@ DEFAULT_LINUX_BOOT_ENV \
 #ifdef CONFIG_SPL_OS_BOOT
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS	0x00200000 /* kernel offset */
 #endif
-#endif /* !CONFIG_NAND */
+#endif /* !CONFIG_MTD_RAW_NAND */
 
 /*
  * For NOR boot, we must set this to the start of where NOR is mapped
@@ -413,7 +413,7 @@ DEFAULT_LINUX_BOOT_ENV \
 	"spl-os-image fat 0 1;" \
 	"u-boot.img fat 0 1;" \
 	"uEnv.txt fat 0 1\0"
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define DFU_ALT_INFO_NAND \
 	"dfu_alt_info_nand=" \
 	"SPL part 0 1;" \
include/configs/brppt1.h +8 -8
index 5badd2da8b..b2df43c433 100644
@@ -51,23 +51,23 @@
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x80	/* 64KiB */
 
 /* NAND */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS		0x140000
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 #endif /* CONFIG_SPL_OS_BOOT */
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 /* Always 64 KiB env size */
 #define CONFIG_ENV_SIZE			(64 << 10)
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define NANDTGTS \
 "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
 "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
@@ -81,7 +81,7 @@
 "b_tgts_pme=usb0 nand net\0"
 #else
 #define NANDTGTS ""
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 #define MMCSPI_TGTS \
 "t30args#0=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \
@@ -150,7 +150,7 @@ NANDTGTS \
 " if test ${b_break} = 1; then; exit; fi; done\0"
 #endif /* !CONFIG_SPL_BUILD*/
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 /*
  * GPMC  block.  We support 1 device and the physical address to
  * access CS0@is 0x8000000.
@@ -180,7 +180,7 @@ NANDTGTS \
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_NAND_OMAP_GPMC_WSCFG	1
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 /* USB configuration */
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
include/configs/corenet_ds.h +4 -4
index cd791507ee..7b2d12c4d3 100644
@@ -15,7 +15,7 @@
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_RAMBOOT_NAND
 #endif
 #define CONFIG_BOOTSCRIPT_COPY_RAM
@@ -72,7 +72,7 @@
 #define CONFIG_SYS_MMC_ENV_DEV          0
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET		(512 * 1658)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_SIZE			CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_OFFSET		(7 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
@@ -235,7 +235,7 @@
 			       | OR_FCM_TRLX \
 			       | OR_FCM_EHTR)
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_BR0_PRELIM  CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
 #define CONFIG_SYS_OR0_PRELIM  CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
 #define CONFIG_SYS_BR2_PRELIM  CONFIG_SYS_FLASH_BR_PRELIM /* NOR Base Address */
@@ -483,7 +483,7 @@
  */
 #define CONFIG_SYS_QE_FMAN_FW_IN_MMC
 #define CONFIG_SYS_FMAN_FW_ADDR	(512 * 1680)
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #define CONFIG_SYS_FMAN_FW_ADDR	(8 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
include/configs/da850evm.h +2 -2
index ba878eb13b..cfef0e04c4 100644
@@ -142,7 +142,7 @@
 /*
  * Flash & Environment
  */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 #define CONFIG_ENV_SIZE			(128 << 10)
@@ -262,7 +262,7 @@
 #define CONFIG_CLOCKS
 #endif
 
-#if !defined(CONFIG_NAND) && \
+#if !defined(CONFIG_MTD_RAW_NAND) && \
 	!defined(CONFIG_USE_NOR) && \
 	!defined(CONFIG_USE_SPIFLASH)
 #define CONFIG_ENV_SIZE		(16 << 10)
include/configs/dra7xx_evm.h +2 -2
index 2d8758db75..faae1d335f 100644
@@ -115,7 +115,7 @@
 #define CONFIG_SCSI_AHCI_PLAT
 
 /* NAND support */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 #define CONFIG_SYS_NAND_PAGE_SIZE	2048
 #define CONFIG_SYS_NAND_OOBSIZE		64
@@ -142,7 +142,7 @@
 #ifdef CONFIG_SPL_OS_BOOT
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS	0x00200000 /* kernel offset */
 #endif
-#endif /* !CONFIG_NAND */
+#endif /* !CONFIG_MTD_RAW_NAND */
 
 /* Parallel NOR Support */
 #if defined(CONFIG_NOR)
include/configs/ls2080ardb.h +1 -1
index 295b824aa0..f0dfa76d88 100644
@@ -193,7 +193,7 @@ unsigned long get_board_sys_clk(void);
 					FTIM2_GPCM_TWP(0x3E))
 #define CONFIG_SYS_CS3_FTIM3		0x0
 
-#if defined(CONFIG_SPL) && defined(CONFIG_NAND)
+#if defined(CONFIG_SPL) && defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR2_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR2		CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR2_FINAL		CONFIG_SYS_NOR0_CSPR
include/configs/omap3_beagle.h +5 -5
index 7698a90c4e..baf63c13e2 100644
@@ -26,7 +26,7 @@
 #define CONFIG_REVISION_TAG
 
 /* NAND */
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_FLASH_BASE		NAND_BASE
 #define CONFIG_SYS_MAX_NAND_DEVICE      1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
@@ -49,7 +49,7 @@
 #if defined(CONFIG_SPL_OS_BOOT)
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
 #endif /* CONFIG_SPL_OS_BOOT */
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 /* USB EHCI */
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	147
@@ -76,7 +76,7 @@
 #define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
 	#devtypel #instance " "
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 
 #define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
 	"bootcmd_" #devtypel #instance "=" \
@@ -94,13 +94,13 @@
 	func(UBIFS, ubifs, 0) \
 	func(NAND, nand, 0)
 
-#else /* !CONFIG_NAND */
+#else /* !CONFIG_MTD_RAW_NAND */
 
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(LEGACY_MMC, legacy_mmc, 0)
 
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 #include <config_distro_bootcmd.h>
 
include/configs/omap3_evm.h +5 -5
index 07bcbc6f4e..a4bcfb424e 100644
@@ -31,7 +31,7 @@
 #define CONFIG_REVISION_TAG
 
 /* NAND */
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_FLASH_BASE		NAND_BASE
 #define CONFIG_SYS_MAX_NAND_DEVICE      1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
@@ -53,7 +53,7 @@
 #if defined(CONFIG_SPL_OS_BOOT)
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
 #endif /* CONFIG_SPL_OS_BOOT */
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 /* Environment */
 #define CONFIG_ENV_SIZE                 SZ_128K
@@ -70,7 +70,7 @@
 #define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
 	#devtypel #instance " "
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 
 #define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
 	"bootcmd_" #devtypel #instance "=" \
@@ -88,13 +88,13 @@
 	func(UBIFS, ubifs, 0) \
 	func(NAND, nand, 0)
 
-#else /* !CONFIG_NAND */
+#else /* !CONFIG_MTD_RAW_NAND */
 
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(LEGACY_MMC, legacy_mmc, 0)
 
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 #include <config_distro_bootcmd.h>
 
include/configs/omap3_logic.h +1 -1
index fe557f91ca..61964a4c15 100644
@@ -33,7 +33,7 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM AT24C64      */
 
 /* Board NAND Info. */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE	1	  /* Max number of */
 						  /* NAND devices */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/omap3_overo.h +3 -3
index 35f3af4ae9..d82b7bcaab 100644
@@ -35,7 +35,7 @@
 
 /* commands to include */
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 /* NAND block size is 128 KiB.  Synchronize these values with
  * overo_nand_partitions in mach-omap2/board-overo.c in Linux:
  *  xloader              4 * NAND_BLOCK_SIZE = 512 KiB
@@ -44,7 +44,7 @@
  *  linux               64 * NAND_BLOCK_SIZE = 8 MiB
  *  rootfs              remainder
  */
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 /* Board NAND Info. */
 /* Environment information */
@@ -148,7 +148,7 @@
 					0x01F00000) /* 31MB */
 
 /* FLASH and environment organization */
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_FLASH_BASE		NAND_BASE
 #endif
 
include/configs/omap3_pandora.h +1 -1
index 82c66c4b8c..dbb5b849b8 100644
@@ -54,7 +54,7 @@
 #define CONFIG_SYS_MEMTEST_END		(OMAP34XX_SDRC_CS0 + \
 					0x01F00000) /* 31MB */
 
-#if defined(CONFIG_NAND)
+#if defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_FLASH_BASE		NAND_BASE
 #endif
 
include/configs/omapl138_lcdk.h +2 -2
index 2002444e42..51f92b45cc 100644
@@ -137,7 +137,7 @@
 /*
  * Flash & Environment
  */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_ENV_OFFSET		0x0 /* Block 0--not used by bootcode */
 #define CONFIG_ENV_SIZE			(128 << 9)
 #define	CONFIG_SYS_NAND_USE_FLASH_BBT
@@ -248,7 +248,7 @@
 #define CONFIG_CLOCKS
 #endif
 
-#if !defined(CONFIG_NAND) && \
+#if !defined(CONFIG_MTD_RAW_NAND) && \
 	!defined(CONFIG_SYS_USE_NOR) && \
 	!defined(CONFIG_USE_SPIFLASH)
 #define CONFIG_ENV_SIZE		(16 << 10)
include/configs/p1_p2_rdb_pc.h +4 -4
index 9465fb4702..ce91a00cd2 100644
@@ -171,7 +171,7 @@
 #endif
 #endif
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
@@ -455,7 +455,7 @@
 				 OR_GPCM_SCY | OR_GPCM_TRLX | OR_GPCM_EHTR | \
 				 OR_GPCM_EAD)
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_BR0_PRELIM	CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Addr */
 #define CONFIG_SYS_OR0_PRELIM	CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
 #define CONFIG_SYS_BR1_PRELIM	CONFIG_FLASH_BR_PRELIM	/* NOR Base Address */
@@ -511,7 +511,7 @@
 #else
 #define CONFIG_SPL_RELOC_MALLOC_SIZE	(108 << 10)
 #endif
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SYS_INIT_L2_ADDR		0xf8f80000
 #define CONFIG_SYS_INIT_L2_ADDR_PHYS	CONFIG_SYS_INIT_L2_ADDR
@@ -720,7 +720,7 @@
 #define CONFIG_FSL_FIXED_MMC_LOCATION
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_SYS_MMC_ENV_DEV	0
-#elif defined(CONFIG_NAND)
+#elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_ENV_SIZE		0x2000
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
include/configs/siemens-am33x-common.h +1 -1
index d8ed02bf79..d3abf67961 100644
@@ -192,7 +192,7 @@
 #define CONFIG_NET_RETRY_COUNT         10
 
 /* NAND support */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 /* UBI Support */
 
 /* Commen environment */
include/configs/ti_armv7_common.h +1 -1
index 0f892e51d1..94443e4415 100644
@@ -182,7 +182,7 @@
 
 /* General parts of the framework, required. */
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
include/configs/ti_armv7_omap.h +1 -1
index 98b5839154..727c648319 100644
@@ -15,7 +15,7 @@
  * GPMC NAND block.  We support 1 device and the physical address to
  * access CS0@is 0x8000000.
  */
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #ifndef CONFIG_SYS_NAND_BASE
 #define CONFIG_SYS_NAND_BASE		0x8000000
 #endif
include/configs/ti_omap3_common.h +1 -1
index c668284b3e..fa5ac63a08 100644
@@ -59,7 +59,7 @@
 #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \
 					 (64 << 20))
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_BASE		0x30000000
 #endif
 
include/environment/ti/dfu.h +1 -1
index 9f7ea03226..720c3453af 100644
@@ -39,7 +39,7 @@
 	"u-boot.img fat 1 1;" \
 	"uEnv.txt fat 1 1\0"
 
-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND
 #define DFU_ALT_INFO_NAND \
 	"dfu_alt_info_nand=" \
 	"SPL part 0 1;" \
Signature · 1 line
2.19.1
author maintainer
#5 lore raw

PATCH v3 3/28 mtd: rename CONFIG_MTD -> CONFIG_DM_MTD

In reply to Miquel Raynal

CONFIG_MTD must be reserved for the MTD core. Like any other subsystem, prefix the symbol by DM when it comes to DM support.

---
 configs/10m50_defconfig                            | 2 +-
 configs/3c120_defconfig                            | 2 +-
 configs/adp-ae3xx_defconfig                        | 2 +-
 configs/alt_defconfig                              | 2 +-
 configs/boston32r2_defconfig                       | 2 +-
 configs/boston32r2el_defconfig                     | 2 +-
 configs/boston32r6_defconfig                       | 2 +-
 configs/boston32r6el_defconfig                     | 2 +-
 configs/boston64r2_defconfig                       | 2 +-
 configs/boston64r2el_defconfig                     | 2 +-
 configs/boston64r6_defconfig                       | 2 +-
 configs/boston64r6el_defconfig                     | 2 +-
 configs/colibri-imx6ull_defconfig                  | 2 +-
 configs/colibri_t20_defconfig                      | 2 +-
 configs/comtrend_ct5361_ram_defconfig              | 2 +-
 configs/comtrend_wap5813n_ram_defconfig            | 2 +-
 configs/gardena-smart-gateway-mt7688-ram_defconfig | 2 +-
 configs/gardena-smart-gateway-mt7688_defconfig     | 2 +-
 configs/gose_defconfig                             | 2 +-
 configs/harmony_defconfig                          | 2 +-
 configs/huawei_hg556a_ram_defconfig                | 2 +-
 configs/khadas-vim2_defconfig                      | 2 +-
 configs/koelsch_defconfig                          | 2 +-
 configs/lager_defconfig                            | 2 +-
 configs/mccmon6_nor_defconfig                      | 2 +-
 configs/mccmon6_sd_defconfig                       | 2 +-
 configs/pcm058_defconfig                           | 2 +-
 configs/pfla02_defconfig                           | 2 +-
 configs/porter_defconfig                           | 2 +-
 configs/r8a77995_draak_defconfig                   | 2 +-
 configs/sfr_nb4-ser_ram_defconfig                  | 2 +-
 configs/silk_defconfig                             | 2 +-
 configs/stm32f746-disco_defconfig                  | 2 +-
 configs/stout_defconfig                            | 2 +-
 drivers/mtd/Kconfig                                | 2 +-
 drivers/mtd/Makefile                               | 2 +-
 drivers/mtd/mtd_uboot.c                            | 2 +-
 include/flash.h                                    | 2 +-
 38 files changed, 38 insertions(+), 38 deletions(-)
configs/10m50_defconfig +1 -1
index 119cbcd354..8df747904b 100644
@@ -23,7 +23,7 @@ CONFIG_DM_GPIO=y
 CONFIG_ALTERA_PIO=y
 CONFIG_MISC=y
 CONFIG_ALTERA_SYSID=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
 CONFIG_ALTERA_QSPI=y
configs/3c120_defconfig +1 -1
index 42a032f1e7..a6f369603a 100644
@@ -23,7 +23,7 @@ CONFIG_DM_GPIO=y
 CONFIG_ALTERA_PIO=y
 CONFIG_MISC=y
 CONFIG_ALTERA_SYSID=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/adp-ae3xx_defconfig +1 -1
index 1e26affaa9..1c26a8fc6d 100644
@@ -27,7 +27,7 @@ CONFIG_MMC=y
 CONFIG_DM_MMC=y
 CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/alt_defconfig +1 -1
index 396ed5eaf2..060f08ddd2 100644
@@ -62,7 +62,7 @@ CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/boston32r2_defconfig +1 -1
index 2d52f522ba..b34f406dab 100644
@@ -28,7 +28,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/boston32r2el_defconfig +1 -1
index 2e2beede1a..30f2c1a5be 100644
@@ -29,7 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/boston32r6_defconfig +1 -1
index 07613bf6ba..6f71f1f317 100644
@@ -29,7 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/boston32r6el_defconfig +1 -1
index 14d9aa1411..7dee5f6ffe 100644
@@ -30,7 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/boston64r2_defconfig +1 -1
index 310c4a98ea..edeb4c9cc8 100644
@@ -29,7 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/boston64r2el_defconfig +1 -1
index 3b39df1a82..3470cfbbf5 100644
@@ -30,7 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/boston64r6_defconfig +1 -1
index a0779b8e1f..8176fa8dfa 100644
@@ -29,7 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/boston64r6el_defconfig +1 -1
index 3cdd1de16d..2abb0187be 100644
@@ -30,7 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/colibri-imx6ull_defconfig +1 -1
index 96bf1b7742..a2fe3da629 100644
@@ -48,7 +48,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_MTD_RAW_NAND_MXS_DT=y
configs/colibri_t20_defconfig +1 -1
index 43528ef383..328dd725aa 100644
@@ -37,7 +37,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
configs/comtrend_ct5361_ram_defconfig +1 -1
index 82f2070713..10511bbde5 100644
@@ -34,7 +34,7 @@ CONFIG_DM_GPIO=y
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/comtrend_wap5813n_ram_defconfig +1 -1
index 987e4c3fbc..49a07e66ec 100644
@@ -34,7 +34,7 @@ CONFIG_DM_GPIO=y
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/gardena-smart-gateway-mt7688-ram_defconfig +1 -1
index 262dea3115..d9f75570bb 100644
@@ -37,7 +37,7 @@ CONFIG_DM_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_BLINK=y
 CONFIG_LED_GPIO=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/gardena-smart-gateway-mt7688_defconfig +1 -1
index 6463e891b7..ca63358f6c 100644
@@ -40,7 +40,7 @@ CONFIG_DM_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_BLINK=y
 CONFIG_LED_GPIO=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/gose_defconfig +1 -1
index 0368c65963..667f65f509 100644
@@ -61,7 +61,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_RENESAS_SDHI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/harmony_defconfig +1 -1
index 8e99fe7ccb..a5edd9b9e4 100644
@@ -28,7 +28,7 @@ CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SPL_DM=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
configs/huawei_hg556a_ram_defconfig +1 -1
index 6bb14ba736..fadb9ba053 100644
@@ -34,7 +34,7 @@ CONFIG_DM_GPIO=y
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/khadas-vim2_defconfig +1 -1
index 4bbccc2f34..ec735b6c66 100644
@@ -26,7 +26,7 @@ CONFIG_SARADC_MESON=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_MESON_GX=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_PHY=y
configs/koelsch_defconfig +1 -1
index dbacfd87ba..40993ce625 100644
@@ -61,7 +61,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_RENESAS_SDHI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/lager_defconfig +1 -1
index 242e104b6b..3a471fea94 100644
@@ -63,7 +63,7 @@ CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/mccmon6_nor_defconfig +1 -1
index 69fab7c779..87794b464a 100644
@@ -28,7 +28,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/mccmon6_sd_defconfig +1 -1
index 05c6572beb..ec92be936a 100644
@@ -29,7 +29,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/pcm058_defconfig +1 -1
index aa93a6f70d..b346aac223 100644
@@ -42,7 +42,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
configs/pfla02_defconfig +1 -1
index 79d0919a1f..e3eb2ce523 100644
@@ -41,7 +41,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
configs/porter_defconfig +1 -1
index d51db3d5cb..2c93bd2cb0 100644
@@ -61,7 +61,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_RENESAS_SDHI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/r8a77995_draak_defconfig +1 -1
index f704d325fc..8165855b00 100644
@@ -43,7 +43,7 @@ CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_RENESAS_SDHI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_DEVICE=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/sfr_nb4-ser_ram_defconfig +1 -1
index 12adfb01e7..04a4ba9d46 100644
@@ -36,7 +36,7 @@ CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_BCM6358=y
 CONFIG_LED_GPIO=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/silk_defconfig +1 -1
index 3350e69039..7af02a34fc 100644
@@ -63,7 +63,7 @@ CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/stm32f746-disco_defconfig +1 -1
index 1bf3a7c11f..b996283485 100644
@@ -45,7 +45,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_DM_MMC=y
 # CONFIG_SPL_DM_MMC is not set
 CONFIG_ARM_PL180_MMCI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/stout_defconfig +1 -1
index acd05564f3..cbfc887045 100644
@@ -61,7 +61,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_RENESAS_SDHI=y
-CONFIG_MTD=y
+CONFIG_DM_MTD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
drivers/mtd/Kconfig +1 -1
index 0050fb2b9b..ecd62642eb 100644
@@ -3,7 +3,7 @@ menu "MTD Support"
 config MTD_PARTITIONS
 	bool
 
-config MTD
+config DM_MTD
 	bool "Enable Driver Model for MTD drivers"
 	depends on DM
 	help
drivers/mtd/Makefile +1 -1
index aca3a0b811..d490114147 100644
@@ -6,7 +6,7 @@
 ifneq (,$(findstring y,$(CONFIG_MTD_DEVICE)$(CONFIG_CMD_NAND)$(CONFIG_CMD_ONENAND)$(CONFIG_CMD_SF)$(CONFIG_CMD_MTD)))
 obj-y += mtdcore.o mtd_uboot.o
 endif
-obj-$(CONFIG_MTD) += mtd-uclass.o
+obj-$(CONFIG_DM_MTD) += mtd-uclass.o
 obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
 obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
 obj-$(CONFIG_ALTERA_QSPI) += altera_qspi.o
drivers/mtd/mtd_uboot.c +1 -1
index 5ca560c968..cce162461b 100644
@@ -75,7 +75,7 @@ int mtd_search_alternate_name(const char *mtdname, char *altname,
 	return -EINVAL;
 }
 
-#if IS_ENABLED(CONFIG_MTD)
+#if IS_ENABLED(CONFIG_DM_MTD)
 static void mtd_probe_uclass_mtd_devs(void)
 {
 	struct udevice *dev;
include/flash.h +1 -1
index 70ab435199..807800b524 100644
@@ -44,7 +44,7 @@ typedef struct {
 	uchar   sr_supported;		/* status register supported            */
 	const char *name;		/* human-readable name	                */
 #endif
-#ifdef CONFIG_MTD
+#ifdef CONFIG_DM_MTD
 	struct mtd_info *mtd;
 #endif
 #ifdef CONFIG_CFI_FLASH			/* DM-specific parts */
Signature · 1 line
2.19.1
author maintainer
#7 lore raw

PATCH v3 4/28 mtd: rename CONFIG_MTD_DEVICE -> CONFIG_MTD

In reply to Miquel Raynal

Like in Linux, just use CONFIG_MTD to compile the MTD stack.

---
 cmd/Kconfig                                      |  2 +-
 configs/10m50_defconfig                          |  2 +-
 configs/TQM834x_defconfig                        |  2 +-
 configs/TWR-P1025_defconfig                      |  2 +-
 configs/alt_defconfig                            |  2 +-
 configs/am335x_evm_norboot_defconfig             |  2 +-
 configs/am335x_evm_spiboot_defconfig             |  2 +-
 configs/bitmain_antminer_s9_defconfig            |  2 +-
 configs/brppt1_spi_defconfig                     |  2 +-
 configs/da850_am18xxevm_defconfig                |  2 +-
 configs/da850evm_defconfig                       |  2 +-
 configs/display5_defconfig                       |  2 +-
 configs/display5_factory_defconfig               |  2 +-
 configs/ds414_defconfig                          |  2 +-
 configs/gose_defconfig                           |  2 +-
 configs/gwventana_emmc_defconfig                 |  2 +-
 configs/gwventana_gw5904_defconfig               |  2 +-
 configs/kmeter1_defconfig                        |  2 +-
 configs/kmopti2_defconfig                        |  2 +-
 configs/kmsupx5_defconfig                        |  2 +-
 configs/kmtepr2_defconfig                        |  2 +-
 configs/kmvect1_defconfig                        |  2 +-
 configs/koelsch_defconfig                        |  2 +-
 configs/lager_defconfig                          |  2 +-
 configs/mccmon6_nor_defconfig                    |  1 -
 configs/mccmon6_sd_defconfig                     |  1 -
 configs/microblaze-generic_defconfig             |  2 +-
 configs/porter_defconfig                         |  2 +-
 configs/r8a77995_draak_defconfig                 |  1 -
 configs/s5pc210_universal_defconfig              |  2 +-
 configs/silk_defconfig                           |  2 +-
 configs/smdkc100_defconfig                       |  2 +-
 configs/socfpga_arria10_defconfig                |  2 +-
 configs/socfpga_arria5_defconfig                 |  2 +-
 configs/socfpga_cyclone5_defconfig               |  2 +-
 configs/socfpga_dbm_soc1_defconfig               |  2 +-
 configs/socfpga_de0_nano_soc_defconfig           |  2 +-
 configs/socfpga_de10_nano_defconfig              |  2 +-
 configs/socfpga_de1_soc_defconfig                |  2 +-
 configs/socfpga_is1_defconfig                    |  2 +-
 configs/socfpga_sockit_defconfig                 |  2 +-
 configs/socfpga_socrates_defconfig               |  2 +-
 configs/socfpga_sr1500_defconfig                 |  2 +-
 configs/socfpga_vining_fpga_defconfig            |  2 +-
 configs/spear300_defconfig                       |  2 +-
 configs/spear300_nand_defconfig                  |  2 +-
 configs/spear300_usbtty_defconfig                |  2 +-
 configs/spear300_usbtty_nand_defconfig           |  2 +-
 configs/spear310_defconfig                       |  2 +-
 configs/spear310_nand_defconfig                  |  2 +-
 configs/spear310_pnor_defconfig                  |  2 +-
 configs/spear310_usbtty_defconfig                |  2 +-
 configs/spear310_usbtty_nand_defconfig           |  2 +-
 configs/spear310_usbtty_pnor_defconfig           |  2 +-
 configs/spear320_defconfig                       |  2 +-
 configs/spear320_nand_defconfig                  |  2 +-
 configs/spear320_pnor_defconfig                  |  2 +-
 configs/spear320_usbtty_defconfig                |  2 +-
 configs/spear320_usbtty_nand_defconfig           |  2 +-
 configs/spear320_usbtty_pnor_defconfig           |  2 +-
 configs/spear600_defconfig                       |  2 +-
 configs/spear600_nand_defconfig                  |  2 +-
 configs/spear600_usbtty_defconfig                |  2 +-
 configs/spear600_usbtty_nand_defconfig           |  2 +-
 configs/stmark2_defconfig                        |  2 +-
 configs/stout_defconfig                          |  2 +-
 configs/suvd3_defconfig                          |  2 +-
 configs/tuge1_defconfig                          |  2 +-
 configs/tuxx1_defconfig                          |  2 +-
 configs/vct_platinum_onenand_defconfig           |  2 +-
 configs/vct_platinum_onenand_small_defconfig     |  2 +-
 configs/vct_platinumavc_onenand_defconfig        |  2 +-
 configs/vct_platinumavc_onenand_small_defconfig  |  2 +-
 configs/vct_premium_onenand_defconfig            |  2 +-
 configs/vct_premium_onenand_small_defconfig      |  2 +-
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig |  2 +-
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig |  2 +-
 configs/zynq_cse_nand_defconfig                  |  2 +-
 configs/zynq_zc770_xm011_defconfig               |  2 +-
 configs/zynq_zc770_xm011_x16_defconfig           |  2 +-
 drivers/mtd/Kconfig                              | 12 ++++++------
 drivers/mtd/Makefile                             |  2 +-
 drivers/mtd/nand/raw/nand.c                      |  2 +-
 drivers/mtd/onenand/onenand_uboot.c              |  2 +-
 include/configs/mvebu_armada-37xx.h              |  2 +-
 include/configs/socfpga_stratix10_socdk.h        |  2 +-
 86 files changed, 88 insertions(+), 91 deletions(-)
cmd/Kconfig +1 -1
index e2973b3c51..bf9cc0c52d 100644
@@ -1733,7 +1733,7 @@ config CMD_JFFS2
 
 config CMD_MTDPARTS
 	bool "MTD partition support"
-	select MTD_DEVICE if (CMD_NAND || NAND)
+	select MTD if (CMD_NAND || NAND)
 	help
 	  MTD partitioning tool support.
 	  It is strongly encouraged to avoid using this command
configs/10m50_defconfig +1 -1
index 8df747904b..d283a17105 100644
@@ -23,9 +23,9 @@ CONFIG_DM_GPIO=y
 CONFIG_ALTERA_PIO=y
 CONFIG_MISC=y
 CONFIG_ALTERA_SYSID=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
 CONFIG_ALTERA_QSPI=y
 CONFIG_PHY_MARVELL=y
 CONFIG_DM_ETH=y
configs/TQM834x_defconfig +1 -1
index e1a7a06306..0922f246b8 100644
@@ -24,7 +24,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=TQM834x-0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=TQM834x-0:256k(u-boot),256k(env),1m(kernel),2m(initrd),-(user);"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/TWR-P1025_defconfig +1 -1
index 5ed6b5aa4a..47134f1e00 100644
@@ -33,7 +33,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SATA_SIL3114=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/alt_defconfig +1 -1
index 060f08ddd2..bc059a4ac4 100644
@@ -62,8 +62,8 @@ CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
-CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/am335x_evm_norboot_defconfig +1 -1
index 5d7ccf0c5a..4911d26f2f 100644
@@ -23,7 +23,7 @@ CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/am335x_evm_spiboot_defconfig +1 -1
index 10a935f0c0..57aae4a617 100644
@@ -27,7 +27,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DRIVER_TI_CPSW=y
configs/bitmain_antminer_s9_defconfig +1 -1
index b3eca53fee..5774ad7173 100644
@@ -54,7 +54,7 @@ CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ZYNQ=y
 CONFIG_MTD_RAW_NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS=y
configs/brppt1_spi_defconfig +1 -1
index 2fa5dacd7a..bb1d3abead 100644
@@ -81,7 +81,7 @@ CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/da850_am18xxevm_defconfig +1 -1
index 58745fec82..9ff40126bf 100644
@@ -44,7 +44,7 @@ CONFIG_DA8XX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SYS_I2C_DAVINCI=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/da850evm_defconfig +1 -1
index 1bb7b9a03e..e0869aecc9 100644
@@ -48,7 +48,7 @@ CONFIG_DA8XX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_DM_MMC=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/display5_defconfig +1 -1
index e6162e3cfb..0d1c769835 100644
@@ -62,7 +62,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/display5_factory_defconfig +1 -1
index 6ef85e246c..c2becc5f62 100644
@@ -63,7 +63,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/ds414_defconfig +1 -1
index 5325bd9968..fe29ec46b4 100644
@@ -42,7 +42,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
 # CONFIG_MMC is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/gose_defconfig +1 -1
index 667f65f509..c3bbc4f05f 100644
@@ -61,8 +61,8 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
-CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/gwventana_emmc_defconfig +1 -1
index eb7614a75a..deb4e11947 100644
@@ -61,7 +61,7 @@ CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHYLIB=y
 CONFIG_E1000=y
 CONFIG_MII=y
configs/gwventana_gw5904_defconfig +1 -1
index e2408766e2..240933db97 100644
@@ -61,7 +61,7 @@ CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_FSL_ESDHC=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHYLIB=y
 CONFIG_MV88E61XX_SWITCH=y
 CONFIG_MV88E61XX_CPU_PORT=5
configs/kmeter1_defconfig +1 -1
index 0c3fadfcf8..4e5e34c34a 100644
@@ -32,7 +32,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/kmopti2_defconfig +1 -1
index e8e821fb80..8fe3c09428 100644
@@ -32,7 +32,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/kmsupx5_defconfig +1 -1
index 86e2bd9237..cacd9bb4dc 100644
@@ -32,7 +32,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/kmtepr2_defconfig +1 -1
index 6170dc3f16..2a10fc19e7 100644
@@ -32,7 +32,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/kmvect1_defconfig +1 -1
index 74b688fb5f..70d0742588 100644
@@ -33,7 +33,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/koelsch_defconfig +1 -1
index 40993ce625..aa265b06f7 100644
@@ -61,8 +61,8 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
-CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/lager_defconfig +1 -1
index 3a471fea94..88f6a7a7d7 100644
@@ -63,8 +63,8 @@ CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
-CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/mccmon6_nor_defconfig +0 -1
index 87794b464a..645c3c8b74 100644
@@ -30,7 +30,6 @@ CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/mccmon6_sd_defconfig +0 -1
index ec92be936a..4f14434488 100644
@@ -31,7 +31,6 @@ CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/microblaze-generic_defconfig +1 -1
index 0b21020cff..3419b0f074 100644
@@ -45,7 +45,7 @@ CONFIG_XILINX_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/porter_defconfig +1 -1
index 2c93bd2cb0..dd57fd668c 100644
@@ -61,8 +61,8 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
-CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/r8a77995_draak_defconfig +0 -1
index 8165855b00..3b1412030c 100644
@@ -45,7 +45,6 @@ CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_RENESAS_SDHI=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
 CONFIG_FLASH_CFI_MTD=y
configs/s5pc210_universal_defconfig +1 -1
index 5f5ff164ee..0e057726de 100644
@@ -34,7 +34,7 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_S5P=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX8998=y
 CONFIG_USB=y
configs/silk_defconfig +1 -1
index 7af02a34fc..bd8585b1a4 100644
@@ -63,8 +63,8 @@ CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
-CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/smdkc100_defconfig +1 -1
index 87b638f21d..b841e4d026 100644
@@ -21,6 +21,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=s3c-onenand:256k(bootloader),128k at 0x40000(para
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
 CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_MMC is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x98800300
configs/socfpga_arria10_defconfig +1 -1
index 6ebda81135..a9b0c7319a 100644
@@ -33,7 +33,7 @@ CONFIG_FPGA_SOCFPGA=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_MMC=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/socfpga_arria5_defconfig +1 -1
index e7e1121c5c..04cf5d254a 100644
@@ -49,7 +49,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/socfpga_cyclone5_defconfig +1 -1
index 8989c4dc96..bd8216df59 100644
@@ -49,7 +49,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/socfpga_dbm_soc1_defconfig +1 -1
index b6f4f8a3dd..f3103f0dfb 100644
@@ -50,7 +50,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/socfpga_de0_nano_soc_defconfig +1 -1
index 1a9f2b6038..90850d9cab 100644
@@ -49,7 +49,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_DM_ETH=y
configs/socfpga_de10_nano_defconfig +1 -1
index c9490d47a4..af15f1759b 100644
@@ -45,7 +45,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_DM_ETH=y
configs/socfpga_de1_soc_defconfig +1 -1
index b6c8e6c84d..c97c34c675 100644
@@ -44,7 +44,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_DM_ETH=y
configs/socfpga_is1_defconfig +1 -1
index 682e58fdb8..601b7018b0 100644
@@ -46,7 +46,7 @@ CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/socfpga_sockit_defconfig +1 -1
index 66f7733ee8..2963bae333 100644
@@ -49,7 +49,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/socfpga_socrates_defconfig +1 -1
index 05f38cbcd2..6cf12cb272 100644
@@ -50,7 +50,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/socfpga_sr1500_defconfig +1 -1
index 97366cdfff..41d8af06b1 100644
@@ -51,7 +51,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/socfpga_vining_fpga_defconfig +1 -1
index 6fcf8c66f8..a666fe1d32 100644
@@ -66,7 +66,7 @@ CONFIG_LED_STATUS_BIT3=65
 CONFIG_LED_STATUS_CMD=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
configs/spear300_defconfig +1 -1
index 72f460c912..3a2e03081b 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear300_nand_defconfig +1 -1
index 441b8085e7..c34cf0bc25 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear300_usbtty_defconfig +1 -1
index bc0c3ec091..1673163aaa 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear300_usbtty_nand_defconfig +1 -1
index 5288573abb..449634bc39 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear310_defconfig +1 -1
index 0fc0d0e939..3a6c50f822 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear310_nand_defconfig +1 -1
index 1d4d66f290..b8369d1f65 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear310_pnor_defconfig +1 -1
index 906d813453..6066a2ff86 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
configs/spear310_usbtty_defconfig +1 -1
index 7786e66998..83e291b0be 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear310_usbtty_nand_defconfig +1 -1
index 83d1d5c1d7..e99024e1e1 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear310_usbtty_pnor_defconfig +1 -1
index b5214b5d82..7e4dba1c82 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
configs/spear320_defconfig +1 -1
index 9c66bcf424..50c3769b8a 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear320_nand_defconfig +1 -1
index 4326cdd603..c7a765952f 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear320_pnor_defconfig +1 -1
index 7177efea10..e54e04148d 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
configs/spear320_usbtty_defconfig +1 -1
index 3c10f3261e..341f096cef 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear320_usbtty_nand_defconfig +1 -1
index e363ea9662..3e759aa2b7 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear320_usbtty_pnor_defconfig +1 -1
index 2cf39b450c..d7e20f8c04 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
configs/spear600_defconfig +1 -1
index d2972c1f04..377fd18d1b 100644
@@ -25,7 +25,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear600_nand_defconfig +1 -1
index bc5473a8d3..4460ac0814 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/spear600_usbtty_defconfig +1 -1
index 5c7b0a8ab4..369c20158b 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
configs/spear600_usbtty_nand_defconfig +1 -1
index cbd25baa18..059ff1493e 100644
@@ -22,7 +22,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
configs/stmark2_defconfig +1 -1
index 48e851d4a4..15b7214c35 100644
@@ -21,7 +21,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:1m(u-boot),7m(kernel),-(rootfs)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_NET is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ISSI=y
 CONFIG_SPI_FLASH_MTD=y
configs/stout_defconfig +1 -1
index cbfc887045..ce00e56821 100644
@@ -62,7 +62,7 @@ CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_RENESAS_SDHI=y
 CONFIG_DM_MTD=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/suvd3_defconfig +1 -1
index e6b97b866d..4e1e54060b 100644
@@ -32,7 +32,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/tuge1_defconfig +1 -1
index e5826719b9..2d92a98f5f 100644
@@ -32,7 +32,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/tuxx1_defconfig +1 -1
index 204d3e4f68..8b32e0efb4 100644
@@ -32,7 +32,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
configs/vct_platinum_onenand_defconfig +1 -1
index ded3de0499..1d3d405d8e 100644
@@ -23,7 +23,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),128k(env),20m(kernel),-(r
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_ONENAND=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x00000000
 CONFIG_SMC911X_32_BIT=y
configs/vct_platinum_onenand_small_defconfig +1 -1
index 4afb03ee9e..50adb73129 100644
@@ -29,5 +29,5 @@ CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_NET is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SYS_NS16550=y
configs/vct_platinumavc_onenand_defconfig +1 -1
index e7e9c6cde1..692fae7036 100644
@@ -20,6 +20,6 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 # CONFIG_ISO_PARTITION is not set
 CONFIG_ENV_IS_IN_ONENAND=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SYS_NS16550=y
 # CONFIG_REGEX is not set
configs/vct_platinumavc_onenand_small_defconfig +1 -1
index 776472666c..bcf39bc1ed 100644
@@ -29,5 +29,5 @@ CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_NET is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SYS_NS16550=y
configs/vct_premium_onenand_defconfig +1 -1
index f1d01d9c90..2e87bdf358 100644
@@ -23,7 +23,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),128k(env),20m(kernel),-(r
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_ONENAND=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x00000000
 CONFIG_SMC911X_32_BIT=y
configs/vct_premium_onenand_small_defconfig +1 -1
index 751f881942..93fd4299d2 100644
@@ -29,5 +29,5 @@ CONFIG_CMD_UBI=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_ENV_IS_IN_ONENAND=y
 # CONFIG_NET is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_SYS_NS16550=y
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +1 -1
index 38871e5d6a..ebbda31f2e 100644
@@ -54,7 +54,7 @@ CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_DM_MMC=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ARASAN=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +1 -1
index b1e4f4b60d..4851c5fe5d 100644
@@ -53,7 +53,7 @@ CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ARASAN=y
 CONFIG_PHY_MARVELL=y
configs/zynq_cse_nand_defconfig +1 -1
index 77ccdb529d..575d9e3e86 100644
@@ -45,7 +45,7 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand"
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_MMC is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
configs/zynq_zc770_xm011_defconfig +1 -1
index 29f30c90d0..373725baa0 100644
@@ -36,7 +36,7 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ZYNQ=y
 CONFIG_DEBUG_UART_ZYNQ=y
configs/zynq_zc770_xm011_x16_defconfig +1 -1
index 7632a876d5..f7d68e9bef 100644
@@ -36,7 +36,7 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set
-CONFIG_MTD_DEVICE=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ZYNQ=y
 CONFIG_DEBUG_UART_ZYNQ=y
drivers/mtd/Kconfig +6 -6
index ecd62642eb..345046c2a6 100644
@@ -3,6 +3,12 @@ menu "MTD Support"
 config MTD_PARTITIONS
 	bool
 
+config MTD
+	bool "Enable MTD layer"
+	help
+	  Enable the MTD stack, necessary to interract with NAND, NOR,
+	  SPI-NOR, SPI-NAND, onenand, etc.
+
 config DM_MTD
 	bool "Enable Driver Model for MTD drivers"
 	depends on DM
@@ -16,12 +22,6 @@ config MTD_NOR_FLASH
 	help
 	  Enable support for parallel NOR flash.
 
-config MTD_DEVICE
-	bool "Enable MTD Device for NAND and ONENAND devices"
-	help
-	  Adds the MTD device infrastructure from the Linux kernel.
-	  Needed for mtdparts command support.
-
 config FLASH_CFI_DRIVER
 	bool "Enable CFI Flash driver"
 	help
drivers/mtd/Makefile +1 -1
index d490114147..486634b562 100644
@@ -3,7 +3,7 @@
 # (C) Copyright 2000-2007
 # Wolfgang Denk, DENX Software Engineering, wd at denx.de.
 
-ifneq (,$(findstring y,$(CONFIG_MTD_DEVICE)$(CONFIG_CMD_NAND)$(CONFIG_CMD_ONENAND)$(CONFIG_CMD_SF)$(CONFIG_CMD_MTD)))
+ifneq (,$(findstring y,$(CONFIG_MTD)$(CONFIG_CMD_NAND)$(CONFIG_CMD_ONENAND)$(CONFIG_CMD_SF)$(CONFIG_CMD_MTD)))
 obj-y += mtdcore.o mtd_uboot.o
 endif
 obj-$(CONFIG_DM_MTD) += mtd-uclass.o
drivers/mtd/nand/raw/nand.c +1 -1
index bca51ffbf2..026419e4e6 100644
@@ -59,7 +59,7 @@ int nand_register(int devnum, struct mtd_info *mtd)
 	sprintf(dev_name[devnum], "nand%d", devnum);
 	mtd->name = dev_name[devnum];
 
-#ifdef CONFIG_MTD_DEVICE
+#ifdef CONFIG_MTD
 	/*
 	 * Add MTD device so that we can reference it later
 	 * via the mtdcore infrastructure (e.g. ubi).
drivers/mtd/onenand/onenand_uboot.c +1 -1
index c15ec9df07..6893394e08 100644
@@ -43,7 +43,7 @@ void onenand_init(void)
 			puts("Flex-");
 		puts("OneNAND: ");
 
-#ifdef CONFIG_MTD_DEVICE
+#ifdef CONFIG_MTD
 		/*
 		 * Add MTD device so that we can reference it later
 		 * via the mtdcore infrastructure (e.g. ubi).
include/configs/mvebu_armada-37xx.h +1 -1
index cf9440f90c..f93ab0f830 100644
@@ -64,7 +64,7 @@
 #define CONFIG_SF_DEFAULT_SPEED		1000000
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_ENV_SPI_MODE		CONFIG_SF_DEFAULT_MODE
-#define CONFIG_MTD_DEVICE		/* needed for mtdparts commands */
+#define CONFIG_MTD			/* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS		/* required for UBI partition support */
 
 /* Environment in SPI NOR flash */
include/configs/socfpga_stratix10_socdk.h +1 -1
index e190b3d988..22e1dc84a1 100644
@@ -76,7 +76,7 @@
 #endif /* CONFIG_ENV_IS_IN_SPI_FLASH */
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD
 #define CONFIG_MTD_PARTITIONS
 #define MTDIDS_DEFAULT			"nor0=ff705000.spi.0"
 #endif /* CONFIG_SPL_BUILD */
Signature · 1 line
2.19.1
author maintainer
#9 lore raw

PATCH v3 5/28 mtd: ensure MTD is compiled when there is a NOR flash

In reply to Miquel Raynal

CONFIG_MTD must be enabled when there is a NOR flash selected.

---
 configs/3c120_defconfig                                | 1 +
 configs/B4420QDS_NAND_defconfig                        | 1 +
 configs/B4420QDS_SPIFLASH_defconfig                    | 1 +
 configs/B4420QDS_defconfig                             | 1 +
 configs/B4860QDS_NAND_defconfig                        | 1 +
 configs/B4860QDS_SECURE_BOOT_defconfig                 | 1 +
 configs/B4860QDS_SPIFLASH_defconfig                    | 1 +
 configs/B4860QDS_defconfig                             | 1 +
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig            | 1 +
 configs/BSC9131RDB_NAND_defconfig                      | 1 +
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig     | 2 ++
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig            | 1 +
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig     | 2 ++
 configs/BSC9132QDS_NAND_DDRCLK133_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_NAND_defconfig                        | 1 +
 configs/C29XPCIE_NOR_SECBOOT_defconfig                 | 1 +
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig            | 1 +
 configs/C29XPCIE_SPIFLASH_defconfig                    | 1 +
 configs/C29XPCIE_defconfig                             | 1 +
 configs/CHIP_pro_defconfig                             | 1 +
 configs/M5208EVBE_defconfig                            | 1 +
 configs/M52277EVB_defconfig                            | 1 +
 configs/M52277EVB_stmicro_defconfig                    | 1 +
 configs/M5235EVB_Flash32_defconfig                     | 1 +
 configs/M5235EVB_defconfig                             | 1 +
 configs/M5249EVB_defconfig                             | 1 +
 configs/M5253DEMO_defconfig                            | 1 +
 configs/M5272C3_defconfig                              | 1 +
 configs/M5275EVB_defconfig                             | 1 +
 configs/M5282EVB_defconfig                             | 1 +
 configs/M53017EVB_defconfig                            | 1 +
 configs/M5329AFEE_defconfig                            | 1 +
 configs/M5329BFEE_defconfig                            | 1 +
 configs/M5373EVB_defconfig                             | 1 +
 configs/M54451EVB_defconfig                            | 1 +
 configs/M54451EVB_stmicro_defconfig                    | 1 +
 configs/M54455EVB_a66_defconfig                        | 1 +
 configs/M54455EVB_defconfig                            | 1 +
 configs/M54455EVB_i66_defconfig                        | 1 +
 configs/M54455EVB_intel_defconfig                      | 1 +
 configs/M54455EVB_stm33_defconfig                      | 1 +
 configs/M5475AFE_defconfig                             | 1 +
 configs/M5475BFE_defconfig                             | 1 +
 configs/M5475CFE_defconfig                             | 1 +
 configs/M5475DFE_defconfig                             | 1 +
 configs/M5475EFE_defconfig                             | 1 +
 configs/M5475FFE_defconfig                             | 1 +
 configs/M5475GFE_defconfig                             | 1 +
 configs/M5485AFE_defconfig                             | 1 +
 configs/M5485BFE_defconfig                             | 1 +
 configs/M5485CFE_defconfig                             | 1 +
 configs/M5485DFE_defconfig                             | 1 +
 configs/M5485EFE_defconfig                             | 1 +
 configs/M5485FFE_defconfig                             | 1 +
 configs/M5485GFE_defconfig                             | 1 +
 configs/M5485HFE_defconfig                             | 1 +
 configs/MCR3000_defconfig                              | 1 +
 configs/MPC8308RDB_defconfig                           | 1 +
 configs/MPC8313ERDB_33_defconfig                       | 1 +
 configs/MPC8313ERDB_66_defconfig                       | 1 +
 configs/MPC8313ERDB_NAND_33_defconfig                  | 1 +
 configs/MPC8313ERDB_NAND_66_defconfig                  | 1 +
 configs/MPC8315ERDB_defconfig                          | 1 +
 configs/MPC8323ERDB_defconfig                          | 1 +
 configs/MPC832XEMDS_ATM_defconfig                      | 1 +
 configs/MPC832XEMDS_HOST_33_defconfig                  | 1 +
 configs/MPC832XEMDS_HOST_66_defconfig                  | 1 +
 configs/MPC832XEMDS_SLAVE_defconfig                    | 1 +
 configs/MPC832XEMDS_defconfig                          | 1 +
 configs/MPC8349EMDS_defconfig                          | 1 +
 configs/MPC8349ITXGP_defconfig                         | 1 +
 configs/MPC8349ITX_LOWBOOT_defconfig                   | 1 +
 configs/MPC8349ITX_defconfig                           | 1 +
 configs/MPC837XEMDS_HOST_defconfig                     | 1 +
 configs/MPC837XEMDS_defconfig                          | 1 +
 configs/MPC837XERDB_defconfig                          | 1 +
 configs/MPC8536DS_36BIT_defconfig                      | 1 +
 configs/MPC8536DS_SDCARD_defconfig                     | 1 +
 configs/MPC8536DS_SPIFLASH_defconfig                   | 1 +
 configs/MPC8536DS_defconfig                            | 1 +
 configs/MPC8541CDS_defconfig                           | 1 +
 configs/MPC8541CDS_legacy_defconfig                    | 1 +
 configs/MPC8544DS_defconfig                            | 1 +
 configs/MPC8548CDS_36BIT_defconfig                     | 1 +
 configs/MPC8548CDS_defconfig                           | 1 +
 configs/MPC8548CDS_legacy_defconfig                    | 1 +
 configs/MPC8555CDS_defconfig                           | 1 +
 configs/MPC8555CDS_legacy_defconfig                    | 1 +
 configs/MPC8568MDS_defconfig                           | 1 +
 configs/MPC8569MDS_ATM_defconfig                       | 1 +
 configs/MPC8569MDS_defconfig                           | 1 +
 configs/MPC8572DS_36BIT_defconfig                      | 1 +
 configs/MPC8572DS_defconfig                            | 1 +
 configs/MPC8610HPCD_defconfig                          | 1 +
 configs/MPC8641HPCN_36BIT_defconfig                    | 1 +
 configs/MPC8641HPCN_defconfig                          | 1 +
 configs/MigoR_defconfig                                | 1 +
 configs/Nintendo_NES_Classic_Edition_defconfig         | 1 +
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig       | 2 ++
 configs/P1010RDB-PA_36BIT_NAND_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             | 2 ++
 configs/P1010RDB-PA_NAND_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       | 2 ++
 configs/P1010RDB-PB_36BIT_NAND_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             | 2 ++
 configs/P1010RDB-PB_NAND_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/P1020MBG-PC_36BIT_SDCARD_defconfig             | 1 +
 configs/P1020MBG-PC_36BIT_defconfig                    | 1 +
 configs/P1020MBG-PC_SDCARD_defconfig                   | 1 +
 configs/P1020MBG-PC_defconfig                          | 1 +
 configs/P1020RDB-PC_36BIT_NAND_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_NAND_defconfig                     | 1 +
 configs/P1020RDB-PC_SDCARD_defconfig                   | 1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig                 | 1 +
 configs/P1020RDB-PC_defconfig                          | 1 +
 configs/P1020RDB-PD_NAND_defconfig                     | 1 +
 configs/P1020RDB-PD_SDCARD_defconfig                   | 1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig                 | 1 +
 configs/P1020RDB-PD_defconfig                          | 1 +
 configs/P1020UTM-PC_36BIT_SDCARD_defconfig             | 1 +
 configs/P1020UTM-PC_36BIT_defconfig                    | 1 +
 configs/P1020UTM-PC_SDCARD_defconfig                   | 1 +
 configs/P1020UTM-PC_defconfig                          | 1 +
 configs/P1021RDB-PC_36BIT_NAND_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_NAND_defconfig                     | 1 +
 configs/P1021RDB-PC_SDCARD_defconfig                   | 1 +
 configs/P1021RDB-PC_SPIFLASH_defconfig                 | 1 +
 configs/P1021RDB-PC_defconfig                          | 1 +
 configs/P1022DS_36BIT_NAND_defconfig                   | 1 +
 configs/P1022DS_36BIT_SDCARD_defconfig                 | 1 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig               | 1 +
 configs/P1022DS_36BIT_defconfig                        | 1 +
 configs/P1022DS_NAND_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_NAND_defconfig                        | 1 +
 configs/P1024RDB_SDCARD_defconfig                      | 1 +
 configs/P1024RDB_SPIFLASH_defconfig                    | 1 +
 configs/P1024RDB_defconfig                             | 1 +
 configs/P1025RDB_36BIT_defconfig                       | 1 +
 configs/P1025RDB_NAND_defconfig                        | 1 +
 configs/P1025RDB_SDCARD_defconfig                      | 1 +
 configs/P1025RDB_SPIFLASH_defconfig                    | 1 +
 configs/P1025RDB_defconfig                             | 1 +
 configs/P2020RDB-PC_36BIT_NAND_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_NAND_defconfig                     | 1 +
 configs/P2020RDB-PC_SDCARD_defconfig                   | 1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig                 | 1 +
 configs/P2020RDB-PC_defconfig                          | 1 +
 configs/P2041RDB_NAND_defconfig                        | 1 +
 configs/P2041RDB_SDCARD_defconfig                      | 1 +
 configs/P2041RDB_SECURE_BOOT_defconfig                 | 1 +
 configs/P2041RDB_SPIFLASH_defconfig                    | 1 +
 configs/P2041RDB_defconfig                             | 1 +
 configs/P3041DS_NAND_SECURE_BOOT_defconfig             | 1 +
 configs/P3041DS_NAND_defconfig                         | 1 +
 configs/P3041DS_SDCARD_defconfig                       | 1 +
 configs/P3041DS_SECURE_BOOT_defconfig                  | 1 +
 configs/P3041DS_SPIFLASH_defconfig                     | 1 +
 configs/P3041DS_defconfig                              | 1 +
 configs/P4080DS_SDCARD_defconfig                       | 1 +
 configs/P4080DS_SECURE_BOOT_defconfig                  | 1 +
 configs/P4080DS_SPIFLASH_defconfig                     | 1 +
 configs/P4080DS_defconfig                              | 1 +
 configs/P5020DS_NAND_SECURE_BOOT_defconfig             | 1 +
 configs/P5020DS_NAND_defconfig                         | 1 +
 configs/P5020DS_SDCARD_defconfig                       | 1 +
 configs/P5020DS_SECURE_BOOT_defconfig                  | 1 +
 configs/P5020DS_SPIFLASH_defconfig                     | 1 +
 configs/P5020DS_defconfig                              | 1 +
 configs/P5040DS_NAND_SECURE_BOOT_defconfig             | 1 +
 configs/P5040DS_NAND_defconfig                         | 1 +
 configs/P5040DS_SDCARD_defconfig                       | 1 +
 configs/P5040DS_SECURE_BOOT_defconfig                  | 1 +
 configs/P5040DS_SPIFLASH_defconfig                     | 1 +
 configs/P5040DS_defconfig                              | 1 +
 configs/T1023RDB_NAND_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_NAND_defconfig                        | 1 +
 configs/T1024QDS_SDCARD_defconfig                      | 1 +
 configs/T1024QDS_SECURE_BOOT_defconfig                 | 1 +
 configs/T1024QDS_SPIFLASH_defconfig                    | 1 +
 configs/T1024QDS_defconfig                             | 1 +
 configs/T1024RDB_NAND_defconfig                        | 1 +
 configs/T1024RDB_SDCARD_defconfig                      | 1 +
 configs/T1024RDB_SECURE_BOOT_defconfig                 | 1 +
 configs/T1024RDB_SPIFLASH_defconfig                    | 1 +
 configs/T1024RDB_defconfig                             | 1 +
 configs/T1040D4RDB_NAND_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_NAND_defconfig                        | 1 +
 configs/T1040RDB_SDCARD_defconfig                      | 1 +
 configs/T1040RDB_SECURE_BOOT_defconfig                 | 1 +
 configs/T1040RDB_SPIFLASH_defconfig                    | 1 +
 configs/T1040RDB_defconfig                             | 1 +
 configs/T1042D4RDB_NAND_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_NAND_SECURE_BOOT_defconfig         | 1 +
 configs/T1042RDB_PI_NAND_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_NAND_defconfig                        | 1 +
 configs/T2080QDS_SDCARD_defconfig                      | 1 +
 configs/T2080QDS_SECURE_BOOT_defconfig                 | 1 +
 configs/T2080QDS_SPIFLASH_defconfig                    | 1 +
 configs/T2080QDS_defconfig                             | 1 +
 configs/T2080RDB_NAND_defconfig                        | 1 +
 configs/T2080RDB_SDCARD_defconfig                      | 1 +
 configs/T2080RDB_SECURE_BOOT_defconfig                 | 1 +
 configs/T2080RDB_SPIFLASH_defconfig                    | 1 +
 configs/T2080RDB_defconfig                             | 1 +
 configs/T2081QDS_NAND_defconfig                        | 1 +
 configs/T2081QDS_SDCARD_defconfig                      | 1 +
 configs/T2081QDS_SPIFLASH_defconfig                    | 1 +
 configs/T2081QDS_defconfig                             | 1 +
 configs/T4160QDS_NAND_defconfig                        | 1 +
 configs/T4160QDS_SDCARD_defconfig                      | 1 +
 configs/T4160QDS_SECURE_BOOT_defconfig                 | 1 +
 configs/T4160QDS_defconfig                             | 1 +
 configs/T4160RDB_defconfig                             | 1 +
 configs/T4240QDS_NAND_defconfig                        | 1 +
 configs/T4240QDS_SDCARD_defconfig                      | 1 +
 configs/T4240QDS_SECURE_BOOT_defconfig                 | 1 +
 configs/T4240QDS_defconfig                             | 1 +
 configs/T4240RDB_SDCARD_defconfig                      | 1 +
 configs/T4240RDB_defconfig                             | 1 +
 configs/UCP1020_SPIFLASH_defconfig                     | 1 +
 configs/UCP1020_defconfig                              | 1 +
 configs/adp-ae3xx_defconfig                            | 1 +
 configs/adp-ag101p_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/amcore_defconfig                               | 1 +
 configs/ap325rxa_defconfig                             | 1 +
 configs/ap_sh4a_4a_defconfig                           | 1 +
 configs/apf27_defconfig                                | 1 +
 configs/apx4devkit_defconfig                           | 1 +
 configs/aristainetos2_defconfig                        | 1 +
 configs/aristainetos2b_defconfig                       | 1 +
 configs/aristainetos_defconfig                         | 1 +
 configs/astro_mcf5373l_defconfig                       | 1 +
 configs/at91rm9200ek_defconfig                         | 1 +
 configs/at91rm9200ek_ram_defconfig                     | 1 +
 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/ax25-ae350_defconfig                           | 1 +
 configs/axm_defconfig                                  | 1 +
 configs/bcm11130_nand_defconfig                        | 1 +
 configs/bg0900_defconfig                               | 1 +
 configs/blanche_defconfig                              | 1 +
 configs/boston32r2_defconfig                           | 1 +
 configs/boston32r2el_defconfig                         | 1 +
 configs/boston32r6_defconfig                           | 1 +
 configs/boston32r6el_defconfig                         | 1 +
 configs/boston64r2_defconfig                           | 1 +
 configs/boston64r2el_defconfig                         | 1 +
 configs/boston64r6_defconfig                           | 1 +
 configs/boston64r6el_defconfig                         | 1 +
 configs/brppt1_nand_defconfig                          | 1 +
 configs/caddy2_defconfig                               | 1 +
 configs/cairo_defconfig                                | 1 +
 configs/calimain_defconfig                             | 1 +
 configs/chiliboard_defconfig                           | 1 +
 configs/cm_fx6_defconfig                               | 1 +
 configs/cm_t335_defconfig                              | 1 +
 configs/cm_t3517_defconfig                             | 1 +
 configs/cm_t35_defconfig                               | 1 +
 configs/cm_t43_defconfig                               | 1 +
 configs/cobra5272_defconfig                            | 1 +
 configs/colibri_imx7_defconfig                         | 1 +
 configs/colibri_pxa270_defconfig                       | 1 +
 configs/colibri_vf_defconfig                           | 1 +
 configs/comtrend_ct5361_ram_defconfig                  | 1 +
 configs/comtrend_wap5813n_ram_defconfig                | 1 +
 configs/corvus_defconfig                               | 1 +
 configs/da850evm_direct_nor_defconfig                  | 1 +
 configs/da850evm_nand_defconfig                        | 1 +
 configs/db-88f6820-amc_defconfig                       | 1 +
 configs/db-mv784mp-gp_defconfig                        | 1 +
 configs/devkit3250_defconfig                           | 1 +
 configs/devkit8000_defconfig                           | 1 +
 configs/draco_defconfig                                | 1 +
 configs/ea20_defconfig                                 | 1 +
 configs/eb_cpu5282_defconfig                           | 1 +
 configs/eb_cpu5282_internal_defconfig                  | 1 +
 configs/eco5pk_defconfig                               | 1 +
 configs/ecovec_defconfig                               | 1 +
 configs/edb9315a_defconfig                             | 1 +
 configs/edminiv2_defconfig                             | 1 +
 configs/espt_defconfig                                 | 1 +
 configs/etamin_defconfig                               | 1 +
 configs/ethernut5_defconfig                            | 1 +
 configs/flea3_defconfig                                | 1 +
 configs/gurnard_defconfig                              | 1 +
 configs/gwventana_nand_defconfig                       | 1 +
 configs/hrcon_defconfig                                | 1 +
 configs/hrcon_dh_defconfig                             | 1 +
 configs/huawei_hg556a_ram_defconfig                    | 1 +
 configs/ids8313_defconfig                              | 3 +++
 configs/igep0032_defconfig                             | 1 +
 configs/igep00x0_defconfig                             | 1 +
 configs/imx6dl_icore_nand_defconfig                    | 1 +
 configs/imx6q_icore_nand_defconfig                     | 1 +
 configs/imx6q_logic_defconfig                          | 1 +
 configs/imx6qdl_icore_mmc_defconfig                    | 1 +
 configs/imx6qdl_icore_nand_defconfig                   | 1 +
 configs/imx6ul_geam_nand_defconfig                     | 1 +
 configs/imx6ul_isiot_nand_defconfig                    | 1 +
 configs/integratorap_cm720t_defconfig                  | 1 +
 configs/integratorap_cm920t_defconfig                  | 1 +
 configs/integratorap_cm926ejs_defconfig                | 1 +
 configs/integratorap_cm946es_defconfig                 | 1 +
 configs/integratorcp_cm1136_defconfig                  | 1 +
 configs/integratorcp_cm920t_defconfig                  | 1 +
 configs/integratorcp_cm926ejs_defconfig                | 1 +
 configs/integratorcp_cm946es_defconfig                 | 1 +
 configs/ipam390_defconfig                              | 1 +
 configs/k2e_evm_defconfig                              | 1 +
 configs/k2e_hs_evm_defconfig                           | 1 +
 configs/k2g_evm_defconfig                              | 1 +
 configs/k2g_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/kmcoge5ne_defconfig                            | 1 +
 configs/kmtegr1_defconfig                              | 1 +
 configs/kzm9g_defconfig                                | 1 +
 configs/ls1021aqds_ddr4_nor_defconfig                  | 1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig           | 1 +
 configs/ls1021aqds_nand_defconfig                      | 2 ++
 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/ls1021atwr_nor_SECURE_BOOT_defconfig           | 1 +
 configs/ls1021atwr_nor_defconfig                       | 1 +
 configs/ls1021atwr_nor_lpuart_defconfig                | 1 +
 configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig    | 1 +
 configs/ls1021atwr_sdcard_ifc_defconfig                | 1 +
 configs/ls1043aqds_defconfig                           | 1 +
 configs/ls1043aqds_lpuart_defconfig                    | 1 +
 configs/ls1043aqds_nand_defconfig                      | 2 ++
 configs/ls1043aqds_nor_ddr3_defconfig                  | 1 +
 configs/ls1043aqds_sdcard_ifc_defconfig                | 1 +
 configs/ls1043ardb_SECURE_BOOT_defconfig               | 1 +
 configs/ls1043ardb_defconfig                           | 1 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig          | 2 ++
 configs/ls1043ardb_nand_defconfig                      | 2 ++
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig        | 1 +
 configs/ls1043ardb_sdcard_defconfig                    | 1 +
 configs/ls1046aqds_SECURE_BOOT_defconfig               | 1 +
 configs/ls1046aqds_defconfig                           | 1 +
 configs/ls1046aqds_lpuart_defconfig                    | 1 +
 configs/ls1046aqds_nand_defconfig                      | 2 ++
 configs/ls1046aqds_sdcard_ifc_defconfig                | 1 +
 configs/ls1088aqds_defconfig                           | 1 +
 configs/ls1088aqds_sdcard_ifc_defconfig                | 1 +
 configs/ls2080a_simu_defconfig                         | 1 +
 configs/ls2080aqds_SECURE_BOOT_defconfig               | 1 +
 configs/ls2080aqds_defconfig                           | 1 +
 configs/ls2080ardb_SECURE_BOOT_defconfig               | 1 +
 configs/ls2080ardb_defconfig                           | 1 +
 configs/ls2080ardb_nand_defconfig                      | 2 ++
 configs/m53menlo_defconfig                             | 1 +
 configs/malta64_defconfig                              | 1 +
 configs/malta64el_defconfig                            | 1 +
 configs/malta_defconfig                                | 1 +
 configs/maltael_defconfig                              | 1 +
 configs/mccmon6_nor_defconfig                          | 1 +
 configs/mccmon6_sd_defconfig                           | 1 +
 configs/mcx_defconfig                                  | 1 +
 configs/meesc_defconfig                                | 1 +
 configs/mpc8308_p1m_defconfig                          | 1 +
 configs/mpr2_defconfig                                 | 1 +
 configs/ms7720se_defconfig                             | 1 +
 configs/ms7722se_defconfig                             | 1 +
 configs/ms7750se_defconfig                             | 1 +
 configs/mt_ventoux_defconfig                           | 1 +
 configs/mx28evk_auart_console_defconfig                | 1 +
 configs/mx28evk_defconfig                              | 1 +
 configs/mx28evk_nand_defconfig                         | 1 +
 configs/mx28evk_spi_defconfig                          | 1 +
 configs/mx31pdk_defconfig                              | 1 +
 configs/mx35pdk_defconfig                              | 1 +
 configs/mx53ard_defconfig                              | 1 +
 configs/mx6sabreauto_defconfig                         | 1 +
 configs/mx6sxsabreauto_defconfig                       | 1 +
 configs/omap35_logic_defconfig                         | 1 +
 configs/omap35_logic_somlv_defconfig                   | 1 +
 configs/omap3_beagle_defconfig                         | 1 +
 configs/omap3_evm_defconfig                            | 1 +
 configs/omap3_ha_defconfig                             | 1 +
 configs/omap3_logic_defconfig                          | 1 +
 configs/omap3_logic_somlv_defconfig                    | 1 +
 configs/omap3_overo_defconfig                          | 1 +
 configs/omap3_pandora_defconfig                        | 1 +
 configs/omap3_zoom1_defconfig                          | 1 +
 configs/omapl138_lcdk_defconfig                        | 1 +
 configs/pengwyn_defconfig                              | 1 +
 configs/platinum_picon_defconfig                       | 1 +
 configs/platinum_titanium_defconfig                    | 1 +
 configs/pm9261_defconfig                               | 1 +
 configs/pm9263_defconfig                               | 1 +
 configs/pm9g45_defconfig                               | 1 +
 configs/pxm2_defconfig                                 | 1 +
 configs/qemu_mips64_defconfig                          | 1 +
 configs/qemu_mips64el_defconfig                        | 1 +
 configs/qemu_mips_defconfig                            | 1 +
 configs/qemu_mipsel_defconfig                          | 1 +
 configs/r0p7734_defconfig                              | 1 +
 configs/r2dplus_defconfig                              | 1 +
 configs/r7780mp_defconfig                              | 1 +
 configs/r8a77995_draak_defconfig                       | 1 +
 configs/rastaban_defconfig                             | 1 +
 configs/rsk7203_defconfig                              | 1 +
 configs/rsk7264_defconfig                              | 1 +
 configs/rsk7269_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_nandflash_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/sbc8349_PCI_33_defconfig                       | 1 +
 configs/sbc8349_PCI_66_defconfig                       | 1 +
 configs/sbc8349_defconfig                              | 1 +
 configs/sbc8548_PCI_33_PCIE_defconfig                  | 1 +
 configs/sbc8548_PCI_33_defconfig                       | 1 +
 configs/sbc8548_PCI_66_PCIE_defconfig                  | 1 +
 configs/sbc8548_PCI_66_defconfig                       | 1 +
 configs/sbc8548_defconfig                              | 1 +
 configs/sbc8641d_defconfig                             | 1 +
 configs/sfr_nb4-ser_ram_defconfig                      | 1 +
 configs/sh7763rdp_defconfig                            | 1 +
 configs/sh7785lcr_32bit_defconfig                      | 1 +
 configs/sh7785lcr_defconfig                            | 1 +
 configs/shmin_defconfig                                | 1 +
 configs/smartweb_defconfig                             | 1 +
 configs/snapper9260_defconfig                          | 1 +
 configs/snapper9g20_defconfig                          | 1 +
 configs/socrates_defconfig                             | 1 +
 configs/stm32f429-discovery_defconfig                  | 1 +
 configs/stm32f429-evaluation_defconfig                 | 1 +
 configs/stm32f469-discovery_defconfig                  | 1 +
 configs/stm32f746-disco_defconfig                      | 1 +
 configs/strider_con_defconfig                          | 1 +
 configs/strider_con_dp_defconfig                       | 1 +
 configs/strider_cpu_defconfig                          | 1 +
 configs/strider_cpu_dp_defconfig                       | 1 +
 configs/tao3530_defconfig                              | 1 +
 configs/taurus_defconfig                               | 1 +
 configs/thuban_defconfig                               | 1 +
 configs/ti816x_evm_defconfig                           | 1 +
 configs/titanium_defconfig                             | 1 +
 configs/tricorder_defconfig                            | 1 +
 configs/tricorder_flash_defconfig                      | 1 +
 configs/twister_defconfig                              | 1 +
 configs/uniphier_ld4_sld8_defconfig                    | 1 +
 configs/uniphier_v7_defconfig                          | 1 +
 configs/uniphier_v8_defconfig                          | 1 +
 configs/usb_a9263_dataflash_defconfig                  | 1 +
 configs/vct_platinum_defconfig                         | 1 +
 configs/vct_platinum_small_defconfig                   | 1 +
 configs/vct_platinumavc_defconfig                      | 1 +
 configs/vct_platinumavc_small_defconfig                | 1 +
 configs/vct_premium_defconfig                          | 1 +
 configs/vct_premium_small_defconfig                    | 1 +
 configs/ve8313_defconfig                               | 1 +
 configs/vexpress_aemv8a_dram_defconfig                 | 1 +
 configs/vexpress_aemv8a_juno_defconfig                 | 1 +
 configs/vexpress_aemv8a_semi_defconfig                 | 1 +
 configs/vexpress_ca15_tc2_defconfig                    | 1 +
 configs/vexpress_ca5x2_defconfig                       | 1 +
 configs/vexpress_ca9x4_defconfig                       | 1 +
 configs/vme8349_defconfig                              | 1 +
 configs/wb45n_defconfig                                | 1 +
 configs/wb50n_defconfig                                | 1 +
 configs/woodburn_defconfig                             | 1 +
 configs/woodburn_sd_defconfig                          | 1 +
 configs/x600_defconfig                                 | 1 +
 configs/xilinx_zynqmp_mini_nand_defconfig              | 1 +
 configs/xpedite517x_defconfig                          | 1 +
 configs/xpedite520x_defconfig                          | 1 +
 configs/xpedite537x_defconfig                          | 1 +
 configs/xpedite550x_defconfig                          | 1 +
 configs/xtfpga_defconfig                               | 1 +
 configs/zipitz2_defconfig                              | 1 +
 configs/zmx25_defconfig                                | 1 +
 configs/zynq_cse_nor_defconfig                         | 1 +
 configs/zynq_zc770_xm012_defconfig                     | 1 +
 599 files changed, 613 insertions(+)
configs/3c120_defconfig +1 -0
index a6f369603a..369f6f041b 100644
@@ -23,6 +23,7 @@ CONFIG_DM_GPIO=y
 CONFIG_ALTERA_PIO=y
 CONFIG_MISC=y
 CONFIG_ALTERA_SYSID=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/B4420QDS_NAND_defconfig +1 -0
index 5739f1e776..90dbfaec52 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/B4420QDS_SPIFLASH_defconfig +1 -0
index 8e3b0a7e7d..8d586e484c 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/B4420QDS_defconfig +1 -0
index 29b351a328..c09e71bf1f 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/B4860QDS_NAND_defconfig +1 -0
index 2bbb5a2194..b505446441 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/B4860QDS_SECURE_BOOT_defconfig +1 -0
index 26ad411d44..eac458d8e3 100644
@@ -25,6 +25,7 @@ CONFIG_MP=y
 CONFIG_CMD_EXT2=y
 CONFIG_DM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/B4860QDS_SPIFLASH_defconfig +1 -0
index 612cb7ed92..73aae3e137 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/B4860QDS_defconfig +1 -0
index 3232530afa..9a79a9ffbc 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9131RDB_NAND_SYSCLK100_defconfig +1 -0
index 96fb6add3f..7ef8d765f8 100644
@@ -30,6 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(uboot),8m(kernel),512k(dtb),
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/BSC9131RDB_NAND_defconfig +1 -0
index bf6c2572eb..a6acd14af2 100644
@@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(uboot),8m(kernel),512k(dtb),
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig +2 -0
index 1e2686174e..cc90db3230 100644
@@ -29,6 +29,8 @@ CONFIG_MTDIDS_DEFAULT="nor0=88000000.nor,nand0=ff800000.flash,"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(uboot);ff800000.flash:1m(uboot),8m(kernel),512k(dtb),-(fs)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_NAND_DDRCLK100_defconfig +1 -0
index a18953de09..8c31704766 100644
@@ -32,6 +32,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig +2 -0
index 005087e6dd..773b69a24f 100644
@@ -29,6 +29,8 @@ CONFIG_MTDIDS_DEFAULT="nor0=88000000.nor,nand0=ff800000.flash,"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(uboot);ff800000.flash:1m(uboot),8m(kernel),512k(dtb),-(fs)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_NAND_DDRCLK133_defconfig +1 -0
index 8f785f262d..4ad72d85a4 100644
@@ -32,6 +32,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig +1 -0
index d88b6d49e2..3bfc4e8f14 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=88000000.nor,nand0=ff800000.flash,"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(uboot);ff800000.flash:1m(uboot),8m(kernel),512k(dtb),-(fs)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_NOR_DDRCLK100_defconfig +1 -0
index 09751edebc..3916d2d7ad 100644
@@ -28,6 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig +1 -0
index 94d099b6cd..bf5a7d1354 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=88000000.nor,nand0=ff800000.flash,"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(uboot);ff800000.flash:1m(uboot),8m(kernel),512k(dtb),-(fs)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_NOR_DDRCLK133_defconfig +1 -0
index 7b4ecee5c5..39d76fd3b1 100644
@@ -28,6 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig +1 -0
index 4a53c72467..4c577de423 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=88000000.nor,nand0=ff800000.flash,"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(uboot);ff800000.flash:1m(uboot),8m(kernel),512k(dtb),-(fs)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig +1 -0
index ea2e04010d..eafa807f71 100644
@@ -28,6 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig +1 -0
index fc41568c97..75c523a930 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=88000000.nor,nand0=ff800000.flash,"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(uboot);ff800000.flash:1m(uboot),8m(kernel),512k(dtb),-(fs)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig +1 -0
index 622f5ca8c8..fa8e7b075f 100644
@@ -28,6 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig +1 -0
index 5eca1f1580..f6e44c0573 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=88000000.nor,nand0=ff800000.flash,"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(uboot);ff800000.flash:1m(uboot),8m(kernel),512k(dtb),-(fs)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig +1 -0
index b6f2e69af3..db11329e1d 100644
@@ -28,6 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig +1 -0
index fc89a74b0a..96bccb0d46 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=88000000.nor,nand0=ff800000.flash,"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(uboot);ff800000.flash:1m(uboot),8m(kernel),512k(dtb),-(fs)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig +1 -0
index 18f40bb188..bce83d603c 100644
@@ -28,6 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=88000000.nor:256k(dtb),7m(kernel),55m(fs),1m(u
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/C29XPCIE_NAND_defconfig +1 -0
index cfdd0e707e..cdc8277284 100644
@@ -34,6 +34,7 @@ CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/C29XPCIE_NOR_SECBOOT_defconfig +1 -0
index efc8dd90b7..0acfb4c056 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_PING=y
 CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig +1 -0
index dcf793b734..ffaf19d5a4 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_PING=y
 CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/C29XPCIE_SPIFLASH_defconfig +1 -0
index aaecadbecc..51895594ec 100644
@@ -22,6 +22,7 @@ CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/C29XPCIE_defconfig +1 -0
index a487dcae75..b48811514b 100644
@@ -21,6 +21,7 @@ CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/CHIP_pro_defconfig +1 -0
index d5d7877514..7f8bd0f00e 100644
@@ -15,6 +15,7 @@ CONFIG_ENV_IS_IN_UBI=y
 CONFIG_ENV_UBI_PART="UBI"
 CONFIG_ENV_UBI_VOLUME="uboot-env"
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x40000
 CONFIG_SYS_NAND_PAGE_SIZE=0x1000
configs/M5208EVBE_defconfig +1 -0
index 934cda4aa6..d6aa26aa60 100644
@@ -12,6 +12,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M52277EVB_defconfig +1 -0
index efa5e7102b..3c8815cef4 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_NET is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M52277EVB_stmicro_defconfig +1 -0
index 3628729a48..8c7a3c0fc3 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_NET is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5235EVB_Flash32_defconfig +1 -0
index fff57436c7..31ba819349 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M5235EVB_defconfig +1 -0
index 07e0f4f50b..3822adb486 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M5249EVB_defconfig +1 -0
index 908f6a1ab1..e6172e4809 100644
@@ -10,6 +10,7 @@ CONFIG_LOOPW=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_CACHE=y
 # CONFIG_NET is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M5253DEMO_defconfig +1 -0
index 4685c4eb83..7661f50077 100644
@@ -13,4 +13,5 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
configs/M5272C3_defconfig +1 -0
index 85283d40e4..d0fbb6f48f 100644
@@ -13,6 +13,7 @@ CONFIG_CMD_IMLS=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M5275EVB_defconfig +1 -0
index 5ff262425c..d96c755baf 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/M5282EVB_defconfig +1 -0
index 289922ba33..6ce7c967aa 100644
@@ -13,6 +13,7 @@ CONFIG_CMD_IMLS=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M53017EVB_defconfig +1 -0
index 0b1073af61..4a92e4ec26 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5329AFEE_defconfig +1 -0
index c6dff0e27b..1be4af7617 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M5329BFEE_defconfig +1 -0
index 56dba26f6f..d834dabbff 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M5373EVB_defconfig +1 -0
index 39823200ee..5fa76291bc 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/M54451EVB_defconfig +1 -0
index 8448b6cfbf..ef4c52cb0e 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M54451EVB_stmicro_defconfig +1 -0
index ce5f65666c..a0a16a83a7 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M54455EVB_a66_defconfig +1 -0
index f9be1c3773..74a4169461 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M54455EVB_defconfig +1 -0
index abb69a966a..fa214b9310 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M54455EVB_i66_defconfig +1 -0
index 6050df5d51..f44a6699c0 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M54455EVB_intel_defconfig +1 -0
index 686c00e318..b8b62559d9 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M54455EVB_stm33_defconfig +1 -0
index fc19de50d1..ede14c5065 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5475AFE_defconfig +1 -0
index b0296acff0..6aafa4c38b 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5475BFE_defconfig +1 -0
index 7fc61bd249..32305731a1 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5475CFE_defconfig +1 -0
index 22d1074521..f59d6e5696 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5475DFE_defconfig +1 -0
index ee8c2abfba..50d60f8da9 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5475EFE_defconfig +1 -0
index 939e56b28e..9bf80d832b 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5475FFE_defconfig +1 -0
index 1fef8fffd6..3b69495915 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5475GFE_defconfig +1 -0
index d78cafffed..f142c01e9e 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5485AFE_defconfig +1 -0
index 5cda25a99a..347b3f3a36 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5485BFE_defconfig +1 -0
index 7cd4a5355b..5d2a34cafa 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5485CFE_defconfig +1 -0
index ff5e8ef043..e5102b01ab 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5485DFE_defconfig +1 -0
index c4dd6c3ae9..ceb86ec696 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5485EFE_defconfig +1 -0
index 4e84828f48..da2bcdd0db 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5485FFE_defconfig +1 -0
index f6264e8c5e..4c35396dc3 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5485GFE_defconfig +1 -0
index 9a589e0ae2..aed979389e 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/M5485HFE_defconfig +1 -0
index edc50c8f53..2f2f3c5234 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/MCR3000_defconfig +1 -0
index 29a60e3a98..115827a574 100644
@@ -65,6 +65,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8308RDB_defconfig +1 -0
index 06657b2bfe..2224a0d3fa 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC8313ERDB_33_defconfig +1 -0
index 3bb680c217..83919adb32 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=e2800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=e2800000.flash:512k(uboot),128k(env),6m at 1m(kernel),-(fs)"
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/MPC8313ERDB_66_defconfig +1 -0
index bb26a9e381..0911acb099 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=e2800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=e2800000.flash:512k(uboot),128k(env),6m at 1m(kernel),-(fs)"
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/MPC8313ERDB_NAND_33_defconfig +1 -0
index 1c62c1878e..a29d4b1708 100644
@@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e2800000.flash:512k(uboot),128k(env),6m at 1m(ker
 # CONFIG_ENV_IS_IN_FLASH is not set
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/MPC8313ERDB_NAND_66_defconfig +1 -0
index 4c64eacfd8..2092495a11 100644
@@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=e2800000.flash:512k(uboot),128k(env),6m at 1m(ker
 # CONFIG_ENV_IS_IN_FLASH is not set
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/MPC8315ERDB_defconfig +1 -0
index b45369e626..2a8a11e48a 100644
@@ -23,6 +23,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=e0600000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=e0600000.flash:512k(uboot),128k(env),6m at 1m(kernel),-(fs)"
 CONFIG_FSL_SATA=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC8323ERDB_defconfig +1 -0
index a1227bfdad..9e49dd020b 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC832XEMDS_ATM_defconfig +1 -0
index e4c44d90a9..e319b2b7d8 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC832XEMDS_HOST_33_defconfig +1 -0
index 2b03a56245..da564ea444 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC832XEMDS_HOST_66_defconfig +1 -0
index 4aa34dc331..c571c3c472 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC832XEMDS_SLAVE_defconfig +1 -0
index 332088934a..8466312e6f 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC832XEMDS_defconfig +1 -0
index f3ec967b3c..79b7d605a6 100644
@@ -13,6 +13,7 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC8349EMDS_defconfig +1 -0
index 41a1d9609b..614d0c99da 100644
@@ -13,6 +13,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC8349ITXGP_defconfig +1 -0
index 95d807bac0..312d58001e 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC8349ITX_LOWBOOT_defconfig +1 -0
index 5166723548..9340dab9d7 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_SATA_SIL3114=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC8349ITX_defconfig +1 -0
index 55e593c115..0c8c823491 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_SATA_SIL3114=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC837XEMDS_HOST_defconfig +1 -0
index 4ac95735b2..d6667ff4f4 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC837XEMDS_defconfig +1 -0
index 9ee8c7d880..cd08f12ed3 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/MPC837XERDB_defconfig +1 -0
index 45b68e9092..cf8d20172b 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_FSL_SATA=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/MPC8536DS_36BIT_defconfig +1 -0
index 654a5175d2..3650dee513 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_FSL_DDR2=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8536DS_SDCARD_defconfig +1 -0
index eebc00337e..e8a4dafc27 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_FSL_DDR2=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8536DS_SPIFLASH_defconfig +1 -0
index c376abe5f1..ebc7045083 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_FSL_DDR2=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8536DS_defconfig +1 -0
index 7501488117..3f2a722f1f 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_FSL_DDR2=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8541CDS_defconfig +1 -0
index 3307dbbb48..b08253b0fe 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8541CDS_legacy_defconfig +1 -0
index bef89171ea..ad46749e5c 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8544DS_defconfig +1 -0
index a77f8f14cd..3bebf8ff81 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8548CDS_36BIT_defconfig +1 -0
index 672dc78211..cdab4dd6a0 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8548CDS_defconfig +1 -0
index 09726d2830..e71f6df635 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8548CDS_legacy_defconfig +1 -0
index 4a2d11f1b6..78a6f0c833 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8555CDS_defconfig +1 -0
index f5fcd81f11..83a4a6453f 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8555CDS_legacy_defconfig +1 -0
index 7887bccb64..39748dfe6a 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8568MDS_defconfig +1 -0
index f3544a2557..de47bd41d7 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8569MDS_ATM_defconfig +1 -0
index 5140ae9ecd..3eb6a66114 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8569MDS_defconfig +1 -0
index a778eaeeb8..ab124b03f0 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8572DS_36BIT_defconfig +1 -0
index 3f02171737..359d649865 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_SCSI_AHCI=y
 CONFIG_SYS_FSL_DDR2=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8572DS_defconfig +1 -0
index acb4af4b3d..fc9096f633 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_SCSI_AHCI=y
 CONFIG_SYS_FSL_DDR2=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8610HPCD_defconfig +1 -0
index cfdfa9011f..c1444fe7cb 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8641HPCN_36BIT_defconfig +1 -0
index 4b924c08b3..e77abf3439 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MPC8641HPCN_defconfig +1 -0
index 52fba9750d..a1fef50653 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/MigoR_defconfig +1 -0
index b261a92e03..754fc55513 100644
@@ -23,6 +23,7 @@ CONFIG_CMD_SDRAM=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/Nintendo_NES_Classic_Edition_defconfig +1 -0
index 12fd157fe0..0d3b1f9536 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_MTDPARTS=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-r16-nintendo-nes-classic-edition"
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
 CONFIG_SYS_NAND_PAGE_SIZE=0x800
configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig +2 -0
index 568d886161..b8819ff563 100644
@@ -29,6 +29,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_36BIT_NAND_defconfig +1 -0
index a8763024ea..56b9974857 100644
@@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig +1 -0
index e565b414a0..4ff6765332 100644
@@ -28,6 +28,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_36BIT_NOR_defconfig +1 -0
index 1723d8dc55..8d2c5e81b7 100644
@@ -27,6 +27,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_36BIT_SDCARD_defconfig +1 -0
index 798a0dcc37..1f1a52a129 100644
@@ -38,6 +38,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig +1 -0
index d8482a3efa..15849ff6fd 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +1 -0
index 3b4992fcf5..5c9830265f 100644
@@ -39,6 +39,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_NAND_SECBOOT_defconfig +2 -0
index b2f000af14..4944301f1c 100644
@@ -28,6 +28,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_NAND_defconfig +1 -0
index 4b1ddf1e94..ffe82e710e 100644
@@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_NOR_SECBOOT_defconfig +1 -0
index 806bf88c9d..dc4a1b02fa 100644
@@ -27,6 +27,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_NOR_defconfig +1 -0
index f1429abf74..c24a5ff845 100644
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_SDCARD_defconfig +1 -0
index eb3151c370..4decbebf8c 100644
@@ -37,6 +37,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig +1 -0
index 9c759db24f..eca0bebd6a 100644
@@ -28,6 +28,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PA_SPIFLASH_defconfig +1 -0
index 5513446739..a5cf534bd8 100644
@@ -38,6 +38,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig +2 -0
index aee9edf406..ee908f1e22 100644
@@ -29,6 +29,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +1 -0
index 9071081dd9..712ebda844 100644
@@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig +1 -0
index f41e0503c7..0c20b6ae36 100644
@@ -28,6 +28,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_36BIT_NOR_defconfig +1 -0
index a7e7ecff9e..c06d021ce8 100644
@@ -27,6 +27,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_36BIT_SDCARD_defconfig +1 -0
index aca04419f5..5909959c69 100644
@@ -38,6 +38,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig +1 -0
index 9a0332d6af..8d539e5017 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +1 -0
index 7041356374..622cbec0d7 100644
@@ -39,6 +39,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_NAND_SECBOOT_defconfig +2 -0
index 39b62bb375..1c75bd6a6a 100644
@@ -28,6 +28,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_NAND_defconfig +1 -0
index 78ca8b3680..3bda203e1f 100644
@@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_NOR_SECBOOT_defconfig +1 -0
index 45c7d3cd1d..ace233567d 100644
@@ -27,6 +27,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_NOR_defconfig +1 -0
index f1753a3971..31281dec99 100644
@@ -26,6 +26,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_SDCARD_defconfig +1 -0
index 56200bb6e8..a8a0c8338a 100644
@@ -37,6 +37,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig +1 -0
index 60e2e1bb38..8b43afed37 100644
@@ -28,6 +28,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1010RDB-PB_SPIFLASH_defconfig +1 -0
index f44d36c342..645f85f1fd 100644
@@ -38,6 +38,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020MBG-PC_36BIT_SDCARD_defconfig +1 -0
index cd1c8fc965..95eb7d8c11 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020MBG-PC_36BIT_defconfig +1 -0
index 63cc1b6b77..490b9ec39c 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020MBG-PC_SDCARD_defconfig +1 -0
index 21c10af164..3bd1760696 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020MBG-PC_defconfig +1 -0
index f0a479aca8..436aa33d7a 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +1 -0
index 748c282949..13174aa84a 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +1 -0
index 778a258bd7..dd10c34333 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index 31572566d4..906fba82b3 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PC_36BIT_defconfig +1 -0
index 3dbefd3c6b..9aa021625f 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PC_NAND_defconfig +1 -0
index 9585602590..6ec3f9bc68 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PC_SDCARD_defconfig +1 -0
index 983fbc740b..17a9e5bf79 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -0
index 0f49a81c04..fc2c18e982 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PC_defconfig +1 -0
index 2dadfa92c7..fac0606b90 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PD_NAND_defconfig +1 -0
index 731a63b73f..85cd272f6f 100644
@@ -42,6 +42,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ec000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs),1m(vsc7385-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PD_SDCARD_defconfig +1 -0
index c6cb7a58e1..90149f9ce1 100644
@@ -40,6 +40,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ec000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs),1m(vsc7385-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PD_SPIFLASH_defconfig +1 -0
index 848ca279aa..7b434caba1 100644
@@ -41,6 +41,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ec000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs),1m(vsc7385-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020RDB-PD_defconfig +1 -0
index 5377df34ce..0738351839 100644
@@ -30,6 +30,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ec000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs),1m(vsc7385-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020UTM-PC_36BIT_SDCARD_defconfig +1 -0
index 0c15789c44..92ad97057c 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020UTM-PC_36BIT_defconfig +1 -0
index 4fe2a9228a..a807dc03ca 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020UTM-PC_SDCARD_defconfig +1 -0
index 3285aabfc2..259a0be069 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1020UTM-PC_defconfig +1 -0
index dbe1879d88..844f5b5055 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1021RDB-PC_36BIT_NAND_defconfig +1 -0
index bbe4429337..f1590fb424 100644
@@ -44,6 +44,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9728k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1021RDB-PC_36BIT_SDCARD_defconfig +1 -0
index a086c527ac..3b0169a831 100644
@@ -42,6 +42,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9728k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index 2ff094c165..4af21e5327 100644
@@ -43,6 +43,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9728k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1021RDB-PC_36BIT_defconfig +1 -0
index 72c79d77bf..f8cad51f8c 100644
@@ -32,6 +32,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9728k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1021RDB-PC_NAND_defconfig +1 -0
index 9e0a71175f..ed77c75fbf 100644
@@ -43,6 +43,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9728k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1021RDB-PC_SDCARD_defconfig +1 -0
index 4c49da3a7c..123aabaa80 100644
@@ -41,6 +41,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9728k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1021RDB-PC_SPIFLASH_defconfig +1 -0
index ac8c9b2669..49d0ddc4e1 100644
@@ -42,6 +42,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9728k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1021RDB-PC_defconfig +1 -0
index c831333b92..b6ca068581 100644
@@ -31,6 +31,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9728k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1022DS_36BIT_NAND_defconfig +1 -0
index b0c885b289..5a6321b7de 100644
@@ -42,6 +42,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m(dink),6m(kernel),58112k(fs),512k(dtb),768k(u-boot)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
configs/P1022DS_36BIT_SDCARD_defconfig +1 -0
index 5e49b03726..085bdcf8c9 100644
@@ -40,6 +40,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m(dink),6m(kernel),58112k(fs),512k(dtb),768k(u-boot)"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
configs/P1022DS_36BIT_SPIFLASH_defconfig +1 -0
index cf1b6a0408..5aed805aff 100644
@@ -41,6 +41,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m(dink),6m(kernel),58112k(fs),512k(dtb),768k(u-boot)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
configs/P1022DS_36BIT_defconfig +1 -0
index e1fb283959..9830ab732d 100644
@@ -30,6 +30,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:48m(ramdisk),14m(diagnostic),2m(dink),6m(kernel),58112k(fs),512k(dtb),768k(u-boot)"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
configs/P1022DS_NAND_defconfig +1 -0
index 916f3103e8..46e37ae3dc 100644
@@ -41,6 +41,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=e8000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(dink),6m(kernel),58112k(fs),512k(dtb),768k(u-boot)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
configs/P1022DS_SDCARD_defconfig +1 -0
index dbf1872f62..812b394d97 100644
@@ -39,6 +39,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=e8000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(dink),6m(kernel),58112k(fs),512k(dtb),768k(u-boot)"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
configs/P1022DS_SPIFLASH_defconfig +1 -0
index 2c0546100a..13a9774a0f 100644
@@ -40,6 +40,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=e8000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(dink),6m(kernel),58112k(fs),512k(dtb),768k(u-boot)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
configs/P1022DS_defconfig +1 -0
index 3449838653..a466bbf570 100644
@@ -29,6 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=e8000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=e8000000.nor:48m(ramdisk),14m(diagnostic),2m(dink),6m(kernel),58112k(fs),512k(dtb),768k(u-boot)"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_CFI_MTD=y
configs/P1023RDB_defconfig +1 -0
index b4e27c4d23..b1ef6f00e9 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/P1024RDB_36BIT_defconfig +1 -0
index b34dc74863..0cc85e1068 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1024RDB_NAND_defconfig +1 -0
index 6890cd0786..7adb8013d5 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1024RDB_SDCARD_defconfig +1 -0
index 0925c2cf1b..73229a8c10 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1024RDB_SPIFLASH_defconfig +1 -0
index 398112fe4c..6a4ad605df 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1024RDB_defconfig +1 -0
index 2f21e2a403..bd30be48ab 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1025RDB_36BIT_defconfig +1 -0
index 30cef8ed41..c3bcc58dd2 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1025RDB_NAND_defconfig +1 -0
index 2f2b158226..898545092c 100644
@@ -41,6 +41,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1025RDB_SDCARD_defconfig +1 -0
index 5ca059cce1..cf63fb4d22 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1025RDB_SPIFLASH_defconfig +1 -0
index ebb04754da..74f73e0668 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P1025RDB_defconfig +1 -0
index 2feb9cca4a..9c8fb1b271 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +1 -0
index 74b806bbfd..e92b40dc1e 100644
@@ -44,6 +44,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2020RDB-PC_36BIT_SDCARD_defconfig +1 -0
index fb78b202e9..9bcff43766 100644
@@ -42,6 +42,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index e453814277..6ceea1ee64 100644
@@ -43,6 +43,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2020RDB-PC_36BIT_defconfig +1 -0
index 2d7b823eb3..26164deef5 100644
@@ -32,6 +32,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2020RDB-PC_NAND_defconfig +1 -0
index c6d50fa951..1a94ad4e8f 100644
@@ -43,6 +43,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2020RDB-PC_SDCARD_defconfig +1 -0
index 784262e447..498b22b381 100644
@@ -41,6 +41,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2020RDB-PC_SPIFLASH_defconfig +1 -0
index 647009750d..85e95ef6aa 100644
@@ -42,6 +42,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2020RDB-PC_defconfig +1 -0
index 7e905dcf9c..def3b9c668 100644
@@ -31,6 +31,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ef000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ef000000.nor:256k(vsc7385-firmware),256k(dtb),4608k(kernel),9984k(fs),1280k(u-boot)"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2041RDB_NAND_defconfig +1 -0
index 14ad2b1a2d..f73a31e4fc 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2041RDB_SDCARD_defconfig +1 -0
index 3d5d96e1ce..c236278270 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2041RDB_SECURE_BOOT_defconfig +1 -0
index 098f40fea5..689c0df0a4 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2041RDB_SPIFLASH_defconfig +1 -0
index e8698e8456..35f0d2d581 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P2041RDB_defconfig +1 -0
index 07c212b6ed..2794c2fc5b 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P3041DS_NAND_SECURE_BOOT_defconfig +1 -0
index 095c96431a..52815c9ae3 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P3041DS_NAND_defconfig +1 -0
index cf51493d33..34f4d33e6a 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P3041DS_SDCARD_defconfig +1 -0
index 40b40fc073..eeb5469e65 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P3041DS_SECURE_BOOT_defconfig +1 -0
index 06555e806e..15a149ac2d 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P3041DS_SPIFLASH_defconfig +1 -0
index 84b5d76a2d..206a95ed29 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P3041DS_defconfig +1 -0
index 2d72e76f3c..f579b82953 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P4080DS_SDCARD_defconfig +1 -0
index 1a617b2e89..f2ced585a7 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P4080DS_SECURE_BOOT_defconfig +1 -0
index 517a3af1ae..3448b1f255 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P4080DS_SPIFLASH_defconfig +1 -0
index b90d65eff7..caac6707de 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P4080DS_defconfig +1 -0
index 83a925b664..1404d9bfa1 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5020DS_NAND_SECURE_BOOT_defconfig +1 -0
index 8152f68b5b..e27dd4772f 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5020DS_NAND_defconfig +1 -0
index 55a6fce1ce..4c516aa800 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5020DS_SDCARD_defconfig +1 -0
index 0116c2d3a8..2e015ff073 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5020DS_SECURE_BOOT_defconfig +1 -0
index ce172a9332..6284a04f0f 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5020DS_SPIFLASH_defconfig +1 -0
index 28ac033e97..811c07d19c 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5020DS_defconfig +1 -0
index 7177716222..414bda2bbd 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5040DS_NAND_SECURE_BOOT_defconfig +1 -0
index 495ce616a1..47c8b8c5b4 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5040DS_NAND_defconfig +1 -0
index 5ec567a0cb..c8c0601bb6 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5040DS_SDCARD_defconfig +1 -0
index b12bb8f6a5..c2d158084f 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5040DS_SECURE_BOOT_defconfig +1 -0
index 66c116f426..3ff0da7aa7 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5040DS_SPIFLASH_defconfig +1 -0
index 1c3495967c..b59742d156 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/P5040DS_defconfig +1 -0
index 314d05b210..f4811d77e5 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1023RDB_NAND_defconfig +1 -0
index ea9f096043..3f972c8b4f 100644
@@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1023RDB_SDCARD_defconfig +1 -0
index de99d16636..d2119cb4d6 100644
@@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1023RDB_SECURE_BOOT_defconfig +1 -0
index 60c8a4782b..2333d9f53a 100644
@@ -32,6 +32,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:1m(uboot),5m(kernel),128k(dtb),-(user)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1023RDB_SPIFLASH_defconfig +1 -0
index b0434ea5d0..fb91dcb3c4 100644
@@ -43,6 +43,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1023RDB_defconfig +1 -0
index 7a57a75908..3f53ed0e16 100644
@@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +1 -0
index c38fee0757..685525319f 100644
@@ -33,6 +33,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024QDS_DDR4_defconfig +1 -0
index 9a9a25b174..04ccc0149f 100644
@@ -32,6 +32,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024QDS_NAND_defconfig +1 -0
index 4f860b9b37..08f68f325f 100644
@@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024QDS_SDCARD_defconfig +1 -0
index be461fc8ad..c2a979969a 100644
@@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024QDS_SECURE_BOOT_defconfig +1 -0
index ecebd48e72..369bf90ce7 100644
@@ -34,6 +34,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_DM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024QDS_SPIFLASH_defconfig +1 -0
index 8ad4d35f30..a21be6b7d4 100644
@@ -45,6 +45,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024QDS_defconfig +1 -0
index 23ed39e240..99eace1c11 100644
@@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024RDB_NAND_defconfig +1 -0
index 983292f453..fed0958162 100644
@@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024RDB_SDCARD_defconfig +1 -0
index e31578c6b5..775d352954 100644
@@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024RDB_SECURE_BOOT_defconfig +1 -0
index 4269133c8c..193499b123 100644
@@ -34,6 +34,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_DM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 148eef0719..a40a0ed8d0 100644
@@ -45,6 +45,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1024RDB_defconfig +1 -0
index cb1f2640aa..94d89ac615 100644
@@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040D4RDB_NAND_defconfig +1 -0
index 2c7ab917c6..ddf52cbab1 100644
@@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040D4RDB_SDCARD_defconfig +1 -0
index 88f3c287ec..6cde9068ea 100644
@@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040D4RDB_SECURE_BOOT_defconfig +1 -0
index 030f72a1d5..b1cec214d5 100644
@@ -31,6 +31,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040D4RDB_SPIFLASH_defconfig +1 -0
index 7adf65cc8a..a0e7b09524 100644
@@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040D4RDB_defconfig +1 -0
index c9032c24fe..e0e10252a6 100644
@@ -30,6 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040QDS_DDR4_defconfig +1 -0
index fd2c74f4d8..795d460ea0 100644
@@ -33,6 +33,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040QDS_SECURE_BOOT_defconfig +1 -0
index 719a1e459a..835e6836d9 100644
@@ -35,6 +35,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_DM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040QDS_defconfig +1 -0
index 81454ab735..6d12189025 100644
@@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040RDB_NAND_defconfig +1 -0
index 31a21c9c80..ddd4d558d4 100644
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040RDB_SDCARD_defconfig +1 -0
index 57d214da3b..5ad8b9ad53 100644
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040RDB_SECURE_BOOT_defconfig +1 -0
index 62d1c3068b..8d8657b937 100644
@@ -32,6 +32,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_DM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040RDB_SPIFLASH_defconfig +1 -0
index c086a9fe99..e9fe9313a2 100644
@@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1040RDB_defconfig +1 -0
index 0209fb8747..ada9a6885a 100644
@@ -31,6 +31,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042D4RDB_NAND_defconfig +1 -0
index fb97ba8ab8..524be86f64 100644
@@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
index 1f7cf60695..b2cd00cfc1 100644
@@ -42,6 +42,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042D4RDB_SECURE_BOOT_defconfig +1 -0
index ef9b243446..20ceb07c85 100644
@@ -32,6 +32,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index a2a7d67c80..8366157e94 100644
@@ -43,6 +43,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042D4RDB_defconfig +1 -0
index 5d600225bd..4df24626d7 100644
@@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +1 -0
index cfda28eb27..7df15a3807 100644
@@ -47,6 +47,7 @@ CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042RDB_PI_NAND_defconfig +1 -0
index fab2eabc28..cc7f332b03 100644
@@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042RDB_PI_SDCARD_defconfig +1 -0
index 4b2d1828ef..ac7905a3da 100644
@@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0
index 8c36654544..156bfef0be 100644
@@ -45,6 +45,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042RDB_PI_defconfig +1 -0
index ec816e732b..500076ed72 100644
@@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042RDB_SECURE_BOOT_defconfig +1 -0
index 2e40362e9e..11042dcd9b 100644
@@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_DM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T1042RDB_defconfig +1 -0
index 515dec4c55..a87dfacbc0 100644
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080QDS_NAND_defconfig +1 -0
index f8132ec459..0a096b5234 100644
@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="t2080qds"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080QDS_SDCARD_defconfig +1 -0
index 30e87df3bb..855dd74e36 100644
@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="t2080qds"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080QDS_SECURE_BOOT_defconfig +1 -0
index 9e155ee6ae..7ac29b45bf 100644
@@ -28,6 +28,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000
 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:1m(uboot),5m(kernel),128k(dtb),-(user)"
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080QDS_SPIFLASH_defconfig +1 -0
index 0cccb3a85d..1fb5651742 100644
@@ -41,6 +41,7 @@ CONFIG_DEFAULT_DEVICE_TREE="t2080qds"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080QDS_defconfig +1 -0
index 79cf4424b4..a56d8cafb6 100644
@@ -30,6 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="t2080qds"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080RDB_NAND_defconfig +1 -0
index 67d94ea1d9..7ad0b44f15 100644
@@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080RDB_SDCARD_defconfig +1 -0
index dfe5e8bf0c..57d2859bd7 100644
@@ -40,6 +40,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080RDB_SECURE_BOOT_defconfig +1 -0
index 5ec495aae4..79bd2f2ca8 100644
@@ -30,6 +30,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 # CONFIG_CMD_IRQ is not set
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080RDB_SPIFLASH_defconfig +1 -0
index 6d6d6408e5..f3ef20838e 100644
@@ -41,6 +41,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2080RDB_defconfig +1 -0
index 4f155dee23..dd99124085 100644
@@ -29,6 +29,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2081QDS_NAND_defconfig +1 -0
index 94d9df87a2..83b4710ebe 100644
@@ -38,6 +38,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2081QDS_SDCARD_defconfig +1 -0
index 4dd0e909d3..587457fa57 100644
@@ -38,6 +38,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2081QDS_SPIFLASH_defconfig +1 -0
index 6dc7d6db65..0f372b92bd 100644
@@ -39,6 +39,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T2081QDS_defconfig +1 -0
index 24b616b3c6..6e2bb6e9f6 100644
@@ -27,6 +27,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4160QDS_NAND_defconfig +1 -0
index 525637a10e..b1de43d441 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4160QDS_SDCARD_defconfig +1 -0
index b29c069102..23ff112883 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4160QDS_SECURE_BOOT_defconfig +1 -0
index 4463386c07..b5bec89658 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4160QDS_defconfig +1 -0
index 4f45229895..d6f8413074 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4160RDB_defconfig +1 -0
index 06c80381a7..f12a15105a 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4240QDS_NAND_defconfig +1 -0
index 94bf40c519..6fd36f828c 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4240QDS_SDCARD_defconfig +1 -0
index b461e0880b..78676109b6 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4240QDS_SECURE_BOOT_defconfig +1 -0
index 416b415bb5..285f70a975 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4240QDS_defconfig +1 -0
index d1f33d79be..e5c50bd370 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4240RDB_SDCARD_defconfig +1 -0
index 8bde983738..e24e584d5a 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/T4240RDB_defconfig +1 -0
index d9f5845756..a865307eab 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/UCP1020_SPIFLASH_defconfig +1 -0
index d75c1f3906..4dddaf1552 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/UCP1020_defconfig +1 -0
index 7fc6acc0b0..8c40adbfc1 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/adp-ae3xx_defconfig +1 -0
index 1c26a8fc6d..6c9c4983f7 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="ae3xx"
+CONFIG_MTD=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
configs/adp-ag101p_defconfig +1 -0
index 2e0bbc5262..fc78474675 100644
@@ -24,6 +24,7 @@ CONFIG_MMC=y
 CONFIG_DM_MMC=y
 CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/am335x_baltos_defconfig +1 -0
index a0d7f744b3..461de8bd5d 100644
@@ -43,6 +43,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_OMAP24_I2C_SPEED=1000
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am335x_evm_defconfig +1 -0
index 52ba1ecd21..3d3b7c9d0a 100644
@@ -36,6 +36,7 @@ CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/am335x_evm_nor_defconfig +1 -0
index d2b844118e..6bfd98464a 100644
@@ -26,6 +26,7 @@ CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/am335x_evm_usbspl_defconfig +1 -0
index 7c0d5eca49..6e870eac0c 100644
@@ -35,6 +35,7 @@ CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/am335x_hs_evm_defconfig +1 -0
index 4cc2d28be8..f5540816b8 100644
@@ -43,6 +43,7 @@ CONFIG_MISC=y
 CONFIG_DM_MMC=y
 # CONFIG_MMC_HW_PARTITIONING is not set
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/am335x_hs_evm_uart_defconfig +1 -0
index 72fe0be82d..84cd9b8e47 100644
@@ -40,6 +40,7 @@ CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/am335x_igep003x_defconfig +1 -0
index 6040668744..ab4fb76a8b 100644
@@ -42,6 +42,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_UBI=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_DRIVER_TI_CPSW=y
configs/am3517_crane_defconfig +1 -0
index b2f332a10e..989329d42f 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
configs/am3517_evm_defconfig +1 -0
index e024f192f2..85075c5cb9 100644
@@ -38,6 +38,7 @@ CONFIG_DEFAULT_DEVICE_TREE="am3517-evm"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM_PCA953X=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
configs/am43xx_evm_defconfig +1 -0
index cc70f304c2..63401a6e80 100644
@@ -34,6 +34,7 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/am43xx_evm_ethboot_defconfig +1 -0
index f77789cdcc..1a39880098 100644
@@ -40,6 +40,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/am43xx_evm_rtconly_defconfig +1 -0
index 403dc960dc..dc33a36071 100644
@@ -35,6 +35,7 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/am43xx_evm_usbhost_boot_defconfig +1 -0
index 3ac6372b51..1bf5f4ec7e 100644
@@ -48,6 +48,7 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/am43xx_hs_evm_defconfig +1 -0
index 4d79ce617e..b6c63334f2 100644
@@ -45,6 +45,7 @@ CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/amcore_defconfig +1 -0
index 43e71cd6c2..f5a6d8b595 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_DIAG=y
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_NET is not set
 CONFIG_DM=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/ap325rxa_defconfig +1 -0
index d2f0d7fc42..3ca4ebeb43 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/ap_sh4a_4a_defconfig +1 -0
index 6851c37185..3d34489c54 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/apf27_defconfig +1 -0
index 554ef44357..8f8a984b26 100644
@@ -40,6 +40,7 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
 CONFIG_MXC_GPIO=y
 CONFIG_MMC_MXC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
configs/apx4devkit_defconfig +1 -0
index 4631f88fb3..7d308a5e6f 100644
@@ -31,6 +31,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:128k(bootstrap),1024k(boot),768k(env
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_MXS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_MII=y
configs/aristainetos2_defconfig +1 -0
index 77ba994da0..365db0f410 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
configs/aristainetos2b_defconfig +1 -0
index 9fff2d4c9a..778db36346 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
configs/aristainetos_defconfig +1 -0
index 6677c0e4a1..d3d5e23e2d 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
configs/astro_mcf5373l_defconfig +1 -0
index 230c4cb921..3011dfdc53 100644
@@ -21,6 +21,7 @@ CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/at91rm9200ek_defconfig +1 -0
index 7ebbdacbfc..817c712e3d 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/at91rm9200ek_ram_defconfig +1 -0
index 87fd7a303a..8a06ee557f 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/at91sam9260ek_dataflash_cs0_defconfig +1 -0
index 27a18d59fb..e98717dce5 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9260ek_dataflash_cs1_defconfig +1 -0
index d271c18415..2fc3a4dfe5 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9260ek_nandflash_defconfig +1 -0
index a1ef067859..a608b09b16 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9261ek_dataflash_cs0_defconfig +1 -0
index c84bfb0b7e..fc5f4d99d9 100644
@@ -36,6 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9261ek_dataflash_cs3_defconfig +1 -0
index 0bb1b1b68c..d3066ca313 100644
@@ -36,6 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9261ek_nandflash_defconfig +1 -0
index 8d24fbdcb5..06f56474b8 100644
@@ -36,6 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9263ek_dataflash_cs0_defconfig +1 -0
index 872a939d80..f70dff5f18 100644
@@ -40,6 +40,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9263ek_dataflash_defconfig +1 -0
index 872a939d80..f70dff5f18 100644
@@ -40,6 +40,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9263ek_nandflash_defconfig +1 -0
index a1e34632eb..f2afb89fa8 100644
@@ -40,6 +40,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9263ek_norflash_boot_defconfig +1 -0
index f621981422..4933131c6f 100644
@@ -38,6 +38,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/at91sam9263ek_norflash_defconfig +1 -0
index 4da52491c0..a16d6631a8 100644
@@ -38,6 +38,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/at91sam9g10ek_dataflash_cs0_defconfig +1 -0
index f0d48dc0e4..2d0abaa361 100644
@@ -36,6 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9g10ek_dataflash_cs3_defconfig +1 -0
index 20c0c71d77..867716b735 100644
@@ -36,6 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9g10ek_nandflash_defconfig +1 -0
index 99f5579767..f8307e5677 100644
@@ -36,6 +36,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9g20ek_2mmc_defconfig +1 -0
index 7dbc4fa103..44e0feef33 100644
@@ -37,6 +37,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9g20ek_2mmc_nandflash_defconfig +1 -0
index c7f10daeed..bfee486eb1 100644
@@ -37,6 +37,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9g20ek_dataflash_cs0_defconfig +1 -0
index ddd5e0be26..d09263a63c 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9g20ek_dataflash_cs1_defconfig +1 -0
index 1ac00e2453..93ea9e0211 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9g20ek_nandflash_defconfig +1 -0
index 7824b8881d..14c1f00b89 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9m10g45ek_mmc_defconfig +1 -0
index 9e0db2f871..de611872ee 100644
@@ -39,6 +39,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
configs/at91sam9n12ek_mmc_defconfig +1 -0
index c2f9e3f211..dd6d3b1d23 100644
@@ -39,6 +39,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9n12ek_spiflash_defconfig +1 -0
index 6f3fea95a3..7ef3e5c233 100644
@@ -39,6 +39,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9rlek_dataflash_defconfig +1 -0
index d5ef8f1b0d..fba03f35c9 100644
@@ -38,6 +38,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9rlek_mmc_defconfig +1 -0
index 0a21ab9af9..06b153d904 100644
@@ -38,6 +38,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9rlek_nandflash_defconfig +1 -0
index d06423699b..b6334450c0 100644
@@ -38,6 +38,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9x5ek_dataflash_defconfig +1 -0
index 61d96286db..eef9d7d701 100644
@@ -41,6 +41,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9x5ek_mmc_defconfig +1 -0
index bfadaef6f2..c9505343ad 100644
@@ -41,6 +41,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9x5ek_spiflash_defconfig +1 -0
index 73950d52c5..5a44091e4c 100644
@@ -41,6 +41,7 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9xeek_dataflash_cs0_defconfig +1 -0
index 81f76d6465..83f0b0d8dc 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9xeek_dataflash_cs1_defconfig +1 -0
index 7a082a583a..a31b410859 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/at91sam9xeek_nandflash_defconfig +1 -0
index c94f281aa1..b4cd8df119 100644
@@ -35,6 +35,7 @@ CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
configs/ax25-ae350_defconfig +1 -0
index d7c4f40e58..a0074b0c5c 100644
@@ -22,6 +22,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC=y
 CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_CFI_FLASH=y
configs/axm_defconfig +1 -0
index 0ae4a19c4a..11de613070 100644
@@ -38,6 +38,7 @@ CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_SPI_FLASH=y
configs/bcm11130_nand_defconfig +1 -0
index e17b6095d5..7dc8057670 100644
@@ -24,6 +24,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_KONA=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
configs/bg0900_defconfig +1 -0
index f64b672d7d..91cf7cf829 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_DOS_PARTITION=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
configs/blanche_defconfig +1 -0
index 244ab22f6f..ff558857bb 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_I2C_RCAR_IIC=y
 CONFIG_DM_MMC=y
 CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/boston32r2_defconfig +1 -0
index b34f406dab..cb60786836 100644
@@ -28,6 +28,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/boston32r2el_defconfig +1 -0
index 30f2c1a5be..1dfd895a2e 100644
@@ -29,6 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/boston32r6_defconfig +1 -0
index 6f71f1f317..02f84fac94 100644
@@ -29,6 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/boston32r6el_defconfig +1 -0
index 7dee5f6ffe..521eeeb19a 100644
@@ -30,6 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/boston64r2_defconfig +1 -0
index edeb4c9cc8..469234f7f5 100644
@@ -29,6 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/boston64r2el_defconfig +1 -0
index 3470cfbbf5..749c097b25 100644
@@ -30,6 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/boston64r6_defconfig +1 -0
index 8176fa8dfa..bed12255bb 100644
@@ -29,6 +29,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/boston64r6el_defconfig +1 -0
index 2abb0187be..5f2c97cb86 100644
@@ -30,6 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="img,boston"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/brppt1_nand_defconfig +1 -0
index 86ea75ea41..ba1f663803 100644
@@ -77,6 +77,7 @@ CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
 CONFIG_MISC=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
configs/caddy2_defconfig +1 -0
index 5fec4f8d49..e9439d8394 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/cairo_defconfig +1 -0
index 1c177bfd55..5282ec1a7a 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_CONS_INDEX=2
configs/calimain_defconfig +1 -0
index f2b0814acf..387c070587 100644
@@ -27,6 +27,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0x01C23000
 CONFIG_DA8XX_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/chiliboard_defconfig +1 -0
index 66f29dd443..dbebd24cfc 100644
@@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_MII=y
configs/cm_fx6_defconfig +1 -0
index ff9a135b06..801cef9cd8 100644
@@ -53,6 +53,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_DM_KEYBOARD=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
configs/cm_t335_defconfig +1 -0
index 5d8b6e3c1b..962f39a830 100644
@@ -44,6 +44,7 @@ CONFIG_LED_STATUS_BIT=64
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_MII=y
configs/cm_t3517_defconfig +1 -0
index 6c987b4da5..ba79ecd463 100644
@@ -40,6 +40,7 @@ CONFIG_LED_STATUS_STATE=2
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MII=y
 CONFIG_SMC911X=y
configs/cm_t35_defconfig +1 -0
index fdfcd3be45..0449721f3e 100644
@@ -41,6 +41,7 @@ CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SMC911X=y
configs/cm_t43_defconfig +1 -0
index 8fca1c64b0..6a8f2d5d43 100644
@@ -47,6 +47,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
configs/cobra5272_defconfig +1 -0
index fc295af114..afc0c4cf42 100644
@@ -11,6 +11,7 @@ CONFIG_CMD_IMLS=y
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MII=y
 CONFIG_BAUDRATE=19200
configs/colibri_imx7_defconfig +1 -0
index c147e3f19a..f7976dedca 100644
@@ -50,6 +50,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_PHYLIB=y
configs/colibri_pxa270_defconfig +1 -0
index 2ff489f4a9..4b5cd9d907 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/colibri_vf_defconfig +1 -0
index fb0578868d..453fa25f82 100644
@@ -49,6 +49,7 @@ CONFIG_VYBRID_GPIO=y
 CONFIG_FSL_ESDHC=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+CONFIG_MTD=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/comtrend_ct5361_ram_defconfig +1 -0
index 10511bbde5..c0d4f3db5c 100644
@@ -34,6 +34,7 @@ CONFIG_DM_GPIO=y
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/comtrend_wap5813n_ram_defconfig +1 -0
index 49a07e66ec..08e617e3f2 100644
@@ -34,6 +34,7 @@ CONFIG_DM_GPIO=y
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/corvus_defconfig +1 -0
index 9f2f3260cd..31159bab3d 100644
@@ -42,6 +42,7 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
configs/da850evm_direct_nor_defconfig +1 -0
index b4564f2101..d3935a3ee0 100644
@@ -42,6 +42,7 @@ CONFIG_DA8XX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DAVINCI=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/da850evm_nand_defconfig +1 -0
index bd4f1bb567..9b893db9c2 100644
@@ -44,6 +44,7 @@ CONFIG_SPL_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DA8XX_GPIO=y
 CONFIG_DM_I2C=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
configs/db-88f6820-amc_defconfig +1 -0
index 9004dfc9f8..1fcd87d9c5 100644
@@ -46,6 +46,7 @@ CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_PXA3XX=y
 CONFIG_SPI_FLASH=y
configs/db-mv784mp-gp_defconfig +1 -0
index 0592daebc2..601b8ff1fc 100644
@@ -45,6 +45,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SATA_MV=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_PXA3XX=y
 CONFIG_SPI_FLASH=y
configs/devkit3250_defconfig +1 -0
index 02eb252e01..eb75887f6b 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/devkit8000_defconfig +1 -0
index 543a46d462..1c95aced35 100644
@@ -27,6 +27,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
configs/draco_defconfig +1 -0
index 0ae74b1955..139851e333 100644
@@ -61,6 +61,7 @@ CONFIG_BOOTCOUNT_ENV=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/ea20_defconfig +1 -0
index 8d85a81f08..0e99b9d348 100644
@@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DA8XX_GPIO=y
 CONFIG_SYS_I2C_DAVINCI=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_SPI_FLASH=y
configs/eb_cpu5282_defconfig +1 -0
index 3632706f33..9fd788c64b 100644
@@ -21,6 +21,7 @@ CONFIG_LED_STATUS_BIT=8
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_LED_STATUS_CMD=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/eb_cpu5282_internal_defconfig +1 -0
index 73c6744e7f..d67d6a16ed 100644
@@ -20,6 +20,7 @@ CONFIG_LED_STATUS_BIT=8
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_LED_STATUS_CMD=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/eco5pk_defconfig +1 -0
index 2e5cf61983..d5e990383f 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
configs/ecovec_defconfig +1 -0
index e6d19446eb..0757081f49 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/edb9315a_defconfig +1 -0
index f8f2e16f85..a63528e5b2 100644
@@ -37,6 +37,7 @@ CONFIG_LED_STATUS_RED=1
 CONFIG_LED_STATUS_GREEN_ENABLE=y
 CONFIG_LED_STATUS_GREEN=0
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/edminiv2_defconfig +1 -0
index 1d06b3e612..f1489d6fe6 100644
@@ -26,6 +26,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/espt_defconfig +1 -0
index 95a7cb7cb6..4a3935ae93 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/etamin_defconfig +1 -0
index 89a03f1bc0..24a6a0148f 100644
@@ -61,6 +61,7 @@ CONFIG_BOOTCOUNT_ENV=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/ethernut5_defconfig +1 -0
index 4093496ec5..1b374b4e15 100644
@@ -50,6 +50,7 @@ CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
configs/flea3_defconfig +1 -0
index 7a2b32cb62..45a74bd599 100644
@@ -23,6 +23,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:50m(root1),32m(rootfb),64m(pcache),64
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/gurnard_defconfig +1 -0
index c65ef0f0a4..ad453ae0aa 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_PHYLIB=y
configs/gwventana_nand_defconfig +1 -0
index fd72c3c81f..7bf4b6e0d2 100644
@@ -63,6 +63,7 @@ CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
configs/hrcon_defconfig +1 -0
index 7605c56619..a2df1d4a51 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/hrcon_dh_defconfig +1 -0
index bc51a5d02a..6e5c49c94a 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/huawei_hg556a_ram_defconfig +1 -0
index fadb9ba053..06b2999fa6 100644
@@ -34,6 +34,7 @@ CONFIG_DM_GPIO=y
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/ids8313_defconfig +3 -0
index 0d055e395d..0b43e26cf8 100644
@@ -37,6 +37,9 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_I2C=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x9
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_MTD_UBI=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/igep0032_defconfig +1 -0
index 1636e21757..8a9f8432b9 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
configs/igep00x0_defconfig +1 -0
index d70cb01163..1dd87b3faa 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPL_NAND_SIMPLE=y
configs/imx6dl_icore_nand_defconfig +1 -0
index 4402fe2834..091cf5ccc3 100644
@@ -38,6 +38,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
configs/imx6q_icore_nand_defconfig +1 -0
index 1c81fd9515..0a60726b1a 100644
@@ -39,6 +39,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
configs/imx6q_logic_defconfig +1 -0
index 02c05ae8f2..d507b2a0b7 100644
@@ -57,6 +57,7 @@ CONFIG_SYS_I2C_MXC=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
configs/imx6qdl_icore_mmc_defconfig +1 -0
index a30099bf9d..54eda990e7 100644
@@ -48,6 +48,7 @@ CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
configs/imx6qdl_icore_nand_defconfig +1 -0
index 1c81fd9515..0a60726b1a 100644
@@ -39,6 +39,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
configs/imx6ul_geam_nand_defconfig +1 -0
index 645f666177..11e514aa52 100644
@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
configs/imx6ul_isiot_nand_defconfig +1 -0
index 5ba77dddb0..80460e406a 100644
@@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-nand"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_PHYLIB=y
configs/integratorap_cm720t_defconfig +1 -0
index eb3aebf3f3..f9030bf37f 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_ARMFLASH=y
 CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/integratorap_cm920t_defconfig +1 -0
index 6af27016c3..8faf25731b 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_ARMFLASH=y
 CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/integratorap_cm926ejs_defconfig +1 -0
index 177709e852..f72278bdde 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_ARMFLASH=y
 CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/integratorap_cm946es_defconfig +1 -0
index 0620e3760f..592c557fde 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_ARMFLASH=y
 CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/integratorcp_cm1136_defconfig +1 -0
index 1b3d067ce6..f14ff95632 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_IMLS=y
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/integratorcp_cm920t_defconfig +1 -0
index 847196e1cf..c185457a40 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_IMLS=y
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/integratorcp_cm926ejs_defconfig +1 -0
index b3a1bcba3c..8cfbc97751 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_IMLS=y
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/integratorcp_cm946es_defconfig +1 -0
index cadf5e8915..369d859900 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_IMLS=y
 CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/ipam390_defconfig +1 -0
index 838f8d83c9..bece70d2d0 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DA8XX_GPIO=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DRIVER_TI_EMAC=y
configs/k2e_evm_defconfig +1 -0
index 8168bed2e5..e03cf0309b 100644
@@ -38,6 +38,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
configs/k2e_hs_evm_defconfig +1 -0
index 4423fb2bf6..c13ecc5705 100644
@@ -31,6 +31,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
configs/k2g_evm_defconfig +1 -0
index 3d3aae3237..5ed7d1656d 100644
@@ -38,6 +38,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
configs/k2g_hs_evm_defconfig +1 -0
index b627af8b71..74b85864ce 100644
@@ -31,6 +31,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
configs/k2hk_evm_defconfig +1 -0
index 054065b841..ffc4eb51fb 100644
@@ -38,6 +38,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
configs/k2hk_hs_evm_defconfig +1 -0
index 63e88c5f76..a3ad8c8ae2 100644
@@ -31,6 +31,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
configs/k2l_evm_defconfig +1 -0
index 19a289f58d..28cbc963eb 100644
@@ -38,6 +38,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
configs/k2l_hs_evm_defconfig +1 -0
index c3e546f6ee..5998f14651 100644
@@ -30,6 +30,7 @@ CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
configs/kmcoge5ne_defconfig +1 -0
index cb47b0b7fd..c8cc69a985 100644
@@ -32,6 +32,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
 # CONFIG_MMC is not set
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

configs/kmtegr1_defconfig +1 -0
index 40181758e9..3c95e8a767 100644

Lines of this file are not shown. View the raw message.

configs/kzm9g_defconfig +1 -0
index 032246a48b..57475c4d63 100644

Lines of this file are not shown. View the raw message.

configs/ls1021aqds_ddr4_nor_defconfig +1 -0
index d697a0302b..a869343de0 100644

Lines of this file are not shown. View the raw message.

configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0
index f485b73a8b..d19d26b1bf 100644

Lines of this file are not shown. View the raw message.

configs/ls1021aqds_nand_defconfig +2 -0
index 045ef52a0f..88036a0d4e 100644

Lines of this file are not shown. View the raw message.

configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -0
index 716cc63624..13c614294b 100644

Lines of this file are not shown. View the raw message.

configs/ls1021aqds_nor_defconfig +1 -0
index 9be4838c7e..150f327900 100644

Lines of this file are not shown. View the raw message.

configs/ls1021aqds_nor_lpuart_defconfig +1 -0
index df922f59af..103341935f 100644

Lines of this file are not shown. View the raw message.

configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
index ec7f1bc15d..412b931d8f 100644

Lines of this file are not shown. View the raw message.

configs/ls1021atwr_nor_SECURE_BOOT_defconfig +1 -0
index 97ffa21228..1a55a491a0 100644

Lines of this file are not shown. View the raw message.

configs/ls1021atwr_nor_defconfig +1 -0
index 582f52151f..d93cd74b84 100644

Lines of this file are not shown. View the raw message.

configs/ls1021atwr_nor_lpuart_defconfig +1 -0
index a567c07062..abb4f4b0e7 100644

Lines of this file are not shown. View the raw message.

configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -0
index 44e59d2acc..ff38379121 100644

Lines of this file are not shown. View the raw message.

configs/ls1021atwr_sdcard_ifc_defconfig +1 -0
index 4824a83fb4..2e3cd5758f 100644

Lines of this file are not shown. View the raw message.

configs/ls1043aqds_defconfig +1 -0
index 7db5d2d43a..5cf1a9a574 100644

Lines of this file are not shown. View the raw message.

configs/ls1043aqds_lpuart_defconfig +1 -0
index 65f61f43d1..a6aa5c92d5 100644

Lines of this file are not shown. View the raw message.

configs/ls1043aqds_nand_defconfig +2 -0
index 06b266aa7d..3d859b1a6f 100644

Lines of this file are not shown. View the raw message.

configs/ls1043aqds_nor_ddr3_defconfig +1 -0
index 318152a391..4930f9adaa 100644

Lines of this file are not shown. View the raw message.

configs/ls1043aqds_sdcard_ifc_defconfig +1 -0
index d547fefcda..2c36139393 100644

Lines of this file are not shown. View the raw message.

configs/ls1043ardb_SECURE_BOOT_defconfig +1 -0
index 41df0b9fbf..23ad75ff2b 100644

Lines of this file are not shown. View the raw message.

configs/ls1043ardb_defconfig +1 -0
index 7541fad3db..29fefc89f6 100644

Lines of this file are not shown. View the raw message.

configs/ls1043ardb_nand_SECURE_BOOT_defconfig +2 -0
index 2879f45d56..4aa44393d7 100644

Lines of this file are not shown. View the raw message.

configs/ls1043ardb_nand_defconfig +2 -0
index 5a23e3cfff..7b4f16e880 100644

Lines of this file are not shown. View the raw message.

configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +1 -0
index 3c19694456..91c312b85e 100644

Lines of this file are not shown. View the raw message.

configs/ls1043ardb_sdcard_defconfig +1 -0
index 144e48b885..89c470e746 100644

Lines of this file are not shown. View the raw message.

configs/ls1046aqds_SECURE_BOOT_defconfig +1 -0
index 8f61afa5fd..52e0968a04 100644

Lines of this file are not shown. View the raw message.

configs/ls1046aqds_defconfig +1 -0
index 47a8dcd68b..1bea1c2fb0 100644

Lines of this file are not shown. View the raw message.

configs/ls1046aqds_lpuart_defconfig +1 -0
index 7edb0ad384..4dff6cb8d3 100644

Lines of this file are not shown. View the raw message.

configs/ls1046aqds_nand_defconfig +2 -0
index d8a5b0e95e..bf8aa4a518 100644

Lines of this file are not shown. View the raw message.

configs/ls1046aqds_sdcard_ifc_defconfig +1 -0
index ff9b0367ae..bc3b3c8613 100644

Lines of this file are not shown. View the raw message.

configs/ls1088aqds_defconfig +1 -0
index 177c56889a..8013214689 100644

Lines of this file are not shown. View the raw message.

configs/ls1088aqds_sdcard_ifc_defconfig +1 -0
index b34be2eaf9..40231e4c00 100644

Lines of this file are not shown. View the raw message.

configs/ls2080a_simu_defconfig +1 -0
index 17460a2198..eb4ec63b01 100644

Lines of this file are not shown. View the raw message.

configs/ls2080aqds_SECURE_BOOT_defconfig +1 -0
index 6a2a522046..150d4aa77f 100644

Lines of this file are not shown. View the raw message.

configs/ls2080aqds_defconfig +1 -0
index f4a361a64d..aa1a834b66 100644

Lines of this file are not shown. View the raw message.

configs/ls2080ardb_SECURE_BOOT_defconfig +1 -0
index 8f18d93667..647bae49c2 100644

Lines of this file are not shown. View the raw message.

configs/ls2080ardb_defconfig +1 -0
index 1c13bbabbc..aa6423ae94 100644

Lines of this file are not shown. View the raw message.

configs/ls2080ardb_nand_defconfig +2 -0
index 061d5cdc2b..ae8f58794b 100644

Lines of this file are not shown. View the raw message.

configs/m53menlo_defconfig +1 -0
index 604ba7cb94..cbc7aca0a9 100644

Lines of this file are not shown. View the raw message.

configs/malta64_defconfig +1 -0
index 15c4e622c8..2375498647 100644

Lines of this file are not shown. View the raw message.

configs/malta64el_defconfig +1 -0
index 592fef5d2c..a4d1e55db0 100644

Lines of this file are not shown. View the raw message.

configs/malta_defconfig +1 -0
index 9d6064ec91..8497e40313 100644

Lines of this file are not shown. View the raw message.

configs/maltael_defconfig +1 -0
index f30f451b4e..177e66fe12 100644

Lines of this file are not shown. View the raw message.

configs/mccmon6_nor_defconfig +1 -0
index 645c3c8b74..7b7cab68d4 100644

Lines of this file are not shown. View the raw message.

configs/mccmon6_sd_defconfig +1 -0
index 4f14434488..272445d4f5 100644

Lines of this file are not shown. View the raw message.

configs/mcx_defconfig +1 -0
index da8053b566..cbe95d4e17 100644

Lines of this file are not shown. View the raw message.

configs/meesc_defconfig +1 -0
index 67bc1edbdf..6f25c9f37c 100644

Lines of this file are not shown. View the raw message.

configs/mpc8308_p1m_defconfig +1 -0
index 114ffeeddb..e2d8424e74 100644

Lines of this file are not shown. View the raw message.

configs/mpr2_defconfig +1 -0
index 3e50c555ca..6578cbda11 100644

Lines of this file are not shown. View the raw message.

configs/ms7720se_defconfig +1 -0
index 1e580f5cd0..51618668bc 100644

Lines of this file are not shown. View the raw message.

configs/ms7722se_defconfig +1 -0
index 642527574b..1b4a3e2ee0 100644

Lines of this file are not shown. View the raw message.

configs/ms7750se_defconfig +1 -0
index 6534dd9d40..55e4866f6a 100644

Lines of this file are not shown. View the raw message.

configs/mt_ventoux_defconfig +1 -0
index 4ace7bdbf3..0fd997bbbb 100644

Lines of this file are not shown. View the raw message.

configs/mx28evk_auart_console_defconfig +1 -0
index 86bd12b9f4..4946fec5ca 100644

Lines of this file are not shown. View the raw message.

configs/mx28evk_defconfig +1 -0
index 13490ec763..3a58656a49 100644

Lines of this file are not shown. View the raw message.

configs/mx28evk_nand_defconfig +1 -0
index d07f41d696..0789af6e7d 100644

Lines of this file are not shown. View the raw message.

configs/mx28evk_spi_defconfig +1 -0
index 621970098e..5b34a988a3 100644

Lines of this file are not shown. View the raw message.

configs/mx31pdk_defconfig +1 -0
index 5dc4d49103..0a083877bc 100644

Lines of this file are not shown. View the raw message.

configs/mx35pdk_defconfig +1 -0
index 78ad716be6..0d916344b2 100644

Lines of this file are not shown. View the raw message.

configs/mx53ard_defconfig +1 -0
index ff5b77cb8b..b543748c82 100644

Lines of this file are not shown. View the raw message.

configs/mx6sabreauto_defconfig +1 -0
index b0fe26425b..ea176c7e6c 100644

Lines of this file are not shown. View the raw message.

configs/mx6sxsabreauto_defconfig +1 -0
index d411a38d3f..3d1aa643db 100644

Lines of this file are not shown. View the raw message.

configs/omap35_logic_defconfig +1 -0
index 6d5b732ff8..9d2cd49094 100644

Lines of this file are not shown. View the raw message.

configs/omap35_logic_somlv_defconfig +1 -0
index a5da1831fd..d103f14291 100644

Lines of this file are not shown. View the raw message.

configs/omap3_beagle_defconfig +1 -0
index 9a5ad656ce..685533cec0 100644

Lines of this file are not shown. View the raw message.

configs/omap3_evm_defconfig +1 -0
index 0bffd156dd..1c43772c98 100644

Lines of this file are not shown. View the raw message.

configs/omap3_ha_defconfig +1 -0
index 0c7e91a922..cc8ff1b5da 100644

Lines of this file are not shown. View the raw message.

configs/omap3_logic_defconfig +1 -0
index 1e8b072608..66b1bd811b 100644

Lines of this file are not shown. View the raw message.

configs/omap3_logic_somlv_defconfig +1 -0
index 8120c97922..63e076d018 100644

Lines of this file are not shown. View the raw message.

configs/omap3_overo_defconfig +1 -0
index c5123665bf..39d7ac6374 100644

Lines of this file are not shown. View the raw message.

configs/omap3_pandora_defconfig +1 -0
index 242d81b53d..2d2a8d2ffd 100644

Lines of this file are not shown. View the raw message.

configs/omap3_zoom1_defconfig +1 -0
index 2aa761f30f..61cc72f587 100644

Lines of this file are not shown. View the raw message.

configs/omapl138_lcdk_defconfig +1 -0
index 31261f3f2d..0b54822529 100644

Lines of this file are not shown. View the raw message.

configs/pengwyn_defconfig +1 -0
index fd416a3270..3646388a09 100644

Lines of this file are not shown. View the raw message.

configs/platinum_picon_defconfig +1 -0
index 8083155af9..5a03eafbf4 100644

Lines of this file are not shown. View the raw message.

configs/platinum_titanium_defconfig +1 -0
index 81d2e74091..ad912f21cc 100644

Lines of this file are not shown. View the raw message.

configs/pm9261_defconfig +1 -0
index f9e12bd834..0d439b4509 100644

Lines of this file are not shown. View the raw message.

configs/pm9263_defconfig +1 -0
index 14a4c9d3bd..aa7e6f0553 100644

Lines of this file are not shown. View the raw message.

configs/pm9g45_defconfig +1 -0
index 20238e4339..9ff4682221 100644

Lines of this file are not shown. View the raw message.

configs/pxm2_defconfig +1 -0
index e61458b326..0cd7fe9394 100644

Lines of this file are not shown. View the raw message.

configs/qemu_mips64_defconfig +1 -0
index aff109512e..9bf4c64b34 100644

Lines of this file are not shown. View the raw message.

configs/qemu_mips64el_defconfig +1 -0
index 63cbd44c0d..370ee47b5b 100644

Lines of this file are not shown. View the raw message.

configs/qemu_mips_defconfig +1 -0
index 37bf69f9e8..5e302ba825 100644

Lines of this file are not shown. View the raw message.

configs/qemu_mipsel_defconfig +1 -0
index 82091b97df..c729ac1f5c 100644

Lines of this file are not shown. View the raw message.

configs/r0p7734_defconfig +1 -0
index 111cb5da90..138205f87d 100644

Lines of this file are not shown. View the raw message.

configs/r2dplus_defconfig +1 -0
index 4c1912c8a1..5c0defbcd3 100644

Lines of this file are not shown. View the raw message.

configs/r7780mp_defconfig +1 -0
index 7862312d23..fbb4cb238b 100644

Lines of this file are not shown. View the raw message.

configs/r8a77995_draak_defconfig +1 -0
index 3b1412030c..4168f2a9ac 100644

Lines of this file are not shown. View the raw message.

configs/rastaban_defconfig +1 -0
index c237b8f83a..3ccaf6cc71 100644

Lines of this file are not shown. View the raw message.

configs/rsk7203_defconfig +1 -0
index 231d699270..3ac16e4231 100644

Lines of this file are not shown. View the raw message.

configs/rsk7264_defconfig +1 -0
index 2ae70842a8..dcec399444 100644

Lines of this file are not shown. View the raw message.

configs/rsk7269_defconfig +1 -0
index 3d2b03cc57..1a72295c24 100644

Lines of this file are not shown. View the raw message.

configs/rut_defconfig +1 -0
index a51ba173e4..e712692b83 100644

Lines of this file are not shown. View the raw message.

configs/sama5d2_ptc_ek_mmc_defconfig +1 -0
index 982a658d11..aa15a5a72a 100644

Lines of this file are not shown. View the raw message.

configs/sama5d36ek_cmp_mmc_defconfig +1 -0
index 7b7cecd39c..ea05d1e73a 100644

Lines of this file are not shown. View the raw message.

configs/sama5d36ek_cmp_spiflash_defconfig +1 -0
index f6f3dd324d..f7ad5128d0 100644

Lines of this file are not shown. View the raw message.

configs/sama5d3_xplained_mmc_defconfig +1 -0
index 790ae0dfdd..a88fabf6a4 100644

Lines of this file are not shown. View the raw message.

configs/sama5d3xek_mmc_defconfig +1 -0
index d78ef725ef..cff541f755 100644

Lines of this file are not shown. View the raw message.

configs/sama5d3xek_nandflash_defconfig +1 -0
index e641279ee1..c70a312102 100644

Lines of this file are not shown. View the raw message.

configs/sama5d3xek_spiflash_defconfig +1 -0
index 09f09d769e..6d59b4695e 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4_xplained_mmc_defconfig +1 -0
index e6ee4b975c..a0152b1b51 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4_xplained_spiflash_defconfig +1 -0
index 84258eaa25..9983118d8d 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4ek_mmc_defconfig +1 -0
index b1eb130f3f..fcac1523d0 100644

Lines of this file are not shown. View the raw message.

configs/sama5d4ek_spiflash_defconfig +1 -0
index f0bd1a9c36..c4ff3eec27 100644

Lines of this file are not shown. View the raw message.

configs/sbc8349_PCI_33_defconfig +1 -0
index 02d5185124..046c434c3e 100644

Lines of this file are not shown. View the raw message.

configs/sbc8349_PCI_66_defconfig +1 -0
index 945c5229b9..58cc824562 100644

Lines of this file are not shown. View the raw message.

configs/sbc8349_defconfig +1 -0
index 82379e67d2..846d423e66 100644

Lines of this file are not shown. View the raw message.

configs/sbc8548_PCI_33_PCIE_defconfig +1 -0
index 5a04646a7e..bafc1aab24 100644

Lines of this file are not shown. View the raw message.

configs/sbc8548_PCI_33_defconfig +1 -0
index 36291e0e7a..93cc1d7029 100644

Lines of this file are not shown. View the raw message.

configs/sbc8548_PCI_66_PCIE_defconfig +1 -0
index cfe0f3a340..3a725900e5 100644

Lines of this file are not shown. View the raw message.

configs/sbc8548_PCI_66_defconfig +1 -0
index e4b3c63def..d2cb72c1d1 100644

Lines of this file are not shown. View the raw message.

configs/sbc8548_defconfig +1 -0
index 33be2b90df..f6d22e50a7 100644

Lines of this file are not shown. View the raw message.

configs/sbc8641d_defconfig +1 -0
index d1ffea5afb..a578e24a65 100644

Lines of this file are not shown. View the raw message.

configs/sfr_nb4-ser_ram_defconfig +1 -0
index 04a4ba9d46..4b8bfc347d 100644

Lines of this file are not shown. View the raw message.

configs/sh7763rdp_defconfig +1 -0
index 89fdc98ee6..8bc809ae80 100644

Lines of this file are not shown. View the raw message.

configs/sh7785lcr_32bit_defconfig +1 -0
index b520be5c37..9e382a5ef3 100644

Lines of this file are not shown. View the raw message.

configs/sh7785lcr_defconfig +1 -0
index d48ba73346..0cbf59b40d 100644

Lines of this file are not shown. View the raw message.

configs/shmin_defconfig +1 -0
index 4686e67efd..20e3b69842 100644

Lines of this file are not shown. View the raw message.

configs/smartweb_defconfig +1 -0
index 7216ba55d2..46b966b5e9 100644

Lines of this file are not shown. View the raw message.

configs/snapper9260_defconfig +1 -0
index 8bf36ece01..2557086635 100644

Lines of this file are not shown. View the raw message.

configs/snapper9g20_defconfig +1 -0
index 4d83736623..ee237e1f77 100644

Lines of this file are not shown. View the raw message.

configs/socrates_defconfig +1 -0
index 2d5e158871..92e9fd0eda 100644

Lines of this file are not shown. View the raw message.

configs/stm32f429-discovery_defconfig +1 -0
index ef0f6f7373..0faacd7cb4 100644

Lines of this file are not shown. View the raw message.

configs/stm32f429-evaluation_defconfig +1 -0
index 6a2ed2a9b0..7c1992831e 100644

Lines of this file are not shown. View the raw message.

configs/stm32f469-discovery_defconfig +1 -0
index 0b36c0fc58..b08018a469 100644

Lines of this file are not shown. View the raw message.

configs/stm32f746-disco_defconfig +1 -0
index b996283485..5307ba8f46 100644

Lines of this file are not shown. View the raw message.

configs/strider_con_defconfig +1 -0
index 24c793dfc5..2721a14053 100644

Lines of this file are not shown. View the raw message.

configs/strider_con_dp_defconfig +1 -0
index c70d99a7e6..a2206bce80 100644

Lines of this file are not shown. View the raw message.

configs/strider_cpu_defconfig +1 -0
index fef58848af..338f47f42d 100644

Lines of this file are not shown. View the raw message.

configs/strider_cpu_dp_defconfig +1 -0
index fc8f39eb54..e21fe6bb69 100644

Lines of this file are not shown. View the raw message.

configs/tao3530_defconfig +1 -0
index 8112bb1368..87d57aa5f6 100644

Lines of this file are not shown. View the raw message.

configs/taurus_defconfig +1 -0
index aac54c4f2e..c87b22f5be 100644

Lines of this file are not shown. View the raw message.

configs/thuban_defconfig +1 -0
index 63afc1dd00..f87328e47b 100644

Lines of this file are not shown. View the raw message.

configs/ti816x_evm_defconfig +1 -0
index b669130895..89a660065c 100644

Lines of this file are not shown. View the raw message.

configs/titanium_defconfig +1 -0
index 2375c5e520..56d0a6309f 100644

Lines of this file are not shown. View the raw message.

configs/tricorder_defconfig +1 -0
index 1a561a1ab4..c7e52e2f64 100644

Lines of this file are not shown. View the raw message.

configs/tricorder_flash_defconfig +1 -0
index 1c3401e5fd..a46e1a6d99 100644

Lines of this file are not shown. View the raw message.

configs/twister_defconfig +1 -0
index 8a26dc8992..82220318a3 100644

Lines of this file are not shown. View the raw message.

configs/uniphier_ld4_sld8_defconfig +1 -0
index b2027db806..776f54cc5f 100644

Lines of this file are not shown. View the raw message.

configs/uniphier_v7_defconfig +1 -0
index fc1e931050..c9c37bf108 100644

Lines of this file are not shown. View the raw message.

configs/uniphier_v8_defconfig +1 -0
index cafcec4fdb..b781cd8992 100644

Lines of this file are not shown. View the raw message.

configs/usb_a9263_dataflash_defconfig +1 -0
index 3fa40363d3..e8c130a18e 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinum_defconfig +1 -0
index 2a35ace0e0..c0e405e23c 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinum_small_defconfig +1 -0
index 8a3f94aadf..e65b9f3d81 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinumavc_defconfig +1 -0
index 3783becc8a..af3f21cb17 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinumavc_small_defconfig +1 -0
index 0d8cd07f9f..32f25743fc 100644

Lines of this file are not shown. View the raw message.

configs/vct_premium_defconfig +1 -0
index 2396b24d55..fb8af2914d 100644

Lines of this file are not shown. View the raw message.

configs/vct_premium_small_defconfig +1 -0
index a8eba61827..8d93c5e355 100644

Lines of this file are not shown. View the raw message.

configs/ve8313_defconfig +1 -0
index 584aafb08f..43dc9dac5e 100644

Lines of this file are not shown. View the raw message.

configs/vexpress_aemv8a_dram_defconfig +1 -0
index 9848f96293..709c5a927b 100644

Lines of this file are not shown. View the raw message.

configs/vexpress_aemv8a_juno_defconfig +1 -0
index ef38915955..2faa83bf4d 100644

Lines of this file are not shown. View the raw message.

configs/vexpress_aemv8a_semi_defconfig +1 -0
index a4d1233cd5..1c92be9199 100644

Lines of this file are not shown. View the raw message.

configs/vexpress_ca15_tc2_defconfig +1 -0
index f4d555be48..b4108b92ba 100644

Lines of this file are not shown. View the raw message.

configs/vexpress_ca5x2_defconfig +1 -0
index bdacc60c2c..135de1676d 100644

Lines of this file are not shown. View the raw message.

configs/vexpress_ca9x4_defconfig +1 -0
index 7a90831918..024715b522 100644

Lines of this file are not shown. View the raw message.

configs/vme8349_defconfig +1 -0
index a7d81a3a0f..6c45330edf 100644

Lines of this file are not shown. View the raw message.

configs/wb45n_defconfig +1 -0
index beab78bc19..0051f6fa3f 100644

Lines of this file are not shown. View the raw message.

configs/wb50n_defconfig +1 -0
index 4c3367b7ec..7d6f344f81 100644

Lines of this file are not shown. View the raw message.

configs/woodburn_defconfig +1 -0
index 6fb8325664..eda1e192a4 100644

Lines of this file are not shown. View the raw message.

configs/woodburn_sd_defconfig +1 -0
index b28828d5d6..1f2ec1ad2c 100644

Lines of this file are not shown. View the raw message.

configs/x600_defconfig +1 -0
index c8f5f66232..c452ba85bc 100644

Lines of this file are not shown. View the raw message.

configs/xilinx_zynqmp_mini_nand_defconfig +1 -0
index f3c55b470b..1e50ecd6ca 100644

Lines of this file are not shown. View the raw message.

configs/xpedite517x_defconfig +1 -0
index d2d8313da6..be52f0cf8e 100644

Lines of this file are not shown. View the raw message.

configs/xpedite520x_defconfig +1 -0
index 1c0bd951ee..90b3f287d3 100644

Lines of this file are not shown. View the raw message.

configs/xpedite537x_defconfig +1 -0
index e009aabb55..cdbc072121 100644

Lines of this file are not shown. View the raw message.

configs/xpedite550x_defconfig +1 -0
index 5d3569b34d..5ab5fa8696 100644

Lines of this file are not shown. View the raw message.

configs/xtfpga_defconfig +1 -0
index e95b6649a3..99edf7f1c8 100644

Lines of this file are not shown. View the raw message.

configs/zipitz2_defconfig +1 -0
index 509adcffd9..b04e7674e9 100644

Lines of this file are not shown. View the raw message.

configs/zmx25_defconfig +1 -0
index 60f0efd46e..47b0598545 100644

Lines of this file are not shown. View the raw message.

configs/zynq_cse_nor_defconfig +1 -0
index b4831f89a1..a79d013091 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc770_xm012_defconfig +1 -0
index aa20971e44..14be1ecc12 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.19.1

Part of the diff is not shown here. View the raw message.

#11 lore raw

PATCH v3 5/28 mtd: ensure MTD is compiled when there is a NOR flash

In reply to Miquel Raynal

Dear Miquel Raynal,

Quoted 1 line · In message <[email protected]> you wrote:

CONFIG_MTD must be enabled when there is a NOR flash selected.

This is a fundamental breakage. See previous messages.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
: ... and it's got weird formatting - Notepad, Write, Works  3  can't
: decipher it, and it's too big to go in DOS Edit. Help!
Install an operating system. :-)                  -- Tom Christiansen
author maintainer
#12 lore raw

PATCH v3 6/28 mtd: ensure MTD/the raw NAND core are compiled when there is a NAND flash

In reply to Miquel Raynal

Both symbols must be enabled when there is a raw NAND driver selected. Also enable them when CONFIG_CMD_NAND is selected to do not break any build during later cleanup.

---
 configs/M54418TWR_nand_mii_defconfig                 | 2 ++
 configs/M54418TWR_nand_rmii_defconfig                | 2 ++
 configs/M54418TWR_nand_rmii_lowfreq_defconfig        | 2 ++
 configs/at91sam9m10g45ek_nandflash_defconfig         | 2 ++
 configs/at91sam9n12ek_nandflash_defconfig            | 2 ++
 configs/at91sam9x5ek_nandflash_defconfig             | 2 ++
 configs/axs101_defconfig                             | 2 ++
 configs/axs103_defconfig                             | 2 ++
 configs/colibri-imx6ull_defconfig                    | 1 +
 configs/colibri_t20_defconfig                        | 2 ++
 configs/dns325_defconfig                             | 2 ++
 configs/dockstar_defconfig                           | 2 ++
 configs/goflexhome_defconfig                         | 2 ++
 configs/guruplug_defconfig                           | 2 ++
 configs/ib62x0_defconfig                             | 2 ++
 configs/iconnect_defconfig                           | 2 ++
 configs/km_kirkwood_128m16_defconfig                 | 2 ++
 configs/km_kirkwood_defconfig                        | 2 ++
 configs/km_kirkwood_pci_defconfig                    | 2 ++
 configs/kmcoge5un_defconfig                          | 2 ++
 configs/kmnusa_defconfig                             | 2 ++
 configs/kmsugp1_defconfig                            | 2 ++
 configs/kmsuv31_defconfig                            | 2 ++
 configs/ls1046ardb_emmc_defconfig                    | 2 ++
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig        | 2 ++
 configs/ls1046ardb_qspi_defconfig                    | 2 ++
 configs/ls1046ardb_qspi_spl_defconfig                | 2 ++
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig      | 2 ++
 configs/ls1046ardb_sdcard_defconfig                  | 2 ++
 configs/ls1088aqds_defconfig                         | 1 +
 configs/ls1088aqds_qspi_SECURE_BOOT_defconfig        | 2 ++
 configs/ls1088aqds_qspi_defconfig                    | 2 ++
 configs/ls1088aqds_sdcard_ifc_defconfig              | 1 +
 configs/ls1088aqds_sdcard_qspi_defconfig             | 2 ++
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig        | 2 ++
 configs/ls1088ardb_qspi_defconfig                    | 2 ++
 configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 2 ++
 configs/ls1088ardb_sdcard_qspi_defconfig             | 2 ++
 configs/ls2080aqds_nand_defconfig                    | 2 ++
 configs/ls2080aqds_qspi_defconfig                    | 2 ++
 configs/ls2080aqds_sdcard_defconfig                  | 2 ++
 configs/medcom-wide_defconfig                        | 2 ++
 configs/mgcoge3un_defconfig                          | 2 ++
 configs/nas220_defconfig                             | 2 ++
 configs/nsa310s_defconfig                            | 2 ++
 configs/openrd_base_defconfig                        | 2 ++
 configs/openrd_client_defconfig                      | 2 ++
 configs/openrd_ultimate_defconfig                    | 2 ++
 configs/pcm052_defconfig                             | 2 ++
 configs/pcm058_defconfig                             | 1 +
 configs/pfla02_defconfig                             | 1 +
 configs/plutux_defconfig                             | 2 ++
 configs/pogo_e02_defconfig                           | 2 ++
 configs/portl2_defconfig                             | 2 ++
 configs/sama5d2_ptc_ek_nandflash_defconfig           | 2 ++
 configs/sama5d36ek_cmp_nandflash_defconfig           | 2 ++
 configs/sama5d3_xplained_nandflash_defconfig         | 2 ++
 configs/sama5d3xek_nandflash_defconfig               | 1 +
 configs/sama5d4_xplained_nandflash_defconfig         | 2 ++
 configs/sama5d4ek_nandflash_defconfig                | 2 ++
 configs/seaboard_defconfig                           | 2 ++
 configs/sheevaplug_defconfig                         | 2 ++
 configs/tec_defconfig                                | 2 ++
 configs/vf610twr_defconfig                           | 2 ++
 configs/vf610twr_nand_defconfig                      | 2 ++
 configs/work_92105_defconfig                         | 2 ++
 configs/x600_defconfig                               | 1 +
 67 files changed, 127 insertions(+)
configs/M54418TWR_nand_mii_defconfig +2 -0
index 04ca3a8114..f05e340543 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_MII=y
configs/M54418TWR_nand_rmii_defconfig +2 -0
index f6acf6019d..5f958e0333 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_MII=y
configs/M54418TWR_nand_rmii_lowfreq_defconfig +2 -0
index 6b631d6d4b..8889e7cd4d 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_MII=y
configs/at91sam9m10g45ek_nandflash_defconfig +2 -0
index f8101f5fd4..a18eac5574 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/at91sam9n12ek_nandflash_defconfig +2 -0
index 354c24ff16..29a7612ae8 100644
@@ -32,6 +32,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
configs/at91sam9x5ek_nandflash_defconfig +2 -0
index b2b3ddb6d9..ed305c8213 100644
@@ -41,6 +41,8 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/axs101_defconfig +2 -0
index b4621c359f..9b946a913f 100644
@@ -30,6 +30,8 @@ CONFIG_DEFAULT_DEVICE_TREE="axs101"
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_INTERFACE="mmc"
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
configs/axs103_defconfig +2 -0
index e7894d297c..9c26474a67 100644
@@ -30,6 +30,8 @@ CONFIG_DEFAULT_DEVICE_TREE="axs103"
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_INTERFACE="mmc"
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
configs/colibri-imx6ull_defconfig +1 -0
index a2fe3da629..e9faf3a204 100644
@@ -48,6 +48,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
configs/colibri_t20_defconfig +2 -0
index 328dd725aa..c360497355 100644
@@ -37,6 +37,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_DM_PMIC=y
configs/dns325_defconfig +2 -0
index 5a76698160..5e6b59db0c 100644
@@ -28,6 +28,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
configs/dockstar_defconfig +2 -0
index 41dfbd3263..eabd1bd037 100644
@@ -25,6 +25,8 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar"
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/goflexhome_defconfig +2 -0
index c04bf0ea57..2dff9d68eb 100644
@@ -32,6 +32,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
configs/guruplug_defconfig +2 -0
index 9998e48ab9..95c21d6ea2 100644
@@ -32,6 +32,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
configs/ib62x0_defconfig +2 -0
index 985d85e027..e846210cb4 100644
@@ -29,6 +29,8 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ib62x0"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/iconnect_defconfig +2 -0
index c075bfb2cf..62766fd6de 100644
@@ -24,6 +24,8 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect"
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/km_kirkwood_128m16_defconfig +2 -0
index b55b8b0424..a0d0fef4e8 100644
@@ -34,6 +34,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/km_kirkwood_defconfig +2 -0
index b47b9e36fb..86d2379c5f 100644
@@ -34,6 +34,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/km_kirkwood_pci_defconfig +2 -0
index fb18630874..8494d4ff49 100644
@@ -34,6 +34,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/kmcoge5un_defconfig +2 -0
index 598af88cd9..3f3f2cc7a9 100644
@@ -34,6 +34,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/kmnusa_defconfig +2 -0
index 8b3fa7efac..6e8214a4d8 100644
@@ -34,6 +34,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/kmsugp1_defconfig +2 -0
index d2206b4c3c..3f72be007b 100644
@@ -34,6 +34,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/kmsuv31_defconfig +2 -0
index 62d3a0a1d0..e593ad3a26 100644
@@ -34,6 +34,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/ls1046ardb_emmc_defconfig +2 -0
index f7a35c7e19..b23ba51dd5 100644
@@ -44,6 +44,8 @@ CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +2 -0
index 80f52807e1..300f1dfa16 100644
@@ -28,6 +28,8 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
 CONFIG_DM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
configs/ls1046ardb_qspi_defconfig +2 -0
index e780acc446..f01d1080e8 100644
@@ -29,6 +29,8 @@ CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHYLIB=y
configs/ls1046ardb_qspi_spl_defconfig +2 -0
index f7cd33d8af..bca5feef35 100644
@@ -46,6 +46,8 @@ CONFIG_SPL_ENV_IS_NOWHERE=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +2 -0
index 24a08b6e01..0510c4d644 100644
@@ -43,6 +43,8 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/ls1046ardb_sdcard_defconfig +2 -0
index 61da6ae517..1a2163f8f9 100644
@@ -43,6 +43,8 @@ CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_AQUANTIA=y
configs/ls1088aqds_defconfig +1 -0
index 8013214689..1c1c727157 100644
@@ -31,6 +31,7 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +2 -0
index b184d23295..d5917ab486 100644
@@ -32,6 +32,8 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
configs/ls1088aqds_qspi_defconfig +2 -0
index c63426d0cd..fb513370b5 100644
@@ -32,6 +32,8 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
configs/ls1088aqds_sdcard_ifc_defconfig +1 -0
index 40231e4c00..e3880c125f 100644
@@ -41,6 +41,7 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/ls1088aqds_sdcard_qspi_defconfig +2 -0
index f83c17b81b..ea22ae0bca 100644
@@ -42,6 +42,8 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +2 -0
index ff72ec5edc..de7b0d917c 100644
@@ -33,6 +33,8 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
configs/ls1088ardb_qspi_defconfig +2 -0
index 089faa484e..cc25165de0 100644
@@ -33,6 +33,8 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +2 -0
index f7ec11fe05..dd1aa65608 100644
@@ -45,6 +45,8 @@ CONFIG_SPL_DM=y
 CONFIG_SCSI_AHCI=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
configs/ls1088ardb_sdcard_qspi_defconfig +2 -0
index b56e11ed3a..433823bcdf 100644
@@ -43,6 +43,8 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
configs/ls2080aqds_nand_defconfig +2 -0
index 1f93a8378c..14af49255f 100644
@@ -39,6 +39,8 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
configs/ls2080aqds_qspi_defconfig +2 -0
index 32eec9a99d..821d93c1ed 100644
@@ -35,6 +35,8 @@ CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_GIGE=y
configs/ls2080aqds_sdcard_defconfig +2 -0
index a71913d65c..343c2fe969 100644
@@ -52,6 +52,8 @@ CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE=y
 CONFIG_SYS_NS16550=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/medcom-wide_defconfig +2 -0
index c2cd298aaa..bad50c4942 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_DM=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
configs/mgcoge3un_defconfig +2 -0
index 0c2785c095..faddfa65a5 100644
@@ -34,6 +34,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/nas220_defconfig +2 -0
index 6bd308bb82..5585dfd701 100644
@@ -29,6 +29,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
configs/nsa310s_defconfig +2 -0
index eb29a70157..cbee88022b 100644
@@ -26,6 +26,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/openrd_base_defconfig +2 -0
index a01f1fe94e..4ceb9e2291 100644
@@ -31,6 +31,8 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/openrd_client_defconfig +2 -0
index 0d17485fbb..8f6e6319b8 100644
@@ -29,6 +29,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC_HW_PARTITIONING is not set
 CONFIG_MVGBE=y
configs/openrd_ultimate_defconfig +2 -0
index 79c8f7fb08..d3111ee1f9 100644
@@ -29,6 +29,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC_HW_PARTITIONING is not set
 CONFIG_MVGBE=y
configs/pcm052_defconfig +2 -0
index 0c8e31a9ec..2cd9e7bee7 100644
@@ -30,6 +30,8 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_VYBRID_GPIO=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_PHYLIB=y
configs/pcm058_defconfig +1 -0
index b346aac223..c831d1210d 100644
@@ -42,6 +42,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
configs/pfla02_defconfig +1 -0
index e3eb2ce523..d0ae55f2e1 100644
@@ -41,6 +41,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
configs/plutux_defconfig +2 -0
index 73524122de..c3d67777c8 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_DM=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
configs/pogo_e02_defconfig +2 -0
index 3aef5b590a..fe08911e23 100644
@@ -24,6 +24,8 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02"
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
configs/portl2_defconfig +2 -0
index 7d2e97a6f0..8fb6ffd43d 100644
@@ -32,6 +32,8 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MVGBE=y
configs/sama5d2_ptc_ek_nandflash_defconfig +2 -0
index dd6068dd46..392e1bc8a3 100644
@@ -48,6 +48,8 @@ CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ATMEL=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/sama5d36ek_cmp_nandflash_defconfig +2 -0
index ca8cce9de0..fc64206df1 100644
@@ -41,6 +41,8 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d3_xplained_nandflash_defconfig +2 -0
index ff7d2bffdd..e780722e3b 100644
@@ -55,6 +55,8 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y
configs/sama5d3xek_nandflash_defconfig +1 -0
index c70a312102..3636dadfac 100644
@@ -57,6 +57,7 @@ CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
configs/sama5d4_xplained_nandflash_defconfig +2 -0
index 2c1b7f17c0..effb29ae37 100644
@@ -53,6 +53,8 @@ CONFIG_SYS_I2C_AT91=y
 CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/sama5d4ek_nandflash_defconfig +2 -0
index 1497110452..197140f751 100644
@@ -53,6 +53,8 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/seaboard_defconfig +2 -0
index 69e159b43e..492e820097 100644
@@ -41,3 +41,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_AES=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
configs/sheevaplug_defconfig +2 -0
index 04b00cdea9..7176b3d85d 100644
@@ -31,6 +31,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 CONFIG_MVGBE=y
configs/tec_defconfig +2 -0
index 62526a7470..9e730a568c 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_SPL_DM=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
configs/vf610twr_defconfig +2 -0
index a928cd4fbc..c8c46e9c64 100644
@@ -33,6 +33,8 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_VYBRID_GPIO=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
configs/vf610twr_nand_defconfig +2 -0
index 560776fe56..5b7037bb9f 100644
@@ -33,6 +33,8 @@ CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_VYBRID_GPIO=y
 CONFIG_FSL_ESDHC=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
configs/work_92105_defconfig +2 -0
index 105e51a400..13e91c1bbe 100644
@@ -34,6 +34,8 @@ CONFIG_CMD_DATE=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_SYS_NS16550=y
configs/x600_defconfig +1 -0
index c452ba85bc..3797a443d6 100644
@@ -47,6 +47,7 @@ CONFIG_FPGA_SPARTAN3=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_MICREL=y
Signature · 1 line
2.19.1
#13 lore raw

PATCH v3 6/28 mtd: ensure MTD/the raw NAND core are compiled when there is a NAND flash

Quoted 3 lines · On Wed, 5 Dec 2018 00:56:52 +0100 Miquel Raynal <[email protected]>…

Both symbols must be enabled when there is a raw NAND driver selected. Also enable them when CONFIG_CMD_NAND is selected to do not break any build during later cleanup.

"... to avoid breaking things when we'll further rework the MTD dependency description" or something like along those lines.

Quoted 2 lines

Other than that

#14 lore raw

PATCH v3 6/28 mtd: ensure MTD/the raw NAND core are compiled when there is a NAND flash

In reply to Miquel Raynal

Dear Miquel Raynal,

Quoted 3 lines · In message <[email protected]> you wrote:

Both symbols must be enabled when there is a raw NAND driver selected. Also enable them when CONFIG_CMD_NAND is selected to do not break any build during later cleanup.

Why would we need MTD for raw NAND support in U-Boot?
It is perfectly fine to access NAND based on addesses / offsets, isn't it? MTD creates just overhead which is not needed on some systems, and which may not be acceptable due to size limitations on other.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
When all else fails, read the instructions.
author maintainer
#15 lore raw

PATCH v3 7/28 mtd: ensure MTD is compiled when there is a SPI NOR flash using MTD

In reply to Miquel Raynal

MTD must be enabled when there is a SPI NOR flash using the SPI_FLASH_MTD config entry.

---
 configs/ap121_defconfig                 | 1 +
 configs/ap143_defconfig                 | 1 +
 configs/bk4r1_defconfig                 | 1 +
 configs/clearfog_defconfig              | 1 +
 configs/comtrend_ar5315u_ram_defconfig  | 1 +
 configs/comtrend_ar5387un_ram_defconfig | 1 +
 configs/evb-rv1108_defconfig            | 1 +
 configs/helios4_defconfig               | 1 +
 configs/linkit-smart-7688-ram_defconfig | 1 +
 configs/linkit-smart-7688_defconfig     | 1 +
 configs/netgear_cg3100d_ram_defconfig   | 1 +
 configs/sagem_f at st1704_ram_defconfig    | 1 +
 configs/tplink_wdr4300_defconfig        | 1 +
 13 files changed, 13 insertions(+)
configs/ap121_defconfig +1 -0
index 5d54267cd3..9e3af6750b 100644
@@ -34,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="ap121"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/ap143_defconfig +1 -0
index 83eb583b56..6851df6d81 100644
@@ -33,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="ap143"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_NET is not set
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/bk4r1_defconfig +1 -0
index cf1fd0b6c6..bf2d94394b 100644
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_MTD=y
configs/clearfog_defconfig +1 -0
index 2e59686291..7c0c9e0762 100644
@@ -47,6 +47,7 @@ CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/comtrend_ar5315u_ram_defconfig +1 -0
index d9ef52e68d..7d58c6c90b 100644
@@ -38,6 +38,7 @@ CONFIG_LED=y
 CONFIG_LED_BCM6328=y
 CONFIG_LED_BLINK=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_MTD=y
configs/comtrend_ar5387un_ram_defconfig +1 -0
index f129870ca0..f16b367707 100644
@@ -38,6 +38,7 @@ CONFIG_LED=y
 CONFIG_LED_BCM6328=y
 CONFIG_LED_BLINK=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_MTD=y
configs/evb-rv1108_defconfig +1 -0
index 2ef041f2c5..96522a3a96 100644
@@ -28,6 +28,7 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
configs/helios4_defconfig +1 -0
index e30eb3d41c..03fc8d144b 100644
@@ -42,6 +42,7 @@ CONFIG_DM_I2C=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/linkit-smart-7688-ram_defconfig +1 -0
index 77cd1c1575..dba5ef5d2a 100644
@@ -33,6 +33,7 @@ CONFIG_DM_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_BLINK=y
 CONFIG_LED_GPIO=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/linkit-smart-7688_defconfig +1 -0
index 62cdda1e0a..c5d6706587 100644
@@ -37,6 +37,7 @@ CONFIG_DM_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_BLINK=y
 CONFIG_LED_GPIO=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netgear_cg3100d_ram_defconfig +1 -0
index 83e82247ab..1e7cd85f4f 100644
@@ -38,6 +38,7 @@ CONFIG_LED_BCM6328=y
 CONFIG_LED_BLINK=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_MTD=y
configs/sagem_f at st1704_ram_defconfig +1 -0
index 91a966327a..67394e9ab0 100644
@@ -37,6 +37,7 @@ CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_MTD=y
configs/tplink_wdr4300_defconfig +1 -0
index 12ebd989a2..bca3ae8385 100644
@@ -24,6 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tplink_wdr4300"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
Signature · 1 line
2.19.1
maintainer
#16 lore raw

PATCH v3 7/28 mtd: ensure MTD is compiled when there is a SPI NOR flash using MTD

Hi Miquel,

Quoted 3 lines · Miquel Raynal

MTD must be enabled when there is a SPI NOR flash using the SPI_FLASH_MTD config entry.

I suggest to add Kconfig dependency b/w SPI_FLASH_MTD and MTD. Something like:

drivers/mtd/spi/Kconfig +1 -1
index d735884b48db..6405fd1452d2 100644
@@ -144,7 +144,7 @@ config SPI_FLASH_DATAFLASH
 
 config SPI_FLASH_MTD
        bool "SPI Flash MTD support"
-       depends on SPI_FLASH
+       depends on SPI_FLASH && MTD
        help
           Enable the MTD support for spi flash layer, this adapter is for
          translating mtd_read/mtd_write commands into spi_flash_read/write

Regards
Vignesh

Quoted 174 lines
---
 configs/ap121_defconfig                 | 1 +
 configs/ap143_defconfig                 | 1 +
 configs/bk4r1_defconfig                 | 1 +
 configs/clearfog_defconfig              | 1 +
 configs/comtrend_ar5315u_ram_defconfig  | 1 +
 configs/comtrend_ar5387un_ram_defconfig | 1 +
 configs/evb-rv1108_defconfig            | 1 +
 configs/helios4_defconfig               | 1 +
 configs/linkit-smart-7688-ram_defconfig | 1 +
 configs/linkit-smart-7688_defconfig     | 1 +
 configs/netgear_cg3100d_ram_defconfig   | 1 +
 configs/sagem_f at st1704_ram_defconfig    | 1 +
 configs/tplink_wdr4300_defconfig        | 1 +
 13 files changed, 13 insertions(+)
configs/ap121_defconfig +1 -0
index 5d54267cd3..9e3af6750b 100644
@@ -34,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="ap121"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/ap143_defconfig +1 -0
index 83eb583b56..6851df6d81 100644
@@ -33,6 +33,7 @@ CONFIG_DEFAULT_DEVICE_TREE="ap143"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 # CONFIG_NET is not set
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_ATMEL=y
configs/bk4r1_defconfig +1 -0
index cf1fd0b6c6..bf2d94394b 100644
@@ -34,6 +34,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_MTD=y
configs/clearfog_defconfig +1 -0
index 2e59686291..7c0c9e0762 100644
@@ -47,6 +47,7 @@ CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/comtrend_ar5315u_ram_defconfig +1 -0
index d9ef52e68d..7d58c6c90b 100644
@@ -38,6 +38,7 @@ CONFIG_LED=y
 CONFIG_LED_BCM6328=y
 CONFIG_LED_BLINK=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_MTD=y
configs/comtrend_ar5387un_ram_defconfig +1 -0
index f129870ca0..f16b367707 100644
@@ -38,6 +38,7 @@ CONFIG_LED=y
 CONFIG_LED_BCM6328=y
 CONFIG_LED_BLINK=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_MTD=y
configs/evb-rv1108_defconfig +1 -0
index 2ef041f2c5..96522a3a96 100644
@@ -28,6 +28,7 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
configs/helios4_defconfig +1 -0
index e30eb3d41c..03fc8d144b 100644
@@ -42,6 +42,7 @@ CONFIG_DM_I2C=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_WINBOND=y
configs/linkit-smart-7688-ram_defconfig +1 -0
index 77cd1c1575..dba5ef5d2a 100644
@@ -33,6 +33,7 @@ CONFIG_DM_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_BLINK=y
 CONFIG_LED_GPIO=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/linkit-smart-7688_defconfig +1 -0
index 62cdda1e0a..c5d6706587 100644
@@ -37,6 +37,7 @@ CONFIG_DM_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_BLINK=y
 CONFIG_LED_GPIO=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/netgear_cg3100d_ram_defconfig +1 -0
index 83e82247ab..1e7cd85f4f 100644
@@ -38,6 +38,7 @@ CONFIG_LED_BCM6328=y
 CONFIG_LED_BLINK=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_MTD=y
configs/sagem_f at st1704_ram_defconfig +1 -0
index 91a966327a..67394e9ab0 100644
@@ -37,6 +37,7 @@ CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_MTD=y
configs/tplink_wdr4300_defconfig +1 -0
index 12ebd989a2..bca3ae8385 100644
@@ -24,6 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tplink_wdr4300"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CLK=y
 CONFIG_DM_SPI_FLASH=y
+CONFIG_MTD=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_EON=y
author maintainer
#17 lore raw

PATCH v3 7/28 mtd: ensure MTD is compiled when there is a SPI NOR flash using MTD

Hi Vignesh,

Thanks for reviewing!

Vignesh R <[email protected]> wrote on Wed, 5 Dec 2018 11:28:29 +0530:

Quoted 14 lines

Hi Miquel,

Quoted 3 lines · Miquel Raynal

MTD must be enabled when there is a SPI NOR flash using the SPI_FLASH_MTD config entry.

I suggest to add Kconfig dependency b/w SPI_FLASH_MTD and MTD. Something like:

drivers/mtd/spi/Kconfig +0 -0
index d735884b48db..6405fd1452d2 100644

drivers/mtd/spi/Kconfig config SPI_FLASH_DATAFLASH · line 150

Quoted 8 lines
drivers/mtd/spi/Kconfig +1 -1
@@ -144,7 +144,7 @@ config SPI_FLASH_DATAFLASH
 
 config SPI_FLASH_MTD
        bool "SPI Flash MTD support"
-       depends on SPI_FLASH
+       depends on SPI_FLASH && MTD
        help
           Enable the MTD support for spi flash layer, this adapter is for
          translating mtd_read/mtd_write commands into spi_flash_read/write

I do agree; I could add another patch for this and also do another check on defconfigs having SPI_FLASH_MTD and missing MTD.

Thanks,
Miquèl