Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT

We move all instances of CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT from the header files to the defconfig files. There's a few cases here where we need to expand upon what was in the header file.

Signed-off-by Tom Rini <[email protected]>

---
 cmd/Kconfig                                        |  7 +++---
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig        |  2 ++
 configs/BSC9131RDB_NAND_defconfig                  |  2 ++
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig    |  2 ++
 configs/BSC9131RDB_SPIFLASH_defconfig              |  2 ++
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |  2 ++
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig        |  2 ++
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |  2 ++
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig        |  2 ++
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |  2 ++
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig         |  2 ++
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |  2 ++
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig         |  2 ++
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  2 ++
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig      |  2 ++
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  2 ++
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig      |  2 ++
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  2 ++
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig    |  2 ++
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  2 ++
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig    |  2 ++
 configs/MPC8313ERDB_33_defconfig                   |  2 ++
 configs/MPC8313ERDB_66_defconfig                   |  2 ++
 configs/MPC8313ERDB_NAND_33_defconfig              |  2 ++
 configs/MPC8313ERDB_NAND_66_defconfig              |  2 ++
 configs/MPC8315ERDB_defconfig                      |  2 ++
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |  2 ++
 configs/P1010RDB-PA_36BIT_NAND_defconfig           |  2 ++
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |  2 ++
 configs/P1010RDB-PA_36BIT_NOR_defconfig            |  2 ++
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig         |  2 ++
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 ++
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |  2 ++
 configs/P1010RDB-PA_NAND_defconfig                 |  2 ++
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |  2 ++
 configs/P1010RDB-PA_NOR_defconfig                  |  2 ++
 configs/P1010RDB-PA_SDCARD_defconfig               |  2 ++
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |  2 ++
 configs/P1010RDB-PA_SPIFLASH_defconfig             |  2 ++
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |  2 ++
 configs/P1010RDB-PB_36BIT_NAND_defconfig           |  2 ++
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |  2 ++
 configs/P1010RDB-PB_36BIT_NOR_defconfig            |  2 ++
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig         |  2 ++
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 ++
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |  2 ++
 configs/P1010RDB-PB_NAND_defconfig                 |  2 ++
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |  2 ++
 configs/P1010RDB-PB_NOR_defconfig                  |  2 ++
 configs/P1010RDB-PB_SDCARD_defconfig               |  2 ++
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |  2 ++
 configs/P1010RDB-PB_SPIFLASH_defconfig             |  2 ++
 configs/P1020RDB-PD_NAND_defconfig                 |  2 ++
 configs/P1020RDB-PD_SDCARD_defconfig               |  2 ++
 configs/P1020RDB-PD_SPIFLASH_defconfig             |  2 ++
 configs/P1020RDB-PD_defconfig                      |  2 ++
 configs/P1021RDB-PC_36BIT_NAND_defconfig           |  2 ++
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig         |  2 ++
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P1021RDB-PC_36BIT_defconfig                |  2 ++
 configs/P1021RDB-PC_NAND_defconfig                 |  2 ++
 configs/P1021RDB-PC_SDCARD_defconfig               |  2 ++
 configs/P1021RDB-PC_SPIFLASH_defconfig             |  2 ++
 configs/P1021RDB-PC_defconfig                      |  2 ++
 configs/P1022DS_36BIT_NAND_defconfig               |  2 ++
 configs/P1022DS_36BIT_SDCARD_defconfig             |  2 ++
 configs/P1022DS_36BIT_SPIFLASH_defconfig           |  2 ++
 configs/P1022DS_36BIT_defconfig                    |  2 ++
 configs/P1022DS_NAND_defconfig                     |  2 ++
 configs/P1022DS_SDCARD_defconfig                   |  2 ++
 configs/P1022DS_SPIFLASH_defconfig                 |  2 ++
 configs/P1022DS_defconfig                          |  2 ++
 configs/P2020RDB-PC_36BIT_NAND_defconfig           |  2 ++
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig         |  2 ++
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig       |  2 ++
 configs/P2020RDB-PC_36BIT_defconfig                |  2 ++
 configs/P2020RDB-PC_NAND_defconfig                 |  2 ++
 configs/P2020RDB-PC_SDCARD_defconfig               |  2 ++
 configs/P2020RDB-PC_SPIFLASH_defconfig             |  2 ++
 configs/P2020RDB-PC_defconfig                      |  2 ++
 configs/T1023RDB_NAND_defconfig                    |  2 ++
 configs/T1023RDB_SDCARD_defconfig                  |  2 ++
 configs/T1023RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T1023RDB_SPIFLASH_defconfig                |  2 ++
 configs/T1023RDB_defconfig                         |  2 ++
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |  2 ++
 configs/T1024QDS_DDR4_defconfig                    |  2 ++
 configs/T1024QDS_NAND_defconfig                    |  2 ++
 configs/T1024QDS_SDCARD_defconfig                  |  2 ++
 configs/T1024QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/T1024QDS_SPIFLASH_defconfig                |  2 ++
 configs/T1024QDS_defconfig                         |  2 ++
 configs/T1024RDB_NAND_defconfig                    |  2 ++
 configs/T1024RDB_SDCARD_defconfig                  |  2 ++
 configs/T1024RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T1024RDB_SPIFLASH_defconfig                |  2 ++
 configs/T1024RDB_defconfig                         |  2 ++
 configs/T1040D4RDB_NAND_defconfig                  |  2 ++
 configs/T1040D4RDB_SDCARD_defconfig                |  2 ++
 configs/T1040D4RDB_SECURE_BOOT_defconfig           |  2 ++
 configs/T1040D4RDB_SPIFLASH_defconfig              |  2 ++
 configs/T1040D4RDB_defconfig                       |  2 ++
 configs/T1040QDS_DDR4_defconfig                    |  2 ++
 configs/T1040QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/T1040QDS_defconfig                         |  2 ++
 configs/T1040RDB_NAND_defconfig                    |  2 ++
 configs/T1040RDB_SDCARD_defconfig                  |  2 ++
 configs/T1040RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T1040RDB_SPIFLASH_defconfig                |  2 ++
 configs/T1040RDB_defconfig                         |  2 ++
 configs/T1042D4RDB_NAND_defconfig                  |  2 ++
 configs/T1042D4RDB_SDCARD_defconfig                |  2 ++
 configs/T1042D4RDB_SECURE_BOOT_defconfig           |  2 ++
 configs/T1042D4RDB_SPIFLASH_defconfig              |  2 ++
 configs/T1042D4RDB_defconfig                       |  2 ++
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |  2 ++
 configs/T1042RDB_PI_NAND_defconfig                 |  2 ++
 configs/T1042RDB_PI_SDCARD_defconfig               |  2 ++
 configs/T1042RDB_PI_SPIFLASH_defconfig             |  2 ++
 configs/T1042RDB_PI_defconfig                      |  2 ++
 configs/T1042RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T1042RDB_defconfig                         |  2 ++
 configs/T2080QDS_NAND_defconfig                    |  2 ++
 configs/T2080QDS_SDCARD_defconfig                  |  2 ++
 configs/T2080QDS_SECURE_BOOT_defconfig             |  2 ++
 configs/T2080QDS_SPIFLASH_defconfig                |  2 ++
 configs/T2080QDS_defconfig                         |  2 ++
 configs/T2080RDB_NAND_defconfig                    |  2 ++
 configs/T2080RDB_SDCARD_defconfig                  |  2 ++
 configs/T2080RDB_SECURE_BOOT_defconfig             |  2 ++
 configs/T2080RDB_SPIFLASH_defconfig                |  2 ++
 configs/T2080RDB_defconfig                         |  2 ++
 configs/T2081QDS_NAND_defconfig                    |  2 ++
 configs/T2081QDS_SDCARD_defconfig                  |  2 ++
 configs/T2081QDS_SPIFLASH_defconfig                |  2 ++
 configs/T2081QDS_defconfig                         |  2 ++
 configs/TQM834x_defconfig                          |  2 ++
 configs/TWR-P1025_defconfig                        |  2 ++
 configs/am335x_baltos_defconfig                    |  2 ++
 configs/am335x_evm_defconfig                       |  2 ++
 configs/am335x_evm_nor_defconfig                   |  2 ++
 configs/am335x_evm_norboot_defconfig               |  2 ++
 configs/am335x_evm_spiboot_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_evm_defconfig                       |  2 ++
 configs/am43xx_evm_defconfig                       |  2 ++
 configs/am43xx_evm_ethboot_defconfig               |  2 ++
 configs/am43xx_evm_usbhost_boot_defconfig          |  2 ++
 configs/am43xx_hs_evm_defconfig                    |  2 ++
 configs/ap121_defconfig                            |  2 ++
 configs/ap143_defconfig                            |  2 ++
 configs/apf27_defconfig                            |  2 ++
 configs/apx4devkit_defconfig                       |  2 ++
 configs/at91sam9n12ek_mmc_defconfig                |  2 ++
 configs/at91sam9n12ek_nandflash_defconfig          |  2 ++
 configs/at91sam9n12ek_spiflash_defconfig           |  2 ++
 configs/bk4r1_defconfig                            |  2 ++
 configs/brppt1_nand_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/colibri_imx7_defconfig                     |  2 ++
 configs/colibri_t20_defconfig                      |  2 ++
 configs/colibri_vf_defconfig                       |  2 ++
 configs/da850evm_defconfig                         |  2 ++
 configs/devkit8000_defconfig                       |  2 ++
 configs/dns325_defconfig                           |  2 ++
 configs/dockstar_defconfig                         |  1 +
 configs/draco_defconfig                            |  2 ++
 configs/eco5pk_defconfig                           |  2 ++
 configs/etamin_defconfig                           |  2 ++
 configs/ethernut5_defconfig                        |  2 ++
 configs/flea3_defconfig                            |  2 ++
 configs/goflexhome_defconfig                       |  2 ++
 configs/guruplug_defconfig                         |  2 ++
 configs/gwventana_emmc_defconfig                   |  2 ++
 configs/gwventana_gw5904_defconfig                 |  2 ++
 configs/gwventana_nand_defconfig                   |  2 ++
 configs/ib62x0_defconfig                           |  1 +
 configs/iconnect_defconfig                         |  1 +
 configs/ids8313_defconfig                          |  2 ++
 configs/imx31_phycore_defconfig                    |  1 +
 configs/imx31_phycore_eet_defconfig                |  1 +
 configs/imx6q_logic_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/km_kirkwood_128m16_defconfig               |  2 ++
 configs/km_kirkwood_defconfig                      |  2 ++
 configs/km_kirkwood_pci_defconfig                  |  2 ++
 configs/kmcoge4_defconfig                          |  2 ++
 configs/kmcoge5ne_defconfig                        |  2 ++
 configs/kmcoge5un_defconfig                        |  2 ++
 configs/kmeter1_defconfig                          |  2 ++
 configs/kmlion1_defconfig                          |  2 ++
 configs/kmnusa_defconfig                           |  2 ++
 configs/kmopti2_defconfig                          |  2 ++
 configs/kmsugp1_defconfig                          |  2 ++
 configs/kmsupx5_defconfig                          |  2 ++
 configs/kmsuv31_defconfig                          |  2 ++
 configs/kmtegr1_defconfig                          |  2 ++
 configs/kmtepr2_defconfig                          |  2 ++
 configs/kmvect1_defconfig                          |  2 ++
 configs/ls1043aqds_defconfig                       |  1 +
 configs/ls1043aqds_lpuart_defconfig                |  1 +
 configs/ls1043aqds_nand_defconfig                  |  1 +
 configs/ls1043aqds_nor_ddr3_defconfig              |  1 +
 configs/ls1043aqds_qspi_defconfig                  |  1 +
 configs/ls1043aqds_sdcard_ifc_defconfig            |  1 +
 configs/ls1043aqds_sdcard_qspi_defconfig           |  1 +
 configs/ls1043ardb_SECURE_BOOT_defconfig           |  1 +
 configs/ls1043ardb_defconfig                       |  1 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig      |  1 +
 configs/ls1043ardb_nand_defconfig                  |  1 +
 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                  |  1 +
 configs/ls1046aqds_qspi_defconfig                  |  1 +
 configs/ls1046aqds_sdcard_ifc_defconfig            |  1 +
 configs/ls1046aqds_sdcard_qspi_defconfig           |  1 +
 configs/ls1046ardb_emmc_defconfig                  |  1 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig      |  1 +
 configs/ls1046ardb_qspi_defconfig                  |  1 +
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig    |  1 +
 configs/ls1046ardb_sdcard_defconfig                |  1 +
 configs/m28evk_defconfig                           |  2 ++
 configs/m53evk_defconfig                           |  2 ++
 configs/mccmon6_nor_defconfig                      |  2 ++
 configs/mccmon6_sd_defconfig                       |  2 ++
 configs/mcx_defconfig                              |  2 ++
 configs/mgcoge3un_defconfig                        |  2 ++
 configs/microblaze-generic_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/mx35pdk_defconfig                          |  2 ++
 configs/nsa310s_defconfig                          |  1 +
 configs/omap3_beagle_defconfig                     |  2 ++
 configs/omap3_ha_defconfig                         |  2 ++
 configs/omap3_logic_defconfig                      |  2 ++
 configs/omap3_overo_defconfig                      |  2 ++
 configs/omap3_pandora_defconfig                    |  2 ++
 configs/omap3_zoom1_defconfig                      |  2 ++
 configs/openrd_base_defconfig                      |  2 ++
 configs/openrd_client_defconfig                    |  2 ++
 configs/openrd_ultimate_defconfig                  |  2 ++
 configs/pcm052_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/portl2_defconfig                           |  2 ++
 configs/pxm2_defconfig                             |  2 ++
 configs/rastaban_defconfig                         |  2 ++
 configs/rut_defconfig                              |  2 ++
 configs/s5pc210_universal_defconfig                |  1 +
 configs/sheevaplug_defconfig                       |  2 ++
 configs/smartweb_defconfig                         |  2 ++
 configs/smdkc100_defconfig                         |  2 ++
 configs/socfpga_arria10_defconfig                  |  1 +
 configs/socfpga_arria5_defconfig                   |  2 ++
 configs/socfpga_cyclone5_defconfig                 |  2 ++
 configs/socfpga_de0_nano_soc_defconfig             |  2 ++
 configs/socfpga_de10_nano_defconfig                |  1 +
 configs/socfpga_de1_soc_defconfig                  |  1 +
 configs/socfpga_is1_defconfig                      |  2 ++
 configs/socfpga_mcvevk_defconfig                   |  2 ++
 configs/socfpga_sockit_defconfig                   |  2 ++
 configs/socfpga_socrates_defconfig                 |  2 ++
 configs/socfpga_sr1500_defconfig                   |  2 ++
 configs/socfpga_vining_fpga_defconfig              |  2 ++
 configs/stmark2_defconfig                          |  3 +++
 configs/suvd3_defconfig                            |  2 ++
 configs/tao3530_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/tuge1_defconfig                            |  2 ++
 configs/tuxx1_defconfig                            |  2 ++
 configs/twister_defconfig                          |  2 ++
 configs/usb_a9263_dataflash_defconfig              |  1 +
 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/vf610twr_defconfig                         |  2 ++
 configs/vf610twr_nand_defconfig                    |  2 ++
 configs/woodburn_defconfig                         |  2 ++
 configs/woodburn_sd_defconfig                      |  2 ++
 configs/x600_defconfig                             |  2 ++
 include/configs/BSC9131RDB.h                       |  3 ---
 include/configs/BSC9132QDS.h                       |  4 ---
 include/configs/M54418TWR.h                        |  8 ------
 include/configs/MPC8313ERDB.h                      |  3 ---
 include/configs/MPC8315ERDB.h                      |  3 ---
 include/configs/P1010RDB.h                         |  3 ---
 include/configs/P1022DS.h                          | 11 --------
 include/configs/T102xQDS.h                         |  7 ------
 include/configs/T102xRDB.h                         |  6 -----
 include/configs/T1040QDS.h                         |  7 ------
 include/configs/T104xRDB.h                         |  7 ------
 include/configs/T208xQDS.h                         |  6 -----
 include/configs/T208xRDB.h                         |  6 -----
 include/configs/TQM834x.h                          |  5 ----
 include/configs/am335x_evm.h                       | 27
++------------------
 include/configs/am335x_igep003x.h                  |  7 ++----
 include/configs/am3517_evm.h                       | 15 ++---------
 include/configs/am43xx_evm.h                       | 29
++--------------------
 include/configs/ap121.h                            |  6 -----
 include/configs/ap143.h                            |  6 -----
 include/configs/apf27.h                            | 13 +---------
 include/configs/apx4devkit.h                       |  7 +-----
 include/configs/at91sam9n12ek.h                    |  7 +-----
 include/configs/baltos.h                           | 13 ++--------
 include/configs/bav335x.h                          | 29
++--------------------
 include/configs/bk4r1.h                            |  8 ------
 include/configs/brppt1.h                           | 14 ++---------
 include/configs/chiliboard.h                       | 16 ++----------
 include/configs/cm_fx6.h                           | 10 ++------
 include/configs/cm_t335.h                          |  9 ++-----
 include/configs/cm_t35.h                           |  4 ---
 include/configs/cm_t3517.h                         |  4 ---
 include/configs/colibri_imx7.h                     |  9 +------
 include/configs/colibri_t20.h                      |  8 +-----
 include/configs/colibri_vf.h                       |  8 +-----
 include/configs/da850evm.h                         |  6 -----
 include/configs/devkit8000.h                       |  7 ------
 include/configs/dns325.h                           |  6 +----
 include/configs/dockstar.h                         |  4 +--
 include/configs/dra7xx_evm.h                       | 24 ------------------
 include/configs/draco.h                            |  2 --
 include/configs/eco5pk.h                           |  8 +-----
 include/configs/etamin.h                           | 20 ---------------
 include/configs/ethernut5.h                        |  4 ---
 include/configs/flea3.h                            |  8 ------
 include/configs/goflexhome.h                       |  5 +---
 include/configs/guruplug.h                         | 12 +--------
 include/configs/gw_ventana.h                       | 12 ++-------
 include/configs/ib62x0.h                           |  8 +-----
 include/configs/iconnect.h                         |  8 +-----
 include/configs/ids8313.h                          |  9 ++-----
 include/configs/imx27lite-common.h                 |  4 +--
 include/configs/imx31_phycore.h                    |  6 +----
 include/configs/imx6-engicam.h                     |  3 ---
 include/configs/imx6_logic.h                       |  3 ---
 include/configs/ipam390.h                          | 14 ++---------
 include/configs/km/keymile-common.h                |  4 +--
 include/configs/km/km83xx-common.h                 | 13 ----------
 include/configs/km/km_arm.h                        | 10 --------
 include/configs/km/kmp204x-common.h                | 10 --------
 include/configs/km8360.h                           | 10 --------
 include/configs/ls1043a_common.h                   | 19 +-------------
 include/configs/ls1046a_common.h                   |  2 +-
 include/configs/ls1046aqds.h                       | 17 -------------
 include/configs/ls1046ardb.h                       |  4 ---
 include/configs/m28evk.h                           |  9 -------
 include/configs/m53evk.h                           |  9 -------
 include/configs/mccmon6.h                          | 18 +++-----------
 include/configs/mcx.h                              |  5 ----
 include/configs/microblaze-generic.h               |  4 ---
 include/configs/mt_ventoux.h                       |  6 -----
 include/configs/mx28evk.h                          | 10 --------
 include/configs/mx35pdk.h                          |  4 ---
 include/configs/nokia_rx51.h                       | 20 +++++----------
 include/configs/nsa310s.h                          |  9 +------
 include/configs/omap3_beagle.h                     |  5 ----
 include/configs/omap3_logic.h                      | 11 ++------
 include/configs/omap3_overo.h                      | 11 +-------
 include/configs/omap3_pandora.h                    |  9 +------
 include/configs/omap3_zoom1.h                      |  5 ----
 include/configs/openrd.h                           | 13 +++-------
 include/configs/p1_p2_rdb_pc.h                     | 23 -----------------
 include/configs/p1_twr.h                           |  4 ---
 include/configs/pcm052.h                           | 15 +----------
 include/configs/pcm058.h                           |  2 --
 include/configs/pengwyn.h                          | 11 ++------
 include/configs/pfla02.h                           |  3 ---
 include/configs/platinum.h                         | 16 ++----------
 include/configs/pm9261.h                           | 13 ++--------
 include/configs/pm9263.h                           | 13 ++--------
 include/configs/pxm2.h                             |  1 -
 include/configs/rastaban.h                         |  2 --
 include/configs/rut.h                              |  1 -
 include/configs/s5p_goni.h                         |  9 -------
 include/configs/s5pc210_universal.h                | 19 +++-----------
 include/configs/sheevaplug.h                       | 12 +--------
 include/configs/siemens-am33x-common.h             | 25
++++++-------------
 include/configs/smartweb.h                         | 11 +-------
 include/configs/smdkc100.h                         | 13 ++--------
 include/configs/socfpga_common.h                   | 10 --------
 include/configs/socfpga_vining_fpga.h              |  9 -------
 include/configs/stmark2.h                          |  7 ------
 include/configs/suvd3.h                            | 10 --------
 include/configs/tam3517-common.h                   |  4 ---
 include/configs/tao3530.h                          |  4 ---
 include/configs/thuban.h                           |  2 --
 include/configs/ti816x_evm.h                       | 16 ++----------
 include/configs/ti_armv7_keystone2.h               |  4 ---
 include/configs/titanium.h                         |  8 ++----
 include/configs/tricorder.h                        | 14 ++---------
 include/configs/usb_a9263.h                        |  5 +---
 include/configs/vct.h                              |  6 -----
 include/configs/vf610twr.h                         |  8 ------
 include/configs/woodburn_common.h                  |  8 ------
 include/configs/x600.h                             |  7 ++----
 scripts/config_whitelist.txt                       |  2 --
 433 files changed, 697 insertions(+), 962 deletions(-)

cmd/Kconfig +4 -3

index ce81b4c444a3..5a6afab99b7f 100644
@@ -1404,13 +1404,14 @@ config CMD_MTDPARTS
 
 config MTDIDS_DEFAULT
        string "Default MTD IDs"
-       depends on CMD_MTDPARTS
+       depends on CMD_MTDPARTS || CMD_NAND || CMD_FLASH
        help
-         Defines a default MTD ID
+         Defines a default MTD IDs list for use with MTD partitions in the
+         Linux MTD command line partitions format.
 
 config MTDPARTS_DEFAULT
        string "Default MTD partition scheme"
-       depends on CMD_MTDPARTS
+       depends on CMD_MTDPARTS || CMD_NAND || CMD_FLASH
        help
          Defines a default MTD partitioning scheme in the Linux MTD

command
line partitions format

configs/BSC9131RDB_NAND_SYSCLK100_defconfig +2 -0

index 2e99fc55381f..d5c359927b65 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash,"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(

uboot),8m(kernel),512k(dtb),-(fs)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
# CONFIG_MMC is not set

configs/BSC9131RDB_NAND_ renamed from configs/BSC9131RDB_NAND_defconfig +0 -0

defconfig
index 35d1b4933778..16cb650df1b6 100644

configs/BSC9131RDB_NAND_defconfig +2 -0

@@ -21,6 +21,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash,"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(

uboot),8m(kernel),512k(dtb),-(fs)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
# CONFIG_MMC is not set

configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig +2 -0

index e4777825f7d6..a10fddd82930 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash,"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(

uboot),8m(kernel),512k(dtb),-(fs)"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_FSL_CAAM=y
# CONFIG_MMC is not set

configs/BSC9131RDB_SPIFLASH_defconfig +2 -0

index b4cbdc548ea0..747b2ae6f9df 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash,"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:1m(

uboot),8m(kernel),512k(dtb),-(fs)"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_FSL_CAAM=y
# CONFIG_MMC is not set

configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig +2 -0

index c323a108608f..01ab3c8194cd 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/BSC9132QDS_NAND_DDRCLK100_defconfig +2 -0

index 58ea3571391b..abb0ce028654 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig +2 -0

index 28313207571d..369d9d829979 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/BSC9132QDS_NAND_DDRCLK133_defconfig +2 -0

index dac1b31044dc..db5192d7d65e 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig +2 -0

index d4cd2c064872..28fc7a8a639e 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/BSC9132QDS_NOR_DDRCLK100_defconfig +2 -0

index c8855f8c6b49..a07f1b2a43d1 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig +2 -0

index 660f2244a489..43a081509192 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/BSC9132QDS_NOR_DDRCLK133_defconfig +2 -0

index d03f90a37554..4433f3d6bf0e 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig +2 -0

index 9ff1b2004b80..2c515e86f075 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig +2 -0

index 6e669d76300c..b3c483326ca1 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig +2 -0

index 007427418447..2102a1931948 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig +2 -0

index b2efa93da2bd..fd2d27129ed1 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig +2 -0

index 909da8708784..d484f2ce5a30 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig +2 -0

index 365ad8921a25..c7329d68da5b 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig +2 -0

index 8bc8ca0abc2b..3738a1062496 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig +2 -0

index f91e40b5105a..5c0c4cf81c8b 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/MPC8313ERDB_33_ renamed from configs/MPC8313ERDB_33_defconfig +0 -0

defconfig
index ea9c85633a2e..cc07a15c25fa 100644

configs/MPC8313ERDB_33_defconfig +2 -0

@@ -17,6 +17,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 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_NOR_FLASH=y
CONFIG_PHYLIB=y

configs/MPC8313ERDB_66_ renamed from configs/MPC8313ERDB_66_defconfig +0 -0

defconfig
index 7eb5afbb7802..5643dec54749 100644

configs/MPC8313ERDB_66_defconfig +2 -0

@@ -17,6 +17,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 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_NOR_FLASH=y
CONFIG_PHYLIB=y

configs/MPC8313ERDB_NAND_33_defconfig +2 -0

index 016021af268e..823001583447 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 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_ENV_IS_IN_NAND=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y

configs/MPC8313ERDB_NAND_66_defconfig +2 -0

index 42f7b84729f8..2639926ab814 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 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_ENV_IS_IN_NAND=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y

configs/MPC8315ERDB_defconfig +2 -0

index 7026be6dbfc2..fc846b26bddb 100644
@@ -17,6 +17,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=e0600000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=e0600000.flash:512k(

uboot),128k(env),6m at 1m(kernel),-(fs)"
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y

configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig +2 -0

index aa1f78a515f6..d004dddc0ff0 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PA_36BIT_NAND_defconfig +2 -0

index ead503f3d49c..f195add9e723 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig +2 -0

index f628fd359daf..de0c7d71fe16 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PA_36BIT_NOR_defconfig +2 -0

index 710c2d6e765c..cadd2fccfaea 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PA_36BIT_SDCARD_defconfig +2 -0

index 68a5865b2f67..40ad810a2571 100644
@@ -30,6 +30,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig +2 -0

index 7e52c082224c..240b413625d0 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +2 -0

index e7dee2571f5f..c159badee78f 100644
@@ -31,6 +31,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PA_NAND_SECBOOT_defconfig +2 -0

index d0273256fda4..a49c8376d27a 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PA_NAND_defconfig +2 -0

index a8056caf8054..3b22f5bc9701 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PA_NOR_SECBOOT_defconfig +2 -0

index cd82c14912b7..e149a76ca44b 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PA_NOR_ renamed from configs/P1010RDB-PA_NOR_defconfig +0 -0

defconfig
index d0b6646f6ab9..9f961282f852 100644

configs/P1010RDB-PA_NOR_defconfig +2 -0

@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PA_SDCARD_defconfig +2 -0

index 8e98aa574fab..2a629871174e 100644
@@ -29,6 +29,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig +2 -0

index bfd6960b90d5..d51d3fff1eae 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PA_ renamed from configs/P1010RDB-PA_SPIFLASH_defconfig +0 -0

SPIFLASH_defconfig
index 3691a2b31b64..b08a0e735e34 100644

configs/P1010RDB-PA_SPIFLASH_defconfig +2 -0

@@ -30,6 +30,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig +2 -0

index 29d2d3620fbc..eb394bf1de97 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PB_36BIT_NAND_defconfig +2 -0

index 7299d5b735ee..4f7f0d478286 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig +2 -0

index 3824c12df7cc..d5cb8afd4786 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PB_36BIT_NOR_defconfig +2 -0

index 4b82ae71a49f..72d669deea3c 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PB_36BIT_SDCARD_defconfig +2 -0

index 9f8f01804d1e..b59532d7a6bc 100644
@@ -30,6 +30,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig +2 -0

index 3df7461da45b..2ee9ec3fc087 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +2 -0

index 744f84c8f4cd..ca618a0a0fc0 100644
@@ -31,6 +31,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PB_NAND_SECBOOT_defconfig +2 -0

index 33ea6cbd8772..582d1aa4ca44 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PB_NAND_defconfig +2 -0

index 55bbbee84623..bead89f156f5 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PB_NOR_SECBOOT_defconfig +2 -0

index 179a0b5152a7..3ae5485b10ec 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PB_NOR_ renamed from configs/P1010RDB-PB_NOR_defconfig +0 -0

defconfig
index 6a7c9e26f97d..68a68dfa62b5 100644

configs/P1010RDB-PB_NOR_defconfig +2 -0

@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PB_SDCARD_defconfig +2 -0

index b8e3ccd6d0d2..9db32c1030f0 100644
@@ -29,6 +29,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig +2 -0

index b674798dbad9..80f8c2793671 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1010RDB-PB_ renamed from configs/P1010RDB-PB_SPIFLASH_defconfig +0 -0

SPIFLASH_defconfig
index 15aeec9407eb..7ba107ded23a 100644

configs/P1010RDB-PB_SPIFLASH_defconfig +2 -0

@@ -30,6 +30,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(

uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/P1020RDB-PD_NAND_defconfig +2 -0

index 96ad965213e4..51bcd22a959a 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_NAND=y

configs/P1020RDB-PD_SDCARD_defconfig +2 -0

index 925363185cac..400471a23234 100644
@@ -30,6 +30,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1020RDB-PD_ renamed from configs/P1020RDB-PD_SPIFLASH_defconfig +0 -0

SPIFLASH_defconfig
index 4912860b84c4..a004df443e8b 100644

configs/P1020RDB-PD_SPIFLASH_defconfig +2 -0

@@ -31,6 +31,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1020RDB-PD_defconfig +2 -0

index 0062ca0e0d18..3c88e485c566 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1021RDB-PC_36BIT_NAND_defconfig +2 -0

index fb8398fa67dd..125aa69395d1 100644
@@ -34,6 +34,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_NAND=y

configs/P1021RDB-PC_36BIT_SDCARD_defconfig +2 -0

index 1012cb56afd8..45a74b2c3e4f 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig +2 -0

index 92699c04b346..14d73edce177 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1021RDB-PC_36BIT_defconfig +2 -0

index 0b6c851051a4..a72458cf4c15 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1021RDB-PC_NAND_defconfig +2 -0

index f91c23c88ac2..964696d0969b 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_NAND=y

configs/P1021RDB-PC_SDCARD_defconfig +2 -0

index 53caa4286bc8..0cff7ff6b393 100644
@@ -31,6 +31,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1021RDB-PC_ renamed from configs/P1021RDB-PC_SPIFLASH_defconfig +0 -0

SPIFLASH_defconfig
index 45a7c203e864..37f7f0fca77e 100644

configs/P1021RDB-PC_SPIFLASH_defconfig +2 -0

@@ -32,6 +32,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1021RDB-PC_defconfig +2 -0

index 8faa1d490702..69b5c90d6d03 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1022DS_36BIT_NAND_defconfig +2 -0

index 8639cdb64fa4..02f2077170b2 100644
@@ -34,6 +34,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_NAND=y

configs/P1022DS_36BIT_SDCARD_defconfig +2 -0

index e42b3ca83470..7d29f96c51ec 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1022DS_36BIT_SPIFLASH_defconfig +2 -0

index 8b631805bb12..a98f10813d19 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1022DS_36BIT_ renamed from configs/P1022DS_36BIT_defconfig +0 -0

defconfig
index 569d92168aae..352b397ce4da 100644

configs/P1022DS_36BIT_defconfig +2 -0

@@ -23,6 +23,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1022DS_NAND_ renamed from configs/P1022DS_NAND_defconfig +0 -0

defconfig
index b133911fec79..07fb2ee9ca5c 100644

configs/P1022DS_NAND_defconfig +2 -0

@@ -33,6 +33,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_NAND=y

configs/P1022DS_SDCARD_ renamed from configs/P1022DS_SDCARD_defconfig +0 -0

defconfig
index 73aca67ac3d6..6b039fe8de27 100644

configs/P1022DS_SDCARD_defconfig +2 -0

@@ -31,6 +31,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1022DS_SPIFLASH_defconfig +2 -0

index 49f14133619d..f128a8775ca6 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P1022DS_defconfig +2 -0

index d6f8a191c195..8690b021677c 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P2020RDB-PC_36BIT_NAND_defconfig +2 -0

index aff79ecf2167..864af7666b35 100644
@@ -34,6 +34,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_NAND=y

configs/P2020RDB-PC_36BIT_SDCARD_defconfig +2 -0

index ceea0839ecd0..2f9702e5ab6d 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +2 -0

index f739dfc7306f..539b88478f88 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P2020RDB-PC_36BIT_defconfig +2 -0

index 37c9c04edd90..8b084436e0ab 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P2020RDB-PC_NAND_defconfig +2 -0

index 1ba4dfded4a0..33c12734eb6d 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_NAND=y

configs/P2020RDB-PC_SDCARD_defconfig +2 -0

index 4481c681c1c3..f2322baf661f 100644
@@ -31,6 +31,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P2020RDB-PC_ renamed from configs/P2020RDB-PC_SPIFLASH_defconfig +0 -0

SPIFLASH_defconfig
index 12ee717f77c2..e893f787fecf 100644

configs/P2020RDB-PC_SPIFLASH_defconfig +2 -0

@@ -32,6 +32,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/P2020RDB-PC_defconfig +2 -0

index 9af24cf4be66..f470768e7898 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/T1023RDB_NAND_ renamed from configs/T1023RDB_NAND_defconfig +0 -0

defconfig
index e63c9d348ac5..bc12b88f7096 100644

configs/T1023RDB_NAND_defconfig +1 -0

@@ -32,6 +32,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1023RDB_SDCARD_ renamed from configs/T1023RDB_SDCARD_defconfig +0 -0

defconfig
index 4c724dc0347c..b79e56be00f9 100644

configs/T1023RDB_SDCARD_defconfig +1 -0

@@ -32,6 +32,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1023RDB_SECURE_BOOT_defconfig +1 -0

index 6fdebcfee2ea..fa69b835ae40 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/T1023RDB_SPIFLASH_defconfig +1 -0

index 97fcb7cd2ec3..5c25c62a5847 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1023RDB_defconfig +1 -0

index 7be10787f890..50de58b37d8c 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +1 -0

index 999605ba6fd9..7f07397d43f3 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/T1024QDS_DDR4_ renamed from configs/T1024QDS_DDR4_defconfig +0 -0

defconfig
index e39f3dc023b3..b910fe7cf1ea 100644

configs/T1024QDS_DDR4_defconfig +1 -0

@@ -25,6 +25,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1024QDS_NAND_ renamed from configs/T1024QDS_NAND_defconfig +0 -0

defconfig
index b0fc859bb157..055f74996031 100644

configs/T1024QDS_NAND_defconfig +1 -0

@@ -35,6 +35,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1024QDS_SDCARD_ renamed from configs/T1024QDS_SDCARD_defconfig +0 -0

defconfig
index 1f8318b98f63..a9f9e01c5429 100644

configs/T1024QDS_SDCARD_defconfig +1 -0

@@ -35,6 +35,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1024QDS_SECURE_BOOT_defconfig +1 -0

index c90d764fa9f8..63f980b08c24 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_SYS_FSL_DDR3=y
CONFIG_MTD_NOR_FLASH=y

configs/T1024QDS_SPIFLASH_defconfig +1 -0

index ed858badeaf8..da7caace83c9 100644
@@ -36,6 +36,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1024QDS_defconfig +1 -0

index 8bc97450a2a9..c6d632a9fd46 100644
@@ -25,6 +25,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1024RDB_NAND_ renamed from configs/T1024RDB_NAND_defconfig +0 -0

defconfig
index 21c7af3fa244..6685441edee1 100644

configs/T1024RDB_NAND_defconfig +1 -0

@@ -33,6 +33,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1024RDB_SDCARD_ renamed from configs/T1024RDB_SDCARD_defconfig +0 -0

defconfig
index 8d27b30a47f1..c1b6b968992f 100644

configs/T1024RDB_SDCARD_defconfig +1 -0

@@ -33,6 +33,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1024RDB_SECURE_BOOT_defconfig +1 -0

index a960e0ec8f9c..d86235bb51e1 100644
@@ -25,6 +25,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_SYS_FSL_DDR3=y
CONFIG_MTD_NOR_FLASH=y

configs/T1024RDB_SPIFLASH_defconfig +1 -0

index 6027bcf7cd3e..4dd6c9a309a3 100644
@@ -34,6 +34,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1024RDB_defconfig +1 -0

index 67f54b740752..39952e1b0333 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1040D4RDB_NAND_ renamed from configs/T1040D4RDB_NAND_defconfig +0 -0

defconfig
index 45f17693c45c..722f6a385bf2 100644

configs/T1040D4RDB_NAND_defconfig +1 -0

@@ -32,6 +32,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1040D4RDB_SDCARD_defconfig +1 -0

index 5cca1d30936b..d098b0c93e0f 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1040D4RDB_SECURE_BOOT_defconfig +1 -0

index e36d88d4e3ad..fdfa7532706c 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/T1040D4RDB_SPIFLASH_defconfig +1 -0

index 540b924cfc5e..0874adf5f4da 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1040D4RDB_defconfig +1 -0

index 690fb2fa2a14..a16c68354069 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1040QDS_DDR4_ renamed from configs/T1040QDS_DDR4_defconfig +0 -0

defconfig
index 7d66bd7a38b7..2e740b670ca7 100644

configs/T1040QDS_DDR4_defconfig +1 -0

@@ -26,6 +26,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1040QDS_SECURE_BOOT_defconfig +1 -0

index 7bf27de58779..79807b71b289 100644
@@ -28,6 +28,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_SYS_FSL_DDR3=y
CONFIG_MTD_NOR_FLASH=y

configs/T1040QDS_defconfig +1 -0

index 25733bb416be..53b7d457aed7 100644
@@ -26,6 +26,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1040RDB_NAND_ renamed from configs/T1040RDB_NAND_defconfig +0 -0

defconfig
index b7be2d6d53d8..e595e1fd46d1 100644

configs/T1040RDB_NAND_defconfig +1 -0

@@ -32,6 +32,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1040RDB_SDCARD_ renamed from configs/T1040RDB_SDCARD_defconfig +0 -0

defconfig
index 816b794344eb..f53eb225ad5a 100644

configs/T1040RDB_SDCARD_defconfig +1 -0

@@ -32,6 +32,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1040RDB_SECURE_BOOT_defconfig +1 -0

index f483841c7a21..673b8985172d 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_SYS_FSL_DDR3=y
CONFIG_MTD_NOR_FLASH=y

configs/T1040RDB_SPIFLASH_defconfig +1 -0

index f471f3383243..483f32858c1c 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1040RDB_defconfig +1 -0

index 99c46ac5709e..3cf163c08cc1 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_ETHSW=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1042D4RDB_NAND_ renamed from configs/T1042D4RDB_NAND_defconfig +0 -0

defconfig
index b9ab9a1d830d..5b4ad59bd8b3 100644

configs/T1042D4RDB_NAND_defconfig +1 -0

@@ -34,6 +34,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1042D4RDB_SDCARD_defconfig +1 -0

index 9d2ee980ff45..1802c20c2701 100644
@@ -34,6 +34,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1042D4RDB_SECURE_BOOT_defconfig +1 -0

index 90a87007c31e..ba45b1ef1d69 100644
@@ -26,6 +26,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/T1042D4RDB_SPIFLASH_defconfig +1 -0

index 5c6afcf9f9fa..4f0c649aa9a2 100644
@@ -35,6 +35,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1042D4RDB_defconfig +1 -0

index 9861b1eeebeb..c5d763606ff4 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +1 -0

index a37d0dfceee2..f3f4d777776b 100644
@@ -38,6 +38,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_SPL_DM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1042RDB_PI_NAND_defconfig +1 -0

index f8684e5c7c34..04c36ea46b5f 100644
@@ -35,6 +35,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1042RDB_PI_SDCARD_defconfig +1 -0

index 0ea2653ca3a6..31186ac1c050 100644
@@ -35,6 +35,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1042RDB_PI_ renamed from configs/T1042RDB_PI_SPIFLASH_defconfig +0 -0

SPIFLASH_defconfig
index 7158fa22f8b0..fe73b5c992e8 100644

configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0

@@ -36,6 +36,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1042RDB_PI_defconfig +1 -0

index 33fa70af67fd..6590de8eead7 100644
@@ -25,6 +25,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T1042RDB_SECURE_BOOT_defconfig +1 -0

index c561a43c8e23..b207fe0cea06 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_SYS_FSL_DDR3=y
CONFIG_MTD_NOR_FLASH=y

configs/T1042RDB_defconfig +1 -0

index 1436dc3c06bc..44ce197007a5 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_SYS_FSL_DDR3=y

configs/T2080QDS_NAND_ renamed from configs/T2080QDS_NAND_defconfig +0 -0

defconfig
index 8e93a150e641..e5a694a34a0e 100644

configs/T2080QDS_NAND_defconfig +1 -0

@@ -29,6 +29,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T2080QDS_SDCARD_ renamed from configs/T2080QDS_SDCARD_defconfig +0 -0

defconfig
index ba5658a0ece0..d35dfd843c99 100644

configs/T2080QDS_SDCARD_defconfig +1 -0

@@ -29,6 +29,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T2080QDS_SECURE_BOOT_defconfig +1 -0

index 75f4ee1e6503..402132bd80eb 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y

configs/T2080QDS_SPIFLASH_defconfig +1 -0

index 1f856dbb9524..0b205439c46b 100644
@@ -30,6 +30,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T2080QDS_defconfig +1 -0

index c150c0f571ab..6151f86a2389 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T2080RDB_NAND_ renamed from configs/T2080RDB_NAND_defconfig +0 -0

defconfig
index 3221afbeb9cd..dae64ea43981 100644

configs/T2080RDB_NAND_defconfig +1 -0

@@ -29,6 +29,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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.1:1m(uboot),5m(kernel),128k(dtb),-(user)"
# CONFIG_CMD_IRQ is not set CONFIG_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y

configs/T2080RDB_SDCARD_ renamed from configs/T2080RDB_SDCARD_defconfig +0 -0

defconfig
index a0ac48387b84..e07818a7d5cd 100644

configs/T2080RDB_SDCARD_defconfig +1 -0

@@ -29,6 +29,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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.1:1m(uboot),5m(kernel),128k(dtb),-(user)"
# CONFIG_CMD_IRQ is not set CONFIG_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y

configs/T2080RDB_SECURE_BOOT_defconfig +1 -0

index 76a0e3ae6e50..c5d754cc8453 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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.1:1m(uboot),5m(kernel),128k(dtb),-(user)"
# CONFIG_CMD_IRQ is not set
CONFIG_DM=y
CONFIG_MTD_NOR_FLASH=y

configs/T2080RDB_SPIFLASH_defconfig +1 -0

index f4432b584872..1443956804fe 100644
@@ -30,6 +30,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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.1:1m(uboot),5m(kernel),128k(dtb),-(user)"
# CONFIG_CMD_IRQ is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y

configs/T2080RDB_defconfig +1 -0

index 127437a1d70a..0a3a698e5911 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.1" +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.1:1m(uboot),5m(kernel),128k(dtb),-(user)"
# CONFIG_CMD_IRQ is not set CONFIG_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y

configs/T2081QDS_NAND_ renamed from configs/T2081QDS_NAND_defconfig +0 -0

defconfig
index 1eb481702eec..890ad07423c6 100644

configs/T2081QDS_NAND_defconfig +1 -0

@@ -29,6 +29,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_NAND=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T2081QDS_SDCARD_ renamed from configs/T2081QDS_SDCARD_defconfig +0 -0

defconfig
index add57d93508d..75267c1955e8 100644

configs/T2081QDS_SDCARD_defconfig +1 -0

@@ -29,6 +29,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_MMC=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T2081QDS_SPIFLASH_defconfig +1 -0

index ece9c320a578..f3f40ca8f189 100644
@@ -30,6 +30,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_SPI_FLASH=y CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/T2081QDS_defconfig +1 -0

index e3dea0e25c8f..86e99dd6dfd6 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.

flash,spi0=spife110000.0" +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_ENV_IS_IN_FLASH=y
CONFIG_FSL_CAAM=y
CONFIG_MTD_NOR_FLASH=y

configs/TQM834x_defconfig +2 -0

index 6351a7793def..44bc4fc8235e 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_SNTP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
+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_PHYLIB=y

configs/TWR-P1025_defconfig +2 -0

index 061760c7d4c7..5dda2bbdb528 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=ec000000.nor"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:256k(

vsc7385-firmware),256k(dtb),5632k(kernel),57856k(fs),256k( qe-ucode-firmware),1280k(u-boot)"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y

configs/am335x_baltos_ renamed from configs/am335x_baltos_defconfig +0 -0

defconfig
index 5ff327b81730..8ee58576a31a 100644

configs/am335x_baltos_defconfig +2 -0

@@ -43,6 +43,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(
 SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3)

,1920k(u-boot),-(UBI)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_MMC_OMAP_HS=y

configs/am335x_evm_defconfig +2 -0

index f1bfe1a2b29d..79f47c33ba68 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_SPL_NAND_OFS=0x00080000
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL)

,128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND. SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k( NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND. kernel),-(NAND.file-system)"
CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk
am335x-bonegreen am335x-icev2"
# CONFIG_BLK is not set

configs/am335x_evm_nor_ renamed from configs/am335x_evm_nor_defconfig +0 -0

defconfig
index 379c715fde85..e9a876d34e5f 100644

configs/am335x_evm_nor_defconfig +2 -0

@@ -17,6 +17,8 @@ CONFIG_CMD_SPL_NAND_OFS=0x00080000
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL)

,128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND. SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k( NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND. kernel),-(NAND.file-system)"
CONFIG_DFU_MMC=y
CONFIG_DFU_NAND=y
CONFIG_DFU_RAM=y

configs/am335x_evm_norboot_defconfig +2 -0

index ee1b1934b537..9d424e8770a2 100644
@@ -14,6 +14,8 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_FASTBOOT=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:512k(

u-boot),128k(u-boot-env1),128k(u-boot-env2),4m(kernel),-(rootfs)"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y

configs/am335x_evm_spiboot_defconfig +2 -0

index 1170e50e7f43..ad79d6cb883c 100644
@@ -17,6 +17,8 @@ CONFIG_FASTBOOT=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=m25p80-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=m25p80-flash.0:128k(

SPL),512k(u-boot),128k(u-boot-env1),128k(u-boot-env2),3464k( kernel),-(rootfs)"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y

configs/am335x_evm_usbspl_defconfig +2 -0

index ebf952a1d5a2..e3431db7435b 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_SPL_NAND_OFS=0x00080000
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL)

,128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND. SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k( NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND. kernel),-(NAND.file-system)"
CONFIG_DFU_MMC=y
CONFIG_DFU_NAND=y
CONFIG_DFU_RAM=y

configs/am335x_hs_evm_ renamed from configs/am335x_hs_evm_defconfig +0 -0

defconfig
index 35ba8220731d..9bc9dc339436 100644

configs/am335x_hs_evm_defconfig +2 -0

@@ -23,6 +23,8 @@ CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL)

,128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND. SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k( NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND. kernel),-(NAND.file-system)"
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk
am335x-bonegreen am335x-icev2"

configs/am335x_hs_evm_uart_defconfig +2 -0

index 4e5f64961e18..60eaa4be7ea9 100644
@@ -25,6 +25,8 @@ CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL)

,128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND. SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k( NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND. kernel),-(NAND.file-system)"
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk
am335x-bonegreen am335x-icev2"

configs/am335x_igep003x_ renamed from configs/am335x_igep003x_defconfig +0 -0

defconfig
index ecfcd78c1aa2..04f2d3374749 100644

configs/am335x_igep003x_defconfig +2 -0

@@ -42,6 +42,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ISO_PARTITION=y

configs/am3517_evm_defconfig +2 -0

index 385ed46e306b..1b6524c95c60 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_NAND=y
 # CONFIG_CMD_MII is not set
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_TIME is not set
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(

MLO),1920k(u-boot),256k(u-boot-env),8m(kernel),512k(dtb),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_SPL_PARTITION_UUIDS=y
CONFIG_OF_CONTROL=y

configs/am43xx_evm_defconfig +2 -0

index da823f9c3185..c1802140dc81 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x40000
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL)

,256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND. SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k( NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND. kernel),-(NAND.file-system)"
CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"

configs/am43xx_evm_ethboot_defconfig +2 -0

index 6715b52f6869..60f05528d292 100644
@@ -39,6 +39,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL)

,256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND. SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k( NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND. kernel),-(NAND.file-system)"
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_FAT=y
CONFIG_DFU_MMC=y

configs/am43xx_evm_usbhost_boot_defconfig +2 -0

index 17d22a00f84a..28cf04a2f796 100644
@@ -41,6 +41,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL)

,256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND. SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k( NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND. kernel),-(NAND.file-system)"
CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"

configs/am43xx_hs_evm_ renamed from configs/am43xx_hs_evm_defconfig +0 -0

defconfig
index a293e140ce04..bed05830ae0f 100644

configs/am43xx_hs_evm_defconfig +2 -0

@@ -30,6 +30,8 @@ CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL)

,256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND. SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k( NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND. kernel),-(NAND.file-system)"
CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"

configs/ap121_defconfig +2 -0

index cea9f2f408e4..92d96a1ef950 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-

boot),64k(u-boot-env),6144k(rootfs),1600k(uImage),64k(NVRAM),64k(ART)"
# CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_NET_RANDOM_ETHADDR=y

configs/ap143_defconfig +2 -0

index 7e8db3cb0847..cbf93dfa3945 100644
@@ -25,6 +25,8 @@ CONFIG_CMD_SPI=y
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-

boot),64k(u-boot-env),6336k(rootfs),1472k(uImage),64k(ART)"
# CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM_SPI_FLASH=y

configs/apf27_defconfig +2 -0

index 378402cc458d..f09c5a828b31 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand.0:1M(u-boot)

ro,512K(env),512K(env2),512K(firmware),512K(dtb),5M(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_MXC=y

configs/apx4devkit_defconfig +2 -0

index a90997c09e3b..47a4ee9e2627 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:128k(

bootstrap),1024k(boot),768k(env),-(root)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_MXS=y

configs/at91sam9n12ek_mmc_defconfig +2 -0

index 5eeac0df9946..1b6a876c5cd6 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=atmel_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:256k(
 bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),

256k(spare),512k(dtb),6M(kernel)ro,-(rootfs)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FAT=y
CONFIG_DM=y

configs/at91sam9n12ek_nandflash_defconfig +2 -0

index 1f0a6d953443..0d56a9abf25d 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=atmel_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:256k(
 bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),

256k(spare),512k(dtb),6M(kernel)ro,-(rootfs)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y

configs/at91sam9n12ek_spiflash_defconfig +2 -0

index 85c6ff076e14..dcada1d816a3 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=atmel_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:256k(
 bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),

256k(spare),512k(dtb),6M(kernel)ro,-(rootfs)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y

configs/bk4r1_defconfig +2 -0

index 714029e3e473..b3645b5105f6 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=NAND,nor0=NOR"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=NAND:640k(bootloader)

,128k(env1),128k(env2),128k(dtb),6144k(kernel),-(root);NOR:-(nor)"
CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y

configs/brppt1_nand_defconfig +2 -0

index c19d73738f64..38444134963c 100644
@@ -47,6 +47,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(

MLO),128k(MLO.backup),128k(dtb),128k(u-boot-env),512k(u- boot),4m(kernel),128m(rootfs),-(user)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_NETCONSOLE=y
# CONFIG_MMC is not set

configs/chiliboard_defconfig +2 -0

index d94b634a4452..cd487faa42fb 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=8000000.nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nand:128k(

NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL. backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND. u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),- (NAND.file-system)"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM_GPIO=y
CONFIG_MMC_OMAP_HS=y

configs/cm_fx6_defconfig +2 -0

index dd539bce0f51..afc2124f943d 100644
@@ -49,6 +49,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),

256k(uboot-environment),-(reserved)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM_MMC=y

configs/cm_t335_defconfig +2 -0

index 56724643b59a..608c25abaed3 100644
@@ -40,6 +40,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:2m(spl),1m(u-

boot),1m(u-boot-env),1m(dtb),4m(splash),6m(kernel),-(rootfs)"
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/cm_t3517_defconfig +2 -0

index dc0ded826950..819a95b0db20 100644
@@ -28,6 +28,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),

1920k(u-boot),256k(u-boot-env),4m(kernel),-(fs)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_LED_STATUS=y
CONFIG_LED_STATUS_GPIO=y

configs/cm_t35_defconfig +2 -0

index bf117228e169..c61a93beb986 100644
@@ -29,6 +29,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),

1920k(u-boot),256k(u-boot-env),4m(kernel),-(fs)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_LED_STATUS=y
CONFIG_LED_STATUS_GPIO=y

configs/colibri_imx7_ renamed from configs/colibri_imx7_defconfig +0 -0

defconfig
index 00e7975652c3..ba45cbf52a46 100644

configs/colibri_imx7_defconfig +2 -0

@@ -37,6 +37,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:512k(mx7-

bcb),1536k(u-boot1)ro,1536k(u-boot2)ro,512k(u-boot-env),-(ubi)"
CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y

configs/colibri_t20_defconfig +2 -0

index 57a2ecc5837f..81a6a4b80ffa 100644
@@ -24,6 +24,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_MTDIDS_DEFAULT="nand0=tegra_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=tegra_nand:2m(u-boot)

ro,1m(u-boot-env),1m(cfgblock)ro,-(ubi)"
CONFIG_CMD_UBI=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set

configs/colibri_vf_defconfig +2 -0

index aabbffd1c5a5..d4bc2a0b190d 100644
@@ -31,6 +31,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=vf610_nfc"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=vf610_nfc:128k(vf-

bcb)ro,1408k(u-boot)ro,512k(u-boot-env),-(ubi)"
CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y

configs/da850evm_defconfig +2 -0

index 3089b932f00b..067ddd7519bf 100644
@@ -29,6 +29,8 @@ CONFIG_CRC32_VERIFY=y
 # CONFIG_CMD_EXT4 is not set
 # CONFIG_CMD_FS_GENERIC is not set
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:512k(u-boot.

ais),64k(u-boot-env),7552k(kernel-spare),64k(MAC-Address)"
CONFIG_CMD_DIAG=y
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y

configs/devkit8000_defconfig +2 -0

index f42f433aa1a6..2e97a88ad930 100644
@@ -26,6 +26,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),

1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/dns325_defconfig +2 -0

index d9813acc89c1..62ad86ced4b9 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896k(u-

boot),128k(u-boot-env),5m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/dockstar_defconfig +1 -0

index 1a3c7cc471c0..9658e5c81f34 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y

configs/draco_defconfig +2 -0

index 79009e5a474d..be0105f5bf3e 100644
@@ -44,6 +44,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(
 spl),128k(spl.backup1),128k(spl.backup2),128k(spl.backup3)

,1920k(u-boot),512k(u-boot.env0),512k(u-boot.env1),512k( mtdoops),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_DOS_PARTITION is not set CONFIG_OF_CONTROL=y

configs/eco5pk_defconfig +2 -0

index 5e00e6147e66..2ab657b72ed2 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(

xloader-nand),1024k(uboot-nand),256k(params-nand),5120k(kernel),-(ubifs)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y

configs/etamin_defconfig +2 -0

index 796dd33df701..8e8ef6f88ed8 100644
@@ -44,6 +44,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
+CONFIG_MTDIDS_DEFAULT="nand2=omap2-nand_concat"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand_concat:

512k(spl),512k(spl.backup1),512k(spl.backup2),512k(spl. backup3),7680k(u-boot),2048k(u-boot.env0),2048k(u-boot. env1),2048k(mtdoops),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_DOS_PARTITION is not set CONFIG_OF_CONTROL=y

configs/ethernut5_defconfig +2 -0

index 3be8add71128..f816a1615ebd 100644
@@ -36,6 +36,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=atmel_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:-(root)"
 CONFIG_CMD_REISER=y
 CONFIG_CMD_UBI=y
 CONFIG_OF_CONTROL=y

configs/flea3_defconfig +2 -0

index 04c52404a2f8..9f9d8ee26e49 100644
@@ -16,6 +16,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand,nor0=physmap-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:50m(root1),
 32m(rootfb),64m(pcache),64m(app1),10m(app2),-(spool);

physmap-flash.0:512k(u-boot),64k(env1),64k(env2),3776k( kernel1),3776k(kernel2)"
CONFIG_ENV_IS_IN_FLASH=y
# CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y

configs/goflexhome_defconfig +2 -0

index f6bf782a7155..80652fec7966 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),

6M(uImage),-(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/guruplug_defconfig +2 -0

index 3fdd5f9af6c4..d219fee508f4 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896K(

uboot),128K(uboot_env),- at 1M(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/gwventana_emmc_ renamed from configs/gwventana_emmc_defconfig +0 -0

defconfig
index e075da762955..6a2ba0223efd 100644

configs/gwventana_emmc_defconfig +2 -0

@@ -49,6 +49,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y

configs/gwventana_gw5904_defconfig +2 -0

index 66af8614688a..bf563d29feb0 100644
@@ -49,6 +49,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y

configs/gwventana_nand_ renamed from configs/gwventana_nand_defconfig +0 -0

defconfig
index 5b3c90797cf6..2d2e64e77d56 100644

configs/gwventana_nand_defconfig +2 -0

@@ -52,6 +52,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y

configs/ib62x0_defconfig +1 -0

index 6685c63aba89..fd7c14886070 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@

0x0(uboot),0x20000 at 0xe0000(uboot_env),- at 0x100000(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/iconnect_defconfig +1 -0

index 728107087df9..fe7fcb124348 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000@

0x0(uboot),0x20000 at 0x80000(uboot_env),- at 0xa0000(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/ids8313_defconfig +2 -0

index ac2a945fedcb..839dfbac8fa8 100644
@@ -26,6 +26,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff800000.flash,nand0=e1000000.flash"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:7m(
 dum),768k(BOOT-BIN),128k(BOOT-ENV),128k(BOOT-REDENV);

e1000000.flash:-(ubi)"
CONFIG_CMD_UBI=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y

configs/imx31_phycore_ renamed from configs/imx31_phycore_defconfig +0 -0

defconfig
index 6be99131348b..471ebd20cbdc 100644

configs/imx31_phycore_defconfig +1 -0

@@ -7,6 +7,7 @@ CONFIG_CMD_EEPROM=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:128k(

uboot)ro,1536k(kernel),-(root)"
CONFIG_ENV_IS_IN_EEPROM=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y

configs/imx31_phycore_eet_defconfig +1 -0

index a8f57ef6cd7e..ce8dd667ebb5 100644
@@ -11,6 +11,7 @@ CONFIG_CMD_SPI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:128k(

uboot)ro,1536k(kernel),-(root)"
CONFIG_ENV_IS_IN_EEPROM=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y

configs/imx6q_logic_defconfig +2 -0

index 8018198f096e..bd8d3a983ffe 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:4m(uboot),

1m(env),16m(kernel),1m(dtb),-(fs)"
CONFIG_ENV_IS_IN_NAND=y
# CONFIG_BLK is not set
CONFIG_SYS_I2C_MXC=y

configs/imx6qdl_icore_nand_defconfig +2 -0

index c341b17daf74..c973331c07ff 100644
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(

uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
CONFIG_ENV_IS_IN_NAND=y

configs/imx6ul_geam_nand_defconfig +2 -0

index d6038c11c580..eb4cccff338a 100644
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(

uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
# CONFIG_BLK is not set

configs/imx6ul_isiot_nand_defconfig +2 -0

index e481151bf315..8349e774359c 100644
@@ -29,6 +29,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(

uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
# CONFIG_BLK is not set

configs/ipam390_defconfig +2 -0

index a462d820082f..8fdf760504f5 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:128k(

u-boot-env),1408k(u-boot),128k(bootparms),384k(factory- info),4M(kernel),-(rootfs)"
CONFIG_CMD_DIAG=y
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y

configs/k2e_evm_defconfig +2 -0

index 7c5b0bcc8ccc..317d4f06264d 100644
@@ -23,6 +23,8 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(

bootloader)ro,512k(params)ro,-(ubifs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/k2e_hs_evm_defconfig +2 -0

index 97b8c065783d..b9be6063b244 100644
@@ -14,6 +14,8 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(

bootloader)ro,512k(params)ro,-(ubifs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/k2g_evm_defconfig +2 -0

index 90a647afb336..32353e9baaf4 100644
@@ -22,6 +22,8 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_GPT is not set
 CONFIG_CMD_REMOTEPROC=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(

bootloader)ro,512k(params)ro,-(ubifs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/k2g_hs_evm_defconfig +2 -0

index f49afd18bd35..9c4530cc814e 100644
@@ -13,6 +13,8 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_GPT is not set
 CONFIG_CMD_REMOTEPROC=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(

bootloader)ro,512k(params)ro,-(ubifs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/k2hk_evm_defconfig +2 -0

index 9db05315ca7c..711544377e28 100644
@@ -23,6 +23,8 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(

bootloader)ro,512k(params)ro,-(ubifs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/k2hk_hs_evm_defconfig +2 -0

index 5b0a68ed3702..f65185f1b6c1 100644
@@ -14,6 +14,8 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(

bootloader)ro,512k(params)ro,-(ubifs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/k2l_evm_defconfig +2 -0

index 2593a0c8e967..d2ec226b9a35 100644
@@ -23,6 +23,8 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(

bootloader)ro,512k(params)ro,-(ubifs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/km_kirkwood_128m16_defconfig +2 -0

index c39d94949d0e..aeb55c12c0b9 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=y

configs/km_kirkwood_defconfig +2 -0

index a956e42abe08..9eed13197e37 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=y

configs/km_kirkwood_pci_ renamed from configs/km_kirkwood_pci_defconfig +0 -0

defconfig
index 4a1c87445630..b24c68513c77 100644

configs/km_kirkwood_pci_defconfig +2 -0

@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=y

configs/kmcoge4_defconfig +2 -0

index e1f6a2486d8a..5c31abeb9911 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=fsl_elbc_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=fsl_elbc_nand:-(ubi0);"
 # CONFIG_CMD_IRQ is not set
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set

configs/kmcoge5ne_defconfig +2 -0

index 68d7aa669480..d4c8e87ab5ab 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot,nand0=app"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);app:-(ubi1);"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_MMC is not set

configs/kmcoge5un_defconfig +2 -0

index 71ed2ea6aab4..6eb4781a0c52 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y

configs/kmeter1_defconfig +2 -0

index 44bb2dbda72e..cf4f97378584 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_MMC is not set

configs/kmlion1_defconfig +2 -0

index 66dbf623112a..c7edcaa43c27 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=fsl_elbc_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=fsl_elbc_nand:-(ubi0);"
 # CONFIG_CMD_IRQ is not set
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set

configs/kmnusa_defconfig +2 -0

index 1348973a4611..22b8b4d2380c 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y

configs/kmopti2_defconfig +2 -0

index 5b405085d873..6eb60190045d 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_MMC is not set

configs/kmsugp1_defconfig +2 -0

index 8d06ed4d50b1..a105b8a81aed 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y

configs/kmsupx5_defconfig +2 -0

index aa63f8354d83..f65a8cf0bd66 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_MMC is not set

configs/kmsuv31_defconfig +2 -0

index d93e839bde11..59d10668a260 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y

configs/kmtegr1_defconfig +2 -0

index 124cbe52aa6f..d90852bcee54 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot,nand0=app"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

256k(qe-fw),128k(env),128k(envred),-(ubi0);app:-(ubi1);"
CONFIG_CMD_DIAG=y
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set

configs/kmtepr2_defconfig +2 -0

index d4dd65f432dd..2593719df02f 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_MMC is not set

configs/kmvect1_defconfig +2 -0

index 46e2345e6c1b..a734a2ab39d6 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);"
CONFIG_CMD_DIAG=y
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set

configs/ls1043aqds_defconfig +1 -0

index c1c837e05a2a..cb4b355cea8b 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y

configs/ls1043aqds_lpuart_defconfig +1 -0

index 89447e1e2008..7e608d7f502d 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y

configs/ls1043aqds_nand_ renamed from configs/ls1043aqds_nand_defconfig +0 -0

defconfig
index d0880a229779..cf43781e8d83 100644

configs/ls1043aqds_nand_defconfig +1 -0

@@ -40,6 +40,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y

configs/ls1043aqds_nor_ddr3_defconfig +1 -0

index 766e3a949edc..909398440d2a 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y

configs/ls1043aqds_qspi_ renamed from configs/ls1043aqds_qspi_defconfig +0 -0

defconfig
index c4dfd1b6cca9..4db4912d4f61 100644

configs/ls1043aqds_qspi_defconfig +1 -0

@@ -26,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:1m(uboot),5m(

kernel),1m(dtb),9m(file_system)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y

configs/ls1043aqds_sdcard_ifc_defconfig +1 -0

index cf0f8700e005..5ff15ba7dce4 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_MMC=y

configs/ls1043aqds_sdcard_qspi_defconfig +1 -0

index 27a933f1f0d5..8e1566bdffad 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:1m(uboot),5m(

kernel),1m(dtb),9m(file_system)"
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_MMC=y

configs/ls1043ardb_SECURE_BOOT_defconfig +1 -0

index d6871c845faa..e5e3e35b4454 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_MTD_NOR_FLASH=y

configs/ls1043ardb_defconfig +1 -0

index 5113b12f7b1a..94524165196f 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y

configs/ls1043ardb_nand_SECURE_BOOT_defconfig +1 -0

index aeee86bf7050..6f20f26a6fc4 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_DM=y

configs/ls1043ardb_nand_ renamed from configs/ls1043ardb_nand_defconfig +0 -0

defconfig
index ab2f082f6a9e..4949cd2a4d42 100644

configs/ls1043ardb_nand_defconfig +1 -0

@@ -37,6 +37,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y

configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +1 -0

index c02af9ade841..d565712a6411 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_DM=y

configs/ls1043ardb_sdcard_defconfig +1 -0

index eac931b9b632..16d544da506d 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_ uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m( kernel),1m(dtb),9m(file_system)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_MMC=y

configs/ls1046aqds_SECURE_BOOT_defconfig +1 -0

index 54c61046dc0c..6d83123be46b 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_ uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)"
CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_MTD_NOR_FLASH=y

configs/ls1046aqds_defconfig +1 -0

index 20e15e88b0bf..d901eb051857 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_ uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y

configs/ls1046aqds_lpuart_defconfig +1 -0

index 6efa766cf7c5..a9a073f201dc 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_ uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y

configs/ls1046aqds_nand_ renamed from configs/ls1046aqds_nand_defconfig +0 -0

defconfig
index 722114bfa566..891d238f81b8 100644

configs/ls1046aqds_nand_defconfig +1 -0

@@ -32,6 +32,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_ uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y

configs/ls1046aqds_qspi_ renamed from configs/ls1046aqds_qspi_defconfig +0 -0

defconfig
index 8772399526ec..b546dfc40217 100644

configs/ls1046aqds_qspi_defconfig +1 -0

@@ -25,6 +25,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:2m(uboot),14m(free)"
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y

configs/ls1046aqds_sdcard_ifc_defconfig +1 -0

index 5b3cd24e853c..e74e9b306db1 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@

0x100000(nor_bank0_uboot),40m at 0x1100000(nor_bank0_fit),7m( nor_bank0_user),2m at 0x4100000(nor_bank4_uboot),40m at 0x5100000 (nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_ uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_MMC=y

configs/ls1046aqds_sdcard_qspi_defconfig +1 -0

index a54a8ebd67a1..6cfd35ba0688 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:2m(uboot),14m(free)"
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y

configs/ls1046ardb_emmc_ renamed from configs/ls1046ardb_emmc_defconfig +0 -0

defconfig
index c339f2d5c313..d1742e4213a0 100644

configs/ls1046ardb_emmc_defconfig +1 -0

@@ -27,6 +27,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(

rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_ uboot),48m(nand_kernel),448m(nand_free)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_MMC=y

configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +1 -0

index dd6febb53377..c7ae1dcccb02 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(

rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_ uboot),48m(nand_kernel),448m(nand_free)"
CONFIG_OF_CONTROL=y
CONFIG_DM=y
CONFIG_SPI_FLASH=y

configs/ls1046ardb_qspi_ renamed from configs/ls1046ardb_qspi_defconfig +0 -0

defconfig
index 03700ac8b167..23ac374b0916 100644

configs/ls1046ardb_qspi_defconfig +1 -0

@@ -18,6 +18,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(

rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_ uboot),48m(nand_kernel),448m(nand_free)"
CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y

configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +1 -0

index 4dd1b01e22d8..76e45173fc9e 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(

rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_ uboot),48m(nand_kernel),448m(nand_free)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_DM=y

configs/ls1046ardb_sdcard_defconfig +1 -0

index 7f82d4a1dc9f..3a9e10201785 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_PCI=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(

rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_ uboot),48m(nand_kernel),448m(nand_free)"
# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_MMC=y

configs/m28evk_defconfig +2 -0

index ee9c78211584..a22132938769 100644
@@ -37,6 +37,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(u-boot),

512k(env1),512k(env2),14m(boot),238m(data),- at 4096k(UBI)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_MXS=y

configs/m53evk_defconfig +2 -0

index 41da15977f30..b064a1667ded 100644
@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1024k(u-

boot),512k(env1),512k(env2),14m(boot),240m(data),- at 2048k(UBI)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_NAND=y

configs/mccmon6_nor_defconfig +2 -0

index 0ecc926777d1..0f9794c9f1a5 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=8000000.nor"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nor:32m at 0x0(

mccmon6-image.nor),256k at 0x40000(u-boot-env.nor),1m at 0x80000(u-boot.nor),8m@ 0x180000(kernel.nor),8m at 0x980000(swupdate-kernel.nor),8m at 0x1180000 (swupdate-rootfs.nor),128k at 0x1980000(kernel-dtb.nor),128k at 0x19C0000( swupdate-kernel-dtb.nor)"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y
CONFIG_MTD=y

configs/mccmon6_sd_defconfig +2 -0

index eacd8dc51826..01a20e61a6e1 100644
@@ -28,6 +28,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=8000000.nor"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nor:32m at 0x0(

mccmon6-image.nor),256k at 0x40000(u-boot-env.nor),1m at 0x80000(u-boot.nor),8m@ 0x180000(kernel.nor),8m at 0x980000(swupdate-kernel.nor),8m at 0x1180000 (swupdate-rootfs.nor),128k at 0x1980000(kernel-dtb.nor),128k at 0x19C0000( swupdate-kernel-dtb.nor)"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y
CONFIG_MTD=y

configs/mcx_defconfig +2 -0

index 7e72676ad36c..a96f08cbd2f5 100644
@@ -31,6 +31,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(

MLO),1m(u-boot),256k(env1),256k(env2),6m(kernel),6m(k_ recovery),8m(fs_recovery),-(common_data)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y

configs/mgcoge3un_defconfig +2 -0

index 3da35cbdf6c3..27f399582c6c 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=y

configs/microblaze-generic_defconfig +2 -0

index faca66b2d106..5254c0da790a 100644
@@ -34,6 +34,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=flash-0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=flash-0:256k(u-boot),

256k(env),3m(kernel),1m(romfs),1m(cramfs),-(jffs2)"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set CONFIG_SPL_OF_CONTROL=y

configs/mt_ventoux_defconfig +2 -0

index ec0c8c19d566..49a48facd493 100644
@@ -28,6 +28,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(

MLO),1m(u-boot),256k(env1),256k(env2),8m(ubisystem),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y

configs/mx28evk_auart_console_defconfig +2 -0

index b18d9f9df464..51d8abc50661 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(

environment),512k(redundant-environment),4m(kernel),512k( fdt),8m(ramdisk),-(filesystem)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_MMC_MXS=y

configs/mx28evk_defconfig +2 -0

index 3d9120238548..fbfd13a76d67 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(

environment),512k(redundant-environment),4m(kernel),512k( fdt),8m(ramdisk),-(filesystem)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_MMC_MXS=y

configs/mx28evk_nand_ renamed from configs/mx28evk_nand_defconfig +0 -0

defconfig
index 9b00372c27c1..6563e0c8ac12 100644

configs/mx28evk_nand_defconfig +2 -0

@@ -32,6 +32,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(

environment),512k(redundant-environment),4m(kernel),512k( fdt),8m(ramdisk),-(filesystem)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_MXS=y

configs/mx28evk_spi_defconfig +2 -0

index 07ae3e68d5b0..7371042af98c 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(

environment),512k(redundant-environment),4m(kernel),512k( fdt),8m(ramdisk),-(filesystem)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_MMC_MXS=y

configs/mx35pdk_defconfig +2 -0

index d4a567cc13d2..2cab9fdc14c7 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand,nor0=physmap-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(boot),5m(

linux),96m(root),8m(cfg),1938m(user);physmap-flash.0:
512k(b),4m(k),30m(u),28m(r)"
CONFIG_EFI_PARTITION=y
# CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_FLASH=y

configs/nsa310s_defconfig +1 -0

index 3f592506bf8a..425b53a0add1 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@

0x0(uboot),0x20000 at 0xe0000(uboot_env),0x100000 at 0x100000( second_stage_uboot),- at 0x200000(root)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/omap3_beagle_ renamed from configs/omap3_beagle_defconfig +0 -0

defconfig
index 1dd1b31f2e85..7dd623d31e9d 100644

configs/omap3_beagle_defconfig +2 -0

@@ -23,6 +23,8 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),

1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_LED_STATUS=y
CONFIG_LED_STATUS0=y

configs/omap3_ha_defconfig +2 -0

index 7e05d968d3f9..a0efce8e1664 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),

1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y

configs/omap3_logic_defconfig +2 -0

index fc3c6fead99d..880126821295 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_SPL_NAND_OFS=0x240000
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(

MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y

configs/omap3_overo_defconfig +2 -0

index 2c896fc5754e..75941df09eb3 100644
@@ -35,6 +35,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(

xloader),1792k(u-boot),256k(environ),8m(linux),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/omap3_pandora_ renamed from configs/omap3_pandora_defconfig +0 -0

defconfig
index c34088d7017a..d9376440766a 100644

configs/omap3_pandora_defconfig +2 -0

@@ -21,6 +21,8 @@ CONFIG_CMD_SPI=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(

xloader),1920k(uboot),128k(uboot-env),10m(boot),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y

configs/omap3_zoom1_defconfig +2 -0

index bedbbd322111..6639c7e466a2 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),

1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/openrd_base_defconfig +2 -0

index e7c49f2c8ff9..efebf82284ec 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand_mtd"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000@

0x000000(uboot),0x400000 at 0x100000(uImage),0x1fb00000 at 0x500000(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/openrd_client_ renamed from configs/openrd_client_defconfig +0 -0

defconfig
index c9233e062d7b..6722e425f116 100644

configs/openrd_client_defconfig +2 -0

@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand_mtd"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000@

0x000000(uboot),0x400000 at 0x100000(uImage),0x1fb00000 at 0x500000(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/openrd_ultimate_ renamed from configs/openrd_ultimate_defconfig +0 -0

defconfig
index 5baada9216db..fb31b1127054 100644

configs/openrd_ultimate_defconfig +2 -0

@@ -19,6 +19,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand_mtd"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000@

0x000000(uboot),0x400000 at 0x100000(uImage),0x1fb00000 at 0x500000(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/pcm052_defconfig +2 -0

index bd0048559c3a..7bfdb50f0d39 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=NAND"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=NAND:640k(bootloader)

,128k(env1),128k(env2),128k(dtb),6144k(kernel),-(root)"
CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y

configs/pcm058_defconfig +2 -0

index 5ed92b9ea8b3..99713c26b2be 100644
@@ -38,6 +38,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y

configs/pengwyn_defconfig +2 -0

index b6f5e7d3c71f..4bb624561783 100644
@@ -48,6 +48,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(
 SPL),512k(SPL.backup1),512k(SPL.backup2),512k(SPL.backup3)

,1536k(u-boot),512k(u-boot-spl-os),512k(u-boot-env),5m(kernel),-(rootfs)"
CONFIG_CMD_DIAG=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/pfla02_defconfig +2 -0

index 37ab8e244069..456ae6581e86 100644
@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:-(nand);

spi2.0:1024k(bootloader),64k(env1),64k(env2),-(rescue)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y

configs/platinum_picon_ renamed from configs/platinum_picon_defconfig +0 -0

defconfig
index b6d6b58df1e5..54d88b2dc0ff 100644

configs/platinum_picon_defconfig +2 -0

@@ -37,6 +37,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),

2M(uboot),512k(env1),512k(env2),495M(ubi0),14M(res0),2M( res1),512k(res2),512k(res3),-(ubi1)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_PHYLIB=y

configs/platinum_titanium_defconfig +2 -0

index 38e228c16b6c..c5f6b7ab6224 100644
@@ -37,6 +37,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),

2M(uboot),512k(env1),512k(env2),-(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_PHYLIB=y

configs/pm9261_defconfig +2 -0

index 7dbd45a1106c..692af14ec8ca 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.0,nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(

u-boot)ro,64k(u-boot-env)ro,1408k(kernel),-(rootfs);nand:-(nand)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y

configs/pm9263_defconfig +2 -0

index fc46de377501..d9cfcb1ca3c1 100644
@@ -23,6 +23,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.0,nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(

u-boot)ro,64k(u-boot-env)ro,1408k(kernel),-(rootfs);nand:-(nand)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y

configs/portl2_defconfig +2 -0

index 7731d35a7862..7db41108b8a3 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=y

configs/pxm2_defconfig +2 -0

index 6e8d9691dc32..dd1d499cc8f2 100644
@@ -49,6 +49,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(
 spl),128k(spl.backup1),128k(spl.backup2),128k(spl.backup3)

,1920k(u-boot),128k(uboot.env),5120k(kernel_a),5120k(kernel_ b),8192k(mtdoops),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y

configs/rastaban_defconfig +2 -0

index 390254847482..5ef17401cfd7 100644
@@ -44,6 +44,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(
 spl),128k(spl.backup1),128k(spl.backup2),128k(spl.backup3)

,1920k(u-boot),512k(u-boot.env0),512k(u-boot.env1),300m( rootfs),512k(mtdoops),-(configuration)"
CONFIG_CMD_UBI=y
# CONFIG_DOS_PARTITION is not set CONFIG_OF_CONTROL=y

configs/rut_defconfig +2 -0

index 5c7b9b8391cf..5271ee1dcf71 100644
@@ -50,6 +50,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(
 spl),128k(spl.backup1),128k(spl.backup2),128k(spl.backup3)

,1920k(u-boot),128k(uboot.env),5120k(kernel_a),5120k(kernel_ b),8192k(mtdoops),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y

configs/s5pc210_universal_defconfig +1 -0

index 09c5a50fc6b5..58bd14a936f2 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=samsung-onenand:128k(
 s-boot),896k(bootloader),256k(params),2816k(config),8m(csa),

7m(kernel),1m(log),12m(modem),60m(qboot),-(UBI)"
CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y
CONFIG_DFU_MMC=y

configs/sheevaplug_defconfig +2 -0

index ce56075a709f..6145077ebf31 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:512K(

uboot),512K(env),4M(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_ENV_IS_IN_NAND=y

configs/smartweb_defconfig +2 -0

index 765d0fae227f..12f0f9307ec2 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=atmel_nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:128k(

Bootstrap),896k(U-Boot),512k(ENV0),512k(ENV1),4M(Linux),-(Root-FS)"
# CONFIG_DOS_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y

configs/smdkc100_defconfig +2 -0

index 221464074d32..308354c32594 100644
@@ -14,6 +14,8 @@ CONFIG_CMD_ONENAND=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="onenand0=s3c-onenand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=s3c-onenand:256k(

bootloader),128k at 0x40000(params),3m at 0x60000(kernel),16m at 0x360000 (test),-(UBI)"
CONFIG_ENV_IS_IN_ONENAND=y
# CONFIG_MMC is not set
CONFIG_NETDEVICES=y

configs/socfpga_arria10_ renamed from configs/socfpga_arria10_defconfig +0 -0

defconfig
index d2e1ead76bb1..f7bcce3bae57 100644

configs/socfpga_arria10_defconfig +1 -0

@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
 CONFIG_DOS_PARTITION=y
 # CONFIG_SPL_DOS_PARTITION is not set
 CONFIG_ENV_IS_IN_MMC=y

configs/socfpga_arria5_ renamed from configs/socfpga_arria5_defconfig +0 -0

defconfig
index 8e4df341db84..8ed6169531bc 100644

configs/socfpga_arria5_defconfig +2 -0

@@ -35,6 +35,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y

configs/socfpga_cyclone5_defconfig +2 -0

index 97262d561667..54c3495f2cad 100644
@@ -35,6 +35,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y

configs/socfpga_de0_nano_soc_defconfig +2 -0

index 18724df35376..2787b60a3996 100644
@@ -37,6 +37,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
CONFIG_CMD_UBI=y
CONFIG_EFI_PARTITION=y
CONFIG_ENV_IS_IN_MMC=y

configs/socfpga_de10_nano_defconfig +1 -0

index 3f2015970226..ecf6de38072d 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y

configs/socfpga_de1_soc_ renamed from configs/socfpga_de1_soc_defconfig +0 -0

defconfig
index 8a33aee89735..97a6c5e5dffc 100644

configs/socfpga_de1_soc_defconfig +1 -0

@@ -36,6 +36,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SPL_DM=y
 CONFIG_FPGA_SOCFPGA=y

configs/socfpga_is1_defconfig +2 -0

index fa55ca2075c8..bba90d9cda4c 100644
@@ -32,6 +32,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SPL_DM=y

configs/socfpga_mcvevk_ renamed from configs/socfpga_mcvevk_defconfig +0 -0

defconfig
index aa8f56479bda..5bae037d63e5 100644

configs/socfpga_mcvevk_defconfig +2 -0

@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y

configs/socfpga_sockit_ renamed from configs/socfpga_sockit_defconfig +0 -0

defconfig
index 65afa7748273..079d46569ed1 100644

configs/socfpga_sockit_defconfig +2 -0

@@ -35,6 +35,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y

configs/socfpga_socrates_defconfig +2 -0

index 81a66af3a874..35773e6adbdf 100644
@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y

configs/socfpga_sr1500_ renamed from configs/socfpga_sr1500_defconfig +0 -0

defconfig
index 09de96bb76af..961b862d7916 100644

configs/socfpga_sr1500_defconfig +2 -0

@@ -36,6 +36,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),256k(env1),256k(env2),14848k(boot),16m(rootfs),- at 1536k(UBI)0"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SPL_DM=y

configs/socfpga_vining_fpga_defconfig +2 -0

index 3f9bf749f56c..c5dbe8954393 100644
@@ -39,6 +39,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=ff705000.spi.0:1m(u-

boot),64k(env1),64k(env2),256k(samtec1),256k(samtec2),-(rcvrfs);"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y

configs/stmark2_defconfig +3 -0

index 3639aaa9e316..ffb8af99b9a2 100644
@@ -18,6 +18,9 @@ CONFIG_CMD_SPI=y
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:1m(u-

boot),7m(kernel),-(rootfs)"
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_REGEX=y

configs/suvd3_defconfig +2 -0

index 60576c4f62d3..b957ff731e32 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_MMC is not set

configs/tao3530_defconfig +2 -0

index 40982fc005ed..4c6368b3177d 100644
@@ -22,6 +22,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),

1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y

configs/thuban_defconfig +2 -0

index ece511fb10c0..2575c004dc27 100644
@@ -44,6 +44,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(
 spl),128k(spl.backup1),128k(spl.backup2),128k(spl.backup3)

,1920k(u-boot),512k(u-boot.env0),512k(u-boot.env1),512k( mtdoops),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_DOS_PARTITION is not set CONFIG_OF_CONTROL=y

configs/ti816x_evm_defconfig +2 -0

index 812b4995ef94..be9c21f29fcd 100644
@@ -30,6 +30,8 @@ CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL)

,128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND. SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k( NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND. kernel),-(NAND.file-system)"
# CONFIG_ISO_PARTITION is not set
# CONFIG_EFI_PARTITION is not set CONFIG_OF_CONTROL=y

configs/titanium_defconfig +2 -0

index 044a323da9b7..c47702ed4e9b 100644
@@ -25,6 +25,8 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),

512k(env1),512k(env2),-(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_PHYLIB=y

configs/tricorder_defconfig +2 -0

index 00a5cc934001..0f6cccc3023b 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_NAND_LOCK_UNLOCK=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(

SPL),1m(u-boot),384k(u-boot-env1),1152k(mtdoops),384k(u- boot-env2),5m(kernel),2m(fdt),-(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_LED_STATUS=y

configs/tricorder_flash_ renamed from configs/tricorder_flash_defconfig +0 -0

defconfig
index 0da1c35c8107..7477b427ece9 100644

configs/tricorder_flash_defconfig +2 -0

@@ -20,6 +20,8 @@ CONFIG_CMD_NAND_LOCK_UNLOCK=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(

SPL),1m(u-boot),384k(u-boot-env1),1152k(mtdoops),384k(u- boot-env2),5m(kernel),2m(fdt),-(ubi)"
CONFIG_CMD_UBI=y
CONFIG_LED_STATUS=y
CONFIG_LED_STATUS0=y

configs/tuge1_defconfig +2 -0

index e13af620d04a..82b73d20b542 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_MMC is not set

configs/tuxx1_defconfig +2 -0

index 422a943c01b7..60404fd213e5 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="nor0=boot"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),

128k(env),128k(envred),-(ubi0);"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_MMC is not set

configs/twister_defconfig +2 -0

index 90b2fde91fe8..04b09ba515af 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(

MLO),1m(u-boot),256k(env1),256k(env2),6m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_MMC_OMAP_HS=y

configs/usb_a9263_dataflash_defconfig +1 -0

index 2a9eeae063f4..e4ed41588b4a 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_SF=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=atmel_nand:16m(

kernel)ro,120m(root1),-(root2)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y

configs/vct_platinum_onenand_defconfig +2 -0

index 9c41e3943c89..d25d71be5dce 100644
@@ -16,6 +16,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="onenand0=onenand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),

128k(env),20m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
CONFIG_ENV_IS_IN_ONENAND=y

configs/vct_platinum_onenand_small_defconfig +2 -0

index 49f83427baec..855e8f006b4f 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_ONENAND=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="onenand0=onenand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),

128k(env),20m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_ISO_PARTITION is not set

configs/vct_platinumavc_onenand_defconfig +2 -0

index c2661371cfd3..ffa9977566e0 100644
@@ -14,6 +14,8 @@ CONFIG_CMD_ONENAND=y
 CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="onenand0=onenand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),

128k(env),20m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_ISO_PARTITION is not set

configs/vct_platinumavc_onenand_small_defconfig +2 -0

index 6e3f0a7a3cc8..b35669fc2958 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_ONENAND=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="onenand0=onenand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),

128k(env),20m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_ISO_PARTITION is not set

configs/vct_premium_onenand_defconfig +2 -0

index 5cfbebf6773b..041be5353d38 100644
@@ -16,6 +16,8 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="onenand0=onenand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),

128k(env),20m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
CONFIG_ENV_IS_IN_ONENAND=y

configs/vct_premium_onenand_small_defconfig +2 -0

index 68958bcd04b6..6489039fe843 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_ONENAND=y
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_JFFS2=y
+CONFIG_MTDIDS_DEFAULT="onenand0=onenand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(u-boot),

128k(env),20m(kernel),-(rootfs)"
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
# CONFIG_ISO_PARTITION is not set

configs/vf610twr_defconfig +2 -0

index 79bb71d7474f..9845a478d8c6 100644
@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=fsl_nfc"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=fsl_nfc:128k(vf-bcb)

ro,1408k(u-boot)ro,512k(u-boot-env),4m(kernel),512k(fdt),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_MMC=y

configs/vf610twr_nand_ renamed from configs/vf610twr_nand_defconfig +0 -0

defconfig
index da6fff41d605..50d9a6286fed 100644

configs/vf610twr_nand_defconfig +2 -0

@@ -18,6 +18,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=fsl_nfc"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=fsl_nfc:128k(vf-bcb)

ro,1408k(u-boot)ro,512k(u-boot-env),4m(kernel),512k(fdt),-(rootfs)"
CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y

configs/woodburn_defconfig +2 -0

index c2135e15aad2..4d50d4e2f7af 100644
@@ -19,6 +19,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand,nor0=physmap-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:50m(root1),
 32m(rootfb),64m(pcache),64m(app1),10m(app2),-(spool);

physmap-flash.0:512k(u-boot),64k(env1),64k(env2),3776k( kernel1),3776k(kernel2)"
CONFIG_EFI_PARTITION=y
# CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_FLASH=y

configs/woodburn_sd_defconfig +2 -0

index 9b1b376efdb0..4fe5f2f1bf32 100644
@@ -29,6 +29,8 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand,nor0=physmap-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:50m(root1),
 32m(rootfb),64m(pcache),64m(app1),10m(app2),-(spool);

physmap-flash.0:512k(u-boot),64k(env1),64k(env2),3776k( kernel1),3776k(kernel2)"
CONFIG_EFI_PARTITION=y
# CONFIG_PARTITION_UUIDS is not set
# CONFIG_SPL_PARTITION_UUIDS is not set

configs/x600_defconfig +2 -0

index 3f81b18d4d91..4658f977a4fd 100644
@@ -33,6 +33,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:64M(ubi0),64M(ubi1)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y

include/configs/BSC9131RDB.h +0 -3

index 62a9a13962d5..c3a7e1da3ef7 100644
@@ -322,9 +322,6 @@ extern unsigned long get_sdram_size(void);
  */
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT "nand0=ff800000.flash,"
-#define MTDPARTS_DEFAULT "mtdparts=ff800000.flash:1m(uboot)," \
-                       "8m(kernel),512k(dtb),-(fs)"
 
 /*
  * Environment Configuration

include/configs/BSC9132QDS.h +0 -4

index b90f54a015b8..fcacd169118d 100644
@@ -534,10 +534,6 @@ combinations. this should be removed later
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=88000000.nor,nand0=ff800000.flash,"
-#define MTDPARTS_DEFAULT "mtdparts=88000000.nor:256k(dtb),7m(kernel)," \
-                       "55m(fs),1m(uboot);ff800000.flash:1m(uboot)," \
-                       "8m(kernel),512k(dtb),-(fs)"
 #endif
 /*
  * Environment Configuration

include/configs/M54418TWR.h +0 -8

index b5d51d775f04..6469a919f6df 100644
@@ -293,20 +293,12 @@
 #define CONFIG_JFFS2_DEV               "nand0"
 #define CONFIG_JFFS2_PART_OFFSET       (0x800000)
 #define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT         "nand0=m54418twr.nand"
-
-#define MTDPARTS_DEFAULT       "mtdparts=m54418twr.nand:1m(data),"     \
-                                               "7m(kernel),"           \
-                                               "-(rootfs)"
 
 #endif
 
 #ifdef CONFIG_CMD_UBI
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts command */
 #define CONFIG_MTD_PARTITIONS  /* mtdparts and UBI support */
-#define MTDIDS_DEFAULT         "nand0=NAND"
-#define MTDPARTS_DEFAULT       "mtdparts=NAND:1m(u-boot),"     \
-                                       "-(ubi)"
 #endif
 /* Cache Configuration */
 #define CONFIG_SYS_CACHELINE_SIZE      16

include/configs/MPC8313ERDB.h +0 -3

index 78e6811eceeb..0f60892509df 100644
@@ -259,9 +259,6 @@
 
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITION
-#define MTDIDS_DEFAULT                 "nand0=e2800000.flash"
-#define MTDPARTS_DEFAULT               \
-       "mtdparts=e2800000.flash:512k(uboot),128k(env),6m at 1m(kernel)

,-(fs)"

#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_NAND_FSL_ELBC 1

include/configs/MPC8315ERDB.h +0 -3

index 2ff67d6cced7..b6715418fc8c 100644
@@ -235,9 +235,6 @@
 
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITION
-#define MTDIDS_DEFAULT                 "nand0=e0600000.flash"
-#define MTDPARTS_DEFAULT               \
-       "mtdparts=e0600000.flash:512k(uboot),128k(env),6m at 1m(kernel)

,-(fs)"

#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_NAND_FSL_ELBC 1

include/configs/P1010RDB.h +0 -3

index 13edd0ac9c05..79f4cd78e759 100644
@@ -352,9 +352,6 @@ extern unsigned long get_sdram_size(void);
 
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITION
-#define MTDIDS_DEFAULT                 "nand0=ff800000.flash"
-#define MTDPARTS_DEFAULT               \
-       "mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),

56m(fs),-(usr)"

#define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS)

\
                                | CSPR_PORT_SIZE_8      \

include/configs/P1022DS.h +0 -11

index aadbe027067d..4756a7102da0 100644
@@ -532,17 +532,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_FLASH_CFI_MTD
-#ifdef CONFIG_PHYS_64BIT
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=fe8000000.nor:48m(ramdisk)," \
-                       "14m(diagnostic),2m(dink),6m(kernel),58112k(fs),"
 \
-                       "512k(dtb),768k(u-boot)"
-#else
-#define MTDIDS_DEFAULT "nor0=e8000000.nor"
-#define MTDPARTS_DEFAULT "mtdparts=e8000000.nor:48m(ramdisk)," \
-                       "14m(diagnostic),2m(dink),6m(kernel),58112k(fs),"
 \
-                       "512k(dtb),768k(u-boot)"
-#endif
 

/*
* Environment

include/configs/T102xQDS.h +0 -7

index 158ad69c419c..259e8a01f38d 100644
@@ -752,13 +752,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT    "nor0=fe8000000.nor,nand0=fff800000.flash," \
-                         "spi0=spife110000.0"
-#define 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)"
 #endif
 

/*

include/configs/T102xRDB.h +0 -6

index fbb58f9ffacb..7dee2f0d4511 100644
@@ -764,12 +764,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
-                       "spi0=spife110000.1"
-#define 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)"
 #endif

/*

include/configs/T1040QDS.h +0 -7

index f6547fd5e503..c694e50c2c2e 100644
@@ -631,13 +631,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
-                       "spi0=spife110000.0"
-#define 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)"
 #endif

/*

include/configs/T104xRDB.h +0 -0

index f472c3c97b43..2dbeffdd2a97 100644
@@ -788,13 +788,6 @@ $(SRCTREE)/board/freescale/

t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_FLASH_CFI_MTD

include/configs/T104xRDB.h +0 -3

-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
-                       "spi0=spife110000.0"
-#define MTDPARTS_DEFAULT       "mtdparts=fe8000000.nor:1m(uboot),5m(kernel),"

\

include/configs/T104xRDB.h +0 -3

-                               "128k(dtb),96m(fs),-(user);"\
-                               "fff800000.flash:2m(uboot),9m(kernel),"\
-                               "128k(dtb),96m(fs),-(user);spife110000.0:"

\

include/configs/T104xRDB.h +0 -1

-                               "2m(uboot),9m(kernel),128k(dtb),-(user)"
 #endif
 
 /*

include/configs/T208xQDS.h +0 -6

index c9e2a6cdb59b..41926f76e68a 100644
@@ -718,12 +718,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
-                       "spi0=spife110000.0"
-#define 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)"
 #endif

/*

include/configs/T208xRDB.h +0 -6

index 233e0ab8faab..d2ddb17fce25 100644
@@ -666,12 +666,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT "nor0=fe8000000.nor,nand0=fff800000.flash," \
-                       "spi0=spife110000.1"
-#define 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.1:"
 \
-                       "1m(uboot),5m(kernel),128k(dtb),-(user)"
 #endif

/*

include/configs/TQM834x.h +0 -5

index 77d0bc304d20..0c6bcae33cf5 100644
@@ -491,11 +491,6 @@
 /* mtdparts command line support */
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT         "nor0=TQM834x-0"
 
 /* default mtd partition table */
-#define MTDPARTS_DEFAULT       "mtdparts=TQM834x-0:256k(u-boot),256k(env),"
 \
-                                               "1m(kernel),2m(initrd)," \
-                                               "-(user);" \
-

#endif /* __CONFIG_H */

include/configs/am335x_evm.h +2 -19

index 0e082648581c..4823a7e4f3cf 100644
@@ -38,8 +38,8 @@
 
 #ifdef CONFIG_NAND
 #define NANDARGS \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \

@@ -215,18 +215,6 @@
 #define CONFIG_SYS_NAND_ECCBYTES       14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW
-#define MTDIDS_DEFAULT                 "nand0=nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=nand.0:" \
-                                       "128k(NAND.SPL)," \
-                                       "128k(NAND.SPL.backup1)," \
-                                       "128k(NAND.SPL.backup2)," \
-                                       "128k(NAND.SPL.backup3)," \
-                                       "256k(NAND.u-boot-spl-os)," \
-                                       "1m(NAND.u-boot)," \
-                                       "128k(NAND.u-boot-env)," \
-                                       "128k(NAND.u-boot-env.backup1)," \
-                                       "8m(NAND.kernel)," \
-                                       "-(NAND.file-system)"
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x000c0000
 /* NAND: SPL related configs */
 #ifdef CONFIG_SPL_OS_BOOT

@@ -301,11 +289,6 @@
 #define CONFIG_ENV_SECT_SIZE           (4 << 10) /* 4 KB sectors */
 #define CONFIG_ENV_OFFSET              (768 << 10) /* 768 KiB in */
 #define CONFIG_ENV_OFFSET_REDUND       (896 << 10) /* 896 KiB in */
-#define MTDIDS_DEFAULT                 "nor0=m25p80-flash.0"
-#define MTDPARTS_DEFAULT               "mtdparts=m25p80-flash.0:128k(SPL),"
 \
-                                       "512k(u-boot),128k(u-boot-env1),"
 \
-                                       "128k(u-boot-env2),3464k(kernel),"
 \
-                                       "-(rootfs)"

#elif defined(CONFIG_EMMC_BOOT)
#define CONFIG_SYS_MMC_ENV_DEV 1
#define CONFIG_SYS_MMC_ENV_PART 2

include/configs/am335x_evm.h +0 -6

@@ -317,12 +300,6 @@
 #define CONFIG_ENV_SECT_SIZE           (128 << 10)     /* 128 KiB */
 #define CONFIG_ENV_OFFSET              (512 << 10)     /* 512 KiB */
 #define CONFIG_ENV_OFFSET_REDUND       (768 << 10)     /* 768 KiB */
-#define MTDIDS_DEFAULT                 "nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT               "mtdparts=physmap-flash.0:" \
-                                       "512k(u-boot)," \
-                                       "128k(u-boot-env1)," \
-                                       "128k(u-boot-env2)," \
-                                       "4m(kernel),-(rootfs)"
 #elif defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_ENV_OFFSET              0x001c0000
 #define CONFIG_ENV_OFFSET_REDUND       0x001e0000

include/configs/am335x_ renamed from include/configs/am335x_igep003x.h +0 -0

igep003x.h
index 2400eee390ae..d5b63e630e50 100644

include/configs/am335x_igep003x.h +2 -4

@@ -63,8 +63,8 @@
                                "bootz ${loadaddr} - ${fdtaddr};" \
                        "fi;" \
                "fi;\0" \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandroot=ubi0:rootfs rw ubi.mtd=1\0" \
        "nandrootfstype=ubifs rootwait\0" \
        "nandload=ubi part UBI; " \

@@ -118,9 +118,6 @@
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 
-#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:512k(

SPL),-(UBI)"

include/configs/am335x_igep003x.h +0 -1

-
 /* SPL */
 
 /* UBI configuration */

include/configs/am3517_evm.h +2 -13

index f4d2a2e0ce26..33ed85e6a546 100644
@@ -106,17 +106,6 @@
  *  DTB                  4 * NAND_BLOCK_SIZE = 512 KiB  @ 0xAA0000
  *  RootFS              Remaining Flash Space           @ 0xB20000
  */
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:"      \
-       "512k(MLO),"                                    \
-       "1920k(u-boot),"                                \
-       "256k(u-boot-env),"                             \
-       "8m(kernel),"                                   \
-       "512k(dtb),"                                    \
-       "-(rootfs)"
-#else
-#define MTDIDS_DEFAULT
-#define MTDPARTS_DEFAULT
 #endif /* CONFIG_NAND */
 
 /* Environment information */

@@ -132,8 +121,8 @@
        "bootenv=uEnv.txt\0" \
        "cmdline=\0" \
        "optargs=\0" \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "mmcdev=0\0" \
        "mmcpart=1\0" \
        "mmcroot=/dev/mmcblk0p2 rw\0" \

include/configs/am43xx_evm.h +0 -13

index 159954d7de56..302181bd2d8b 100644
@@ -124,19 +124,6 @@
 #define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
 #define CONFIG_ENV_OFFSET              0x110000
 #define CONFIG_ENV_OFFSET_REDUND       0x120000
-#ifdef MTDIDS_DEFAULT
-#undef MTDIDS_DEFAULT
-#endif
-#ifdef MTDPARTS_DEFAULT
-#undef MTDPARTS_DEFAULT
-#endif
-#define MTDPARTS_DEFAULT               "mtdparts=qspi.0:512k(QSPI.u-boot),"
 \
-                                       "512k(QSPI.u-boot.backup)," \
-                                       "512k(QSPI.u-boot-spl-os)," \
-                                       "64k(QSPI.u-boot-env)," \
-                                       "64k(QSPI.u-boot-env.backup)," \
-                                       "8m(QSPI.kernel)," \
-                                       "-(QSPI.file-system)"
 #endif
 

/* SPI */

include/configs/am43xx_evm.h +0 -12

@@ -283,18 +270,6 @@
                        }
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       26
-#define MTDIDS_DEFAULT                 "nand0=nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=nand.0:" \
-                                       "256k(NAND.SPL)," \
-                                       "256k(NAND.SPL.backup1)," \
-                                       "256k(NAND.SPL.backup2)," \
-                                       "256k(NAND.SPL.backup3)," \
-                                       "512k(NAND.u-boot-spl-os)," \
-                                       "1m(NAND.u-boot)," \
-                                       "256k(NAND.u-boot-env)," \
-                                       "256k(NAND.u-boot-env.backup1)," \
-                                       "7m(NAND.kernel)," \
-                                       "-(NAND.file-system)"
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x00180000
 /* NAND: SPL related configs */
 /* NAND: SPL falcon mode configs */

@@ -302,8 +277,8 @@
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00300000 /* kernel

offset */
#endif
#define NANDARGS \

include/configs/am43xx_evm.h +2 -2

-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \

include/configs/ap121.h +0 -6

index a71b8a507971..251d2583e284 100644
@@ -31,12 +31,6 @@
                                        "mtdparts default;" \
                                        "bootm 0x9f650000"
 
-#define MTDIDS_DEFAULT                  "nor0=spi-flash.0"
-#define MTDPARTS_DEFAULT                "mtdparts=spi-flash.0:" \
-                                       "256k(u-boot),64k(u-boot-env)," \
-                                       "6144k(rootfs),1600k(uImage)," \
-                                       "64k(NVRAM),64k(ART)"
-
 #define CONFIG_ENV_SPI_MAX_HZ           25000000
 #define CONFIG_ENV_OFFSET               0x40000
 #define CONFIG_ENV_SECT_SIZE            0x10000

include/configs/ap143.h +0 -6

index 5f7ea9d98b42..cfea0b2039f0 100644
@@ -35,12 +35,6 @@
                                        "mtdparts default;" \
                                        "bootm 0x9f680000"
 
-#define MTDIDS_DEFAULT                  "nor0=spi-flash.0"
-#define MTDPARTS_DEFAULT                "mtdparts=spi-flash.0:" \
-                                       "256k(u-boot),64k(u-boot-env)," \
-                                       "6336k(rootfs),1472k(uImage)," \
-                                       "64k(ART)"
-
 #define CONFIG_ENV_SPI_MAX_HZ           25000000
 #define CONFIG_ENV_OFFSET               0x40000
 #define CONFIG_ENV_SECT_SIZE            0x10000

include/configs/apf27.h +1 -12

index 99a96d976774..8294101029d6 100644
@@ -87,17 +87,6 @@
 #define        CONFIG_KERNEL_OFFSET            0x00300000
 #define        CONFIG_ROOTFS_OFFSET            0x00800000
 
-#define CONFIG_MTDMAP                  "mxc_nand.0"
-#define MTDIDS_DEFAULT                 "nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT       "mtdparts=" CONFIG_MTDMAP \
-                               ":1M(u-boot)ro," \
-                               "512K(env)," \
-                               "512K(env2)," \
-                               "512K(firmware)," \
-                               "512K(dtb)," \
-                               "5M(kernel)," \
-                               "-(rootfs)"
-
 /*
  * U-Boot general configurations
  */

@@ -134,7 +123,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "env_version="          __stringify(CONFIG_ENV_VERSION)
 "\0" \
        "consoledev="           __stringify(ACFG_CONSOLE_DEV)
 "\0" \
-       "mtdparts="             MTDPARTS_DEFAULT
 "\0" \
+       "mtdparts="             CONFIG_MTDPARTS_DEFAULT "\0" \

        "partition=nand0,6\0"                                           \
        "u-boot_addr="          __stringify(ACFG_MONITOR_OFFSET)

"\0" \
"env_addr=" __stringify(CONFIG_ENV_OFFSET)
"\0" \

include/configs/apx4devkit.h +1 -6

index bb6812546228..903834cd2ed4 100644
@@ -49,11 +49,6 @@
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT                 "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT \
-       "mtdparts=gpmi-nand:128k(bootstrap),1024k(boot),768k(env),-(root)"
-#else
-#define MTDPARTS_DEFAULT               ""
 #endif
 
 /* FEC Ethernet on SoC */

@@ -80,7 +75,7 @@
 
 /* Extra Environments */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "verify=no\0" \
        "bootcmd=run bootcmd_nand\0" \
        "kernelargs=console=tty0 console=ttyAMA0,115200 consoleblank=0\0" \

include/configs/ renamed from include/configs/at91sam9n12ek.h +0 -0

at91sam9n12ek.h
index 111a7dce7d07..0923b410a1ba 100644

include/configs/at91sam9n12ek.h +1 -6

@@ -76,15 +76,10 @@
 
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT                 "nand0=atmel_nand"
-#define MTDPARTS_DEFAULT                                               \
-       "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"          \
-       "256k(env),256k(env_redundant),256k(spare),"                    \
-       "512k(dtb),6M(kernel)ro,-(rootfs)"
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                       \
        "console=console=ttyS0,115200\0"                                \
-       "mtdparts="MTDPARTS_DEFAULT"\0"                                 \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"
      \
        "bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
        "bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"

include/configs/baltos.h +2 -11

index 6435e5d9c973..3fc9e2f544cd 100644
@@ -48,8 +48,8 @@
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */
 #endif
 #define NANDARGS \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "${mtdparts} " \

@@ -297,15 +297,6 @@
 /* NAND support */
 #ifdef CONFIG_NAND
 #define GPMC_NAND_ECC_LP_x8_LAYOUT     1
-#if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT)
-#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:128k(SPL),"
 \
-                                       "128k(SPL.backup1)," \
-                                       "128k(SPL.backup2)," \
-                                       "128k(SPL.backup3)," \
-                                       "1920k(u-boot)," \
-                                       "-(UBI)"
-#endif
 #endif
 

#endif /* ! __CONFIG_BALTOS_H */

include/configs/bav335x.h +2 -20

index e7770b69db6d..8917bbed6ff2 100644
@@ -39,8 +39,8 @@
 
 #ifdef CONFIG_NAND
 #define NANDARGS \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \

@@ -369,19 +369,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_SYS_NAND_ECCBYTES       14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW
-#define MTDIDS_DEFAULT                 "nand0=nand.0"
-#define MTDPARTS_DEFAULT  \
-       "mtdparts=nand.0:" \
-       "128k(NAND.SPL)," \
-       "128k(NAND.SPL.backup1)," \
-       "128k(NAND.SPL.backup2)," \
-       "128k(NAND.SPL.backup3)," \
-       "256k(NAND.u-boot-spl-os)," \
-       "1m(NAND.u-boot)," \
-       "128k(NAND.u-boot-env)," \
-       "128k(NAND.u-boot-env.backup1)," \
-       "8m(NAND.kernel)," \
-       "-(NAND.rootfs)"
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x000c0000
 #define CONFIG_ENV_OFFSET              0x001c0000
 #define CONFIG_ENV_OFFSET_REDUND       0x001e0000

@@ -484,11 +471,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_ENV_SECT_SIZE           (4 << 10) /* 4 KB sectors */
 #define CONFIG_ENV_OFFSET              (768 << 10) /* 768 KiB in */
 #define CONFIG_ENV_OFFSET_REDUND       (896 << 10) /* 896 KiB in */
-#define MTDIDS_DEFAULT                 "nor0=m25p80-flash.0"
-#define MTDPARTS_DEFAULT               "mtdparts=m25p80-flash.0:128k(SPL),"
 \
-                                       "512k(u-boot),128k(u-boot-env1),"
 \
-                                       "128k(u-boot-env2),3464k(kernel),"
 \
-                                       "-(rootfs)"

#elif defined(CONFIG_EMMC_BOOT)
#define CONFIG_SYS_MMC_ENV_DEV 1
#define CONFIG_SYS_MMC_ENV_PART 2

include/configs/bav335x.h +0 -7

@@ -532,13 +514,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_ENV_SECT_SIZE           (128 << 10)     /* 128 KiB */
 #define CONFIG_ENV_OFFSET              (512 << 10)     /* 512 KiB */
 #define CONFIG_ENV_OFFSET_REDUND       (768 << 10)     /* 768 KiB */
-#define MTDIDS_DEFAULT                 "nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT \
-       "mtdparts=physmap-flash.0:" \
-       "512k(u-boot)," \
-       "128k(u-boot-env1)," \
-       "128k(u-boot-env2)," \
-       "4m(kernel),-(rootfs)"
 #endif
 #endif  /* NOR support */
 

include/configs/bk4r1.h +0 -8

index 5861eeb178af..c8631ce939a7 100644
@@ -19,14 +19,6 @@
 #define PCM052_NET_INIT "run set_gpio122; "
 
 /* add NOR to MTD env */
-#define MTDIDS_DEFAULT                 "nand0=NAND,nor0=NOR"
-#define MTDPARTS_DEFAULT               "mtdparts=NAND:640k(bootloader)"\
-                                       ",128k(env1)"\
-                                       ",128k(env2)"\
-                                       ",128k(dtb)"\
-                                       ",6144k(kernel)"\
-                                       ",-(root);"\
-                                       "NOR:-(nor)"
 
 /* now include standard PCM052 config */
 

include/configs/brppt1.h +2 -12

index 2af575a1382a..2dadcaecf5ce 100644
@@ -83,8 +83,8 @@
 
 #ifdef CONFIG_NAND
 #define NANDARGS \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "${optargs_rot} " \

@@ -206,16 +206,6 @@ MMCARGS
 #define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x80000
 
-#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:" \
-                                       "128k(MLO)," \
-                                       "128k(MLO.backup)," \
-                                       "128k(dtb)," \
-                                       "128k(u-boot-env)," \
-                                       "512k(u-boot)," \
-                                       "4m(kernel),"\
-                                       "128m(rootfs),"\
-                                       "-(user)"
 #define CONFIG_NAND_OMAP_GPMC_WSCFG    1
 #endif /* CONFIG_NAND */
 

include/configs/chiliboard.h +2 -14

index 80d4e49f6d6a..eedaec62a28d 100644
@@ -20,8 +20,8 @@
 #define V_SCLK                         (V_OSCK)
 
 #define NANDARGS \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} ${optargs} " \
                "${mtdparts} " \
                "root=${nandroot} " \

@@ -148,18 +148,6 @@
 #define CONFIG_SYS_NAND_ECCBYTES       14
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW
-#define MTDIDS_DEFAULT                 "nand0=8000000.nand"
-#define MTDPARTS_DEFAULT               "mtdparts=8000000.nand:" \
-                                       "128k(NAND.SPL)," \
-                                       "128k(NAND.SPL.backup1)," \
-                                       "128k(NAND.SPL.backup2)," \
-                                       "128k(NAND.SPL.backup3)," \
-                                       "256k(NAND.u-boot-spl-os)," \
-                                       "1m(NAND.u-boot)," \
-                                       "128k(NAND.u-boot-env)," \
-                                       "128k(NAND.u-boot-env.backup1)," \
-                                       "8m(NAND.kernel)," \
-                                       "-(NAND.file-system)"
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x000c0000
 /* NAND: SPL related configs */
 

include/configs/cm_fx6.h +2 -8

index e278961177b8..da3233e965b4 100644
@@ -53,12 +53,6 @@
 #define CONFIG_SPI_FLASH_MTD
 #endif
 
-#define MTDIDS_DEFAULT         "nor0=spi0.0"
-#define MTDPARTS_DEFAULT       "mtdparts=spi0.0:" \
-                               "768k(uboot)," \
-                               "256k(uboot-environment)," \
-                               "-(reserved)"
-
 /* Environment */
 #define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE

@@ -88,8 +82,8 @@
        "video_dvi=mxcfb0:dev=dvi,1280x800M-32 at 50,if=RGB32\0" \
        "doboot=bootm ${loadaddr}\0" \
        "doloadfdt=false\0" \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "setboottypez=setenv kernel ${zImage};" \
                "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
                "setenv doloadfdt true;\0" \

include/configs/cm_t335.h +2 -7

index 2287d5b6e455..d6ebdcd60071 100644
@@ -43,8 +43,8 @@
                "bootm ${loadaddr}\0"
 
 #define NANDARGS \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandroot=ubi0:rootfs rw\0" \
        "nandrootfstype=ubifs\0" \
        "nandargs=setenv bootargs console=${console} " \

@@ -125,11 +125,6 @@
 #undef CONFIG_SYS_NAND_U_BOOT_OFFS
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x200000
 
-#define MTDIDS_DEFAULT                 "nand0=nand"
-#define MTDPARTS_DEFAULT               "mtdparts=nand:2m(spl)," \
-                                       "1m(u-boot),1m(u-boot-env)," \
-                                       "1m(dtb),4m(splash)," \
-                                       "6m(kernel),-(rootfs)"
 #define CONFIG_ENV_OFFSET              0x300000 /* environment starts

here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_SYS_NAND_ONFI_DETECTION

include/configs/cm_t35.h +0 -4

index 7cb31241539e..dc1b6b572153 100644
@@ -83,10 +83,6 @@
 /* commands to include */
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT         "nand0=nand"
-#define MTDPARTS_DEFAULT       "mtdparts=nand:512k(x-loader),"\
-                               "1920k(u-boot),256k(u-boot-env),"\
-                               "4m(kernel),-(fs)"
 
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000

include/configs/cm_t3517.h +0 -4

index fbb11356978c..a472b9f53823 100644
@@ -91,10 +91,6 @@
 /* commands to include */
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT         "nand0=nand"
-#define MTDPARTS_DEFAULT       "mtdparts=nand:512k(x-loader),"\
-                               "1920k(u-boot),256k(u-boot-env),"\
-                               "4m(kernel),-(fs)"
 
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    400000

include/configs/colibri_ renamed from include/configs/colibri_imx7.h +0 -0

imx7.h
index 30a2d1286b83..04036c87fd35 100644

include/configs/colibri_imx7.h +1 -8

@@ -105,7 +105,7 @@
        "m4boot=;\0" \
        "ip_dyn=yes\0" \
        "kernel_file=zImage\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "${board}/flash_eth.img && source ${loadaddr}\0" \

@@ -170,13 +170,6 @@
 /* Dynamic MTD partition support */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT         "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT       "mtdparts=gpmi-nand:"           \
-                               "512k(mx7-bcb),"                \
-                               "1536k(u-boot1)ro,"             \
-                               "1536k(u-boot2)ro,"             \
-                               "512k(u-boot-env),"             \
-                               "-(ubi)"
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 #define CONFIG_APBH_DMA

include/configs/colibri_t20.h +0 -6

index d51f7bd9cda9..e7f9405111fc 100644
@@ -45,12 +45,6 @@
 /* Dynamic MTD partition support */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT         "nand0=tegra_nand"
-#define MTDPARTS_DEFAULT       "mtdparts=tegra_nand:"          \
-                               "2m(u-boot)ro,"                 \
-                               "1m(u-boot-env),"               \
-                               "1m(cfgblock)ro,"               \
-                               "-(ubi)"
 
 /* Environment in NAND, 64K is a bit excessive but erase block is 512K

anyway */
#define CONFIG_ENV_OFFSET (SZ_2M)

include/configs/colibri_t20.h +1 -1

@@ -58,7 +52,7 @@
 #define CONFIG_ENV_SIZE                        (SZ_64K)
 
 #define BOARD_EXTRA_ENV_SETTINGS \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
 
 /* Increase console I/O buffer size */
 #undef CONFIG_SYS_CBSIZE

include/configs/colibri_vf.h +1 -7

index 8166aa4afb19..12a1e8a79794 100644
@@ -50,12 +50,6 @@
 /* Dynamic MTD partition support */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT         "nand0=vf610_nfc"
-#define MTDPARTS_DEFAULT       "mtdparts=vf610_nfc:"           \
-                               "128k(vf-bcb)ro,"               \
-                               "1408k(u-boot)ro,"              \
-                               "512k(u-boot-env),"             \
-                               "-(ubi)"
 
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0

@@ -129,7 +123,7 @@
        "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
        "source ${loadaddr}\0" \
        "setupdate=run setsdupdate || run setusbupdate\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
        "video-mode=dcufb:640x480-16 at 60,monitor=lcd\0" \
        "splashpos=m,m\0" \

include/configs/da850evm.h +0 -0

index 1250112662f8..43646490ec35 100644
@@ -252,12 +252,6 @@
 #endif
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS          /* required for UBI partition

support */

include/configs/da850evm.h +0 -6

-#define MTDIDS_DEFAULT                 "nor0=spi0.0"
-#define MTDPARTS_DEFAULT               "mtdparts=spi0.0:"\
-                                               "512k(u-boot.ais),"\
-                                               "64k(u-boot-env),"\
-                                               "7552k(kernel-spare),"\
-                                               "64k(MAC-Address)"
 #endif
 
 /*

include/configs/devkit8000.h +0 -7

index 2c2d6081605c..5f47c0f95e35 100644
@@ -67,13 +67,6 @@
 #define CONFIG_TWL4030_LED             1
 
 /* Board NAND Info */
-#define MTDIDS_DEFAULT                 "nand0=nand"
-#define MTDPARTS_DEFAULT               "mtdparts=nand:" \
-                                               "512k(x-loader)," \
-                                               "1920k(u-boot)," \
-                                               "128k(u-boot-env)," \
-                                               "4m(kernel)," \
-                                               "-(fs)"
 
 #define CONFIG_SYS_NAND_ADDR           NAND_BASE       /* physical

address */

                                                        /* to access nand

*/

include/configs/dns325.h +1 -5

index f8166854c1e4..cb0d2413f931 100644
@@ -82,10 +82,6 @@
 /*
  * Default environment variables
  */
-#define MTDIDS_DEFAULT                 "nand0=orion_nand"
-
-#define MTDPARTS_DEFAULT               "mtdparts=orion_nand:" \
-       "896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "stdin=serial\0" \

@@ -94,7 +90,7 @@
        "loadaddr=0x800000\0" \
        "autoload=no\0" \
        "console=ttyS0,115200\0" \
-       "mtdparts="MTDPARTS_DEFAULT \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "optargs=\0" \
        "bootenv=uEnv.txt\0" \
        "importbootenv=echo Importing environment ...; " \

include/configs/dockstar.h +0 -1

index 23890865977a..1802a6e5c0d8 100644
@@ -51,12 +51,10 @@
        "ubifsload 0x1100000 ${initrd}; " \
        "bootm 0x800000 0x1100000"
 
-#define CONFIG_MTDPARTS                "mtdparts=orion_nand:1m(uboot)

,-(root)\0"

include/configs/dockstar.h +1 -2

-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
        "mtdids=nand0=orion_nand\0" \
-       "mtdparts="CONFIG_MTDPARTS \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "kernel=/boot/uImage\0" \
        "initrd=/boot/uInitrd\0" \
        "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"

include/configs/dra7xx_evm.h +0 -24

index f8bffe68f248..34a45552bff3 100644
@@ -178,18 +178,6 @@
                                         50, 51, 52, 53, 54, 55, 56, 57, }
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       14
-#define MTDIDS_DEFAULT                 "nand0=nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=nand.0:" \
-                                       "128k(NAND.SPL)," \
-                                       "128k(NAND.SPL.backup1)," \
-                                       "128k(NAND.SPL.backup2)," \
-                                       "128k(NAND.SPL.backup3)," \
-                                       "256k(NAND.u-boot-spl-os)," \
-                                       "1m(NAND.u-boot)," \
-                                       "128k(NAND.u-boot-env)," \
-                                       "128k(NAND.u-boot-env.backup1)," \
-                                       "8m(NAND.kernel)," \
-                                       "-(NAND.file-system)"
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x000c0000
 /* NAND: SPL related configs */
 /* NAND: SPL falcon mode configs */

@@ -216,18 +204,6 @@
 /* Reduce SPL size by removing unlikey targets */
 #ifdef CONFIG_NOR_BOOT
 #define CONFIG_ENV_SECT_SIZE           (128 * 1024)    /* 128 KiB */
-#define MTDIDS_DEFAULT                 "nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT               "mtdparts=physmap-flash.0:" \
-                                       "128k(NOR.SPL)," \
-                                       "128k(NOR.SPL.backup1)," \
-                                       "128k(NOR.SPL.backup2)," \
-                                       "128k(NOR.SPL.backup3)," \
-                                       "256k(NOR.u-boot-spl-os)," \
-                                       "1m(NOR.u-boot)," \
-                                       "128k(NOR.u-boot-env)," \
-                                       "128k(NOR.u-boot-env.backup1)," \
-                                       "8m(NOR.kernel)," \
-                                       "-(NOR.rootfs)"
 #define CONFIG_ENV_OFFSET              0x001c0000
 #define CONFIG_ENV_OFFSET_REDUND       0x001e0000
 #endif

include/configs/draco.h +0 -2

index 2d8cf935cadc..3278196b3afb 100644
@@ -49,8 +49,6 @@
 #define CONFIG_ENV_SIZE_REDUND      0x2000
 #define CONFIG_ENV_RANGE        (4 * CONFIG_SYS_ENV_SECT_SIZE)
 
-#define MTDPARTS_DEFAULT       MTDPARTS_DEFAULT_V2
-
 #ifndef CONFIG_SPL_BUILD
 
 /* Default env settings */

include/configs/eco5pk.h +0 -6

index 3d7a168bc4ee..9dbd7a23313d 100644
@@ -34,12 +34,6 @@
 /*
  * Set its own mtdparts, different from common
  */
-#undef MTDIDS_DEFAULT
-#undef MTDPARTS_DEFAULT
-#define MTDIDS_DEFAULT         "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT       "mtdparts=omap2-nand.0:512k(xloader-nand),"
 \
-                               "1024k(uboot-nand),256k(params-nand)," \
-                               "5120k(kernel),-(ubifs)"
 
 /*

* The arithmetic in tam3517.h is wrong for us and the kernel gets
overwritten.

include/configs/eco5pk.h +1 -1

@@ -51,7 +45,7 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS       CONFIG_TAM3517_SETTINGS \
        "install_kernel=if dhcp $bootfile; then nand erase kernel;" \
                                "nand write $fileaddr kernel; fi\0" \
-       "mtdparts="MTDPARTS_DEFAULT"\0" \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0" \
        "serverip=192.168.142.60\0"
 
 #endif /* __CONFIG_H */

include/configs/etamin.h +0 -20

index c9584ad71c92..ef1479af0b7c 100644
@@ -140,26 +140,6 @@
        "u-boot.env1 mtddev;" \
        "rootfs mtddevubi" \
 
-#undef MTDIDS_NAME_STR
-#define MTDIDS_NAME_STR                "omap2-nand_concat"
-#undef MTDIDS_DEFAULT
-#define MTDIDS_DEFAULT         "nand2=" MTDIDS_NAME_STR
-
-#undef MTDPARTS_DEFAULT_V2
-#define MTDPARTS_DEFAULT_V2     "mtdparts=" MTDIDS_NAME_STR ":" \
-                               "512k(spl)," \
-                               "512k(spl.backup1)," \
-                               "512k(spl.backup2)," \
-                               "512k(spl.backup3)," \
-                               "7680k(u-boot)," \
-                               "2048k(u-boot.env0)," \
-                               "2048k(u-boot.env1)," \
-                               "2048k(mtdoops)," \
-                               "-(rootfs)"
-
-#undef MTDPARTS_DEFAULT
-#define MTDPARTS_DEFAULT       MTDPARTS_DEFAULT_V2
-
 #undef CONFIG_ENV_SETTINGS_NAND_V2
 #define CONFIG_ENV_SETTINGS_NAND_V2 \
        "nand_active_ubi_vol=rootfs_a\0" \

include/configs/ethernut5.h +0 -4

index 9bf35328c69d..322e623eaf33 100644
@@ -152,10 +152,6 @@
 /* File systems */
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#if defined(CONFIG_CMD_MTDPARTS) || defined(CONFIG_CMD_NAND)
-#define MTDIDS_DEFAULT         "nand0=atmel_nand"
-#define MTDPARTS_DEFAULT       "mtdparts=atmel_nand:-(root)"
-#endif
 
 /* Boot command */
 #define CONFIG_CMDLINE_TAG

include/configs/flea3.h +0 -8

index df8169e410b5..e4d5f91b7a00 100644
@@ -120,14 +120,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_FLASH_CFI_MTD
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT         "nand0=mxc_nand,nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT       "mtdparts=mxc_nand:50m(root1)," \
-                               "32m(rootfb)," \
-                               "64m(pcache)," \
-                               "64m(app1)," \
-                               "10m(app2),-(spool);" \
-                               "physmap-flash.0:512k(u-boot),64k(env1),"
 \
-                               "64k(env2),3776k(kernel1),3776k(kernel2)"
 
 /*

* FLASH and environment organization

include/configs/goflexhome.h +1 -4

index aaa336e34c51..16e55b0c2b35 100644
@@ -75,13 +75,10 @@
        "ubifsload 0x800000 ${kernel}; " \
        "bootm 0x800000"
 
-#define CONFIG_MTDPARTS \
-       "mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
        "mtdids=nand0=orion_nand\0" \
-       "mtdparts="CONFIG_MTDPARTS \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "kernel=/boot/uImage\0" \
        "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
 

include/configs/guruplug.h +1 -11

index c69e8994bd8a..b13c6c927957 100644
@@ -53,24 +53,14 @@
        "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
        "bootz 0x800000 - 0x700000"
 
-#define CONFIG_MTDPARTS        \
-       "mtdparts=orion_nand:"                                          \
-       "896K(uboot),128K(uboot_env),"                                  \
-       "- at 1M(root)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
        "mtdids=nand0=orion_nand\0"                                     \
-       "mtdparts="CONFIG_MTDPARTS                                      \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT                      \
        "kernel=/boot/zImage\0"                                         \
        "fdt=/boot/guruplug-server-plus.dtb\0"                          \
        "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
 
-#define MTDIDS_DEFAULT "nand0=orion_nand"
-
-#define MTDPARTS_DEFAULT       \
-       "mtdparts="CONFIG_MTDPARTS
-
 /*
  * Ethernet Driver configuration
  */

include/configs/gw_ventana.h +2 -10

index a93172ace1f7..05c88b3ef85c 100644
@@ -186,14 +186,6 @@
  */
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#ifdef CONFIG_SPI_FLASH
-#define MTDIDS_DEFAULT    "nor0=nor"
-#define MTDPARTS_DEFAULT  \
-       "mtdparts=nor:512k(uboot),64k(env),2m(kernel),-(rootfs)"
-#else
-#define MTDIDS_DEFAULT    "nand0=nand"
-#define MTDPARTS_DEFAULT  "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
-#endif
 
 /* Persistent Environment Config */
 #if defined(CONFIG_ENV_IS_IN_MMC)

@@ -231,8 +223,8 @@
        "hwconfig=_UNKNOWN_\0" \
        "video=\0" \
        \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
        "disk=0\0" \
        "part=1\0" \
        \

include/configs/ib62x0.h +1 -7

index d45dc357cb17..57f56b5bc261 100644
@@ -57,16 +57,10 @@
        "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
        "bootz 0x800000 - 0x700000"
 
-#define CONFIG_MTDPARTS \
-       "mtdparts=orion_nand:"                                          \
-       "0xe0000 at 0x0(uboot),"                                           \
-       "0x20000 at 0xe0000(uboot_env),"                                   \
-       "- at 0x100000(root)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
        "mtdids=nand0=orion_nand\0"                                     \
-       "mtdparts="CONFIG_MTDPARTS                                      \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT                      \
        "kernel=/boot/zImage\0"                                         \
        "fdt=/boot/ib62x0.dtb\0"                                        \
        "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"

include/configs/iconnect.h +1 -7

index 26dbe5394371..d528d3f0d437 100644
@@ -56,16 +56,10 @@
        "ubifsload 0x800000 ${kernel}; "                                \
        "bootm 0x800000"
 
-#define CONFIG_MTDPARTS \
-       "mtdparts=orion_nand:"          \
-       "0x80000 at 0x0(uboot),"           \
-       "0x20000 at 0x80000(uboot_env),"   \
-       "- at 0xa0000(rootfs)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"        \
        "mtdids=nand0=orion_nand\0"             \
-       "mtdparts="CONFIG_MTDPARTS              \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT      \
        "kernel=/boot/uImage\0"                 \
        "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs

rootfstype=ubifs\0"

include/configs/ids8313.h +0 -5

index 1a8c27353374..b43c8c711e48 100644
@@ -472,11 +472,6 @@
 /* mtdparts command line support */
 #define CONFIG_FLASH_CFI_MTD
 #define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT         "nor0=ff800000.flash,nand0=e1000000.flash"
-#define MTDPARTS_DEFAULT       "mtdparts=ff800000.flash:7m(dum)," \
-                                       "768k(BOOT-BIN)," \
-                                       "128k(BOOT-ENV),128k(BOOT-REDENV);"
 \
-                                       "e1000000.flash:-(ubi)"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \

        "netdev=" __stringify(CONFIG_NETDEV) "\0"                       \

include/configs/ids8313.h +2 -2

@@ -506,8 +501,8 @@
                        "${netmask}:${hostname}:${netdev}:off "         \
                        "console=${console},${baudrate} ${othbootargs}\0"
 \
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
-       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
      \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
      \

        "\0"

#define CONFIG_NFSBOOTCOMMAND \

include/configs/imx27lite-common.h +2 -2

index 962856e101ed..9596f0bbe243 100644
@@ -174,8 +174,8 @@
                " +${filesize};cp.b ${fileaddr} "                       \
                __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0"   \
        "upd=run load update\0"                                         \
-       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
      \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
      \
 

/* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1

include/configs/imx31_ renamed from include/configs/imx31_phycore.h +0 -0

phycore.h
index 36fda4781351..c2d416031ba7 100644

include/configs/imx31_phycore.h +0 -4

@@ -49,10 +49,6 @@
  * Command definition
  ***********************************************************/
 
-
-#define MTDPARTS_DEFAULT       "mtdparts=physmap-flash.0:128k(uboot)ro,"
 \
-                                       "1536k(kernel),-(root)"
-
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_IPADDR          192.168.23.168

#define CONFIG_SERVERIP 192.168.23.2

include/configs/imx31_phycore.h +1 -1

@@ -70,7 +66,7 @@
        "bootcmd_flash=run bootargs_base bootargs_mtd bootargs_flash;"  \
                "bootm 0x80000000\0"                                    \
        "unlock=yes\0"                                                  \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
      \
        "prg_uboot=tftpboot 0x80000000 $(uboot);"                       \
                "protect off 0xa0000000 +0x20000;"                      \

                "erase 0xa0000000 +0x20000;"                            \

include/configs/imx6- renamed from include/configs/imx6-engicam.h +0 -0

engicam.h
index c34dc30127a5..86c1d385cff5 100644

include/configs/imx6-engicam.h +0 -3

@@ -161,9 +161,6 @@
 /* MTD device */
 # define CONFIG_MTD_DEVICE
 # define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT                        "nand0=gpmi-nand"
-# define MTDPARTS_DEFAULT              "mtdparts=gpmi-nand:2m(spl),2m(uboot),"
 \
-                                       "1m(env),8m(kernel),1m(dtb),-(

rootfs)"

 # define CONFIG_APBH_DMA
 # define CONFIG_APBH_DMA_BURST

include/configs/imx6_logic.h +0 -3

index c1e9f5d04214..f0ff5b218257 100644
@@ -154,9 +154,6 @@
 /* MTD device */
 # define CONFIG_MTD_DEVICE
 # define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT                "nand0=gpmi-nand"
-# define MTDPARTS_DEFAULT      "mtdparts=gpmi-nand:4m(uboot)," \
-                                       "1m(env),16m(kernel),1m(dtb),-

(fs)"

/* DMA stuff, needed for GPMI/MXS NAND support */ #define CONFIG_APBH_DMA

include/configs/ipam390.h +2 -12

index 2bb7d079f666..1683855ac064 100644
@@ -221,8 +221,8 @@
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"      \
        "mtddevname=uboot-env\0" \
        "mtddevnum=0\0" \
-       "mtdids=" MTDIDS_DEFAULT "\0"                           \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                       \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                        \
        "u-boot=/tftpboot/ipam390/u-boot.ais\0"                 \
        "upd_uboot=tftp c0000000 ${u-boot};nand erase.part u-boot;" \
                "nand write c0000000 20000 ${filesize}\0"       \

@@ -243,16 +243,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
-#define MTDIDS_NAME_STR                "davinci_nand.0"
-#define MTDIDS_DEFAULT         "nand0=" MTDIDS_NAME_STR
-#define MTDPARTS_DEFAULT       "mtdparts=" MTDIDS_NAME_STR ":" \
-                                       "128k(u-boot-env),"     \
-                                       "1408k(u-boot),"        \
-                                       "128k(bootparms),"      \
-                                       "384k(factory-info),"   \
-                                       "4M(kernel),"   \
-                                       "-(rootfs)"
-
 /* defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SYS_TEXT_BASE - \

include/configs/km/keymile-common.h +2 -2

index 1971ba4f7e03..4d9a133dd4a4 100644
@@ -215,8 +215,8 @@
        "init=/sbin/init-overlay.sh\0"                                  \
        "load_addr_r="__stringify(CONFIG_KM_KERNEL_ADDR) "\0"           \
        "load=tftpboot ${load_addr_r} ${u-boot}\0"                      \
-       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"
      \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
      \
        ""

#endif /* CONFIG_KM_DEF_ENV */

include/configs/km/km83xx-common.h +0 -13

index 810b23e8fac0..f0ec5cf40591 100644
@@ -12,19 +12,6 @@
 #include "keymile-common.h"
 #include "km-powerpc.h"
 
-#ifndef MTDIDS_DEFAULT
-# define MTDIDS_DEFAULT        "nor0=boot"
-#endif /* MTDIDS_DEFAULT */
-
-#ifndef MTDPARTS_DEFAULT
-# define MTDPARTS_DEFAULT      "mtdparts="                     \
-       "boot:"                                                 \
-               "768k(u-boot),"                                 \
-               "128k(env),"                                    \
-               "128k(envred),"                                 \
-               "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");"
-#endif /* MTDPARTS_DEFAULT */
-
 #define CONFIG_MISC_INIT_R
 /*
  * System Clock Setup

include/configs/km/km_arm.h +0 -10

index 8866658b00c8..277f8be60e12 100644
@@ -227,16 +227,6 @@ int get_scl(void);
 #define FLASH_GPIO_PIN                 0x00010000
 #define KM_FLASH_GPIO_PIN      16
 
-#ifndef MTDIDS_DEFAULT
-# define MTDIDS_DEFAULT                "nand0=orion_nand"
-#endif /* MTDIDS_DEFAULT */
-
-#ifndef MTDPARTS_DEFAULT
-# define MTDPARTS_DEFAULT      "mtdparts="                     \
-       "orion_nand:"                                           \
-               "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");"
-#endif /* MTDPARTS_DEFAULT */
-
 #define        CONFIG_KM_UPDATE_UBOOT
      \
        "update="                                                       \

                "sf probe 0;sf erase 0 +${filesize};"                   \

include/configs/km/kmp204x-common.h +0 -10

index ff3bce8eeacf..6aa2b9d3cc51 100644
@@ -391,16 +391,6 @@ int get_scl(void);
 #define CONFIG_KM_DEF_ENV "km-common=empty\0"
 #endif
 
-#ifndef MTDIDS_DEFAULT
-# define MTDIDS_DEFAULT                "nand0=fsl_elbc_nand"
-#endif /* MTDIDS_DEFAULT */
-
-#ifndef MTDPARTS_DEFAULT
-# define MTDPARTS_DEFAULT      "mtdparts="                     \
-       "fsl_elbc_nand:"                                                \
-               "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");"
-#endif /* MTDPARTS_DEFAULT */
-
 /* architecture specific default bootargs */
 #define CONFIG_KM_DEF_BOOT_ARGS_CPU            ""
 

include/configs/km8360.h +0 -10

index f482e2ce037a..a2a26f927ecb 100644
@@ -29,16 +29,6 @@
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT      "ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP       "ubi1"
-#define MTDIDS_DEFAULT                 "nor0=boot,nand0=app"
-
-#define MTDPARTS_DEFAULT               "mtdparts="                     \
-       "boot:"                                                         \
-               "768k(u-boot),"                                         \
-               "128k(env),"                                            \
-               "128k(envred),"                                         \
-               "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");"             \
-       "app:"                                                          \
-               "-(" CONFIG_KM_UBI_PARTITION_NAME_APP ");"
 #else
 #error ("Board not supported")
 #endif

include/configs/ls1043a_ renamed from include/configs/ls1043a_common.h +0 -0

common.h
index a29713499b5b..134517d48799 100644

include/configs/ls1043a_common.h +1 -18

@@ -239,23 +239,6 @@
 #define HWCONFIG_BUFFER_SIZE           128
 
 #ifndef SPL_NO_MISC
-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define MTDPARTS_DEFAULT "mtdparts=spi0.0:1m(uboot)," \
-                       "5m(kernel),1m(dtb),9m(file_system)"
-#else
-#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \
-                       "2m at 0x100000(nor_bank0_uboot),"\
-                       "40m at 0x1100000(nor_bank0_fit)," \
-                       "7m(nor_bank0_user)," \
-                       "2m at 0x4100000(nor_bank4_uboot)," \
-                       "40m at 0x5100000(nor_bank4_fit),"\
-                       "-(nor_bank4_user);" \
-                       "7e800000.flash:" \
-                       "1m(nand_uboot),1m(nand_uboot_env)," \
-                       "20m(nand_fit);spi0.0:1m(uboot)," \
-                       "5m(kernel),1m(dtb),9m(file_system)"
-#endif
-
 #include <config_distro_defaults.h>
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \

@@ -281,7 +264,7 @@
        "kernel_size=0x2800000\0"               \
        "console=ttyS0,115200\0"                \
        "boot_os=y\0"                           \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"       \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"        \
        BOOTENV                                 \
        "boot_scripts=ls1043ardb_boot.scr\0"    \
        "boot_script_hdr=hdr_ls1043ardb_bs.out\0"       \

include/configs/ls1046a_ renamed from include/configs/ls1046a_common.h +0 -0

common.h
index 6d501b9c545a..eea54c7ae280 100644

include/configs/ls1046a_common.h +1 -1

@@ -228,7 +228,7 @@
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x2800000\0"               \
        "console=ttyS0,115200\0"                \
-               MTDPARTS_DEFAULT "\0"           \
+        CONFIG_MTDPARTS_DEFAULT "\0"           \
        BOOTENV                                 \
        "boot_scripts=ls1046ardb_boot.scr\0"    \
        "boot_script_hdr=hdr_ls1046ardb_bs.out\0"       \

include/configs/ls1046aqds.h +0 -0

index 39bd1c38a801..8fbc84776ba1 100644
@@ -461,23 +461,6 @@ unsigned long get_board_ddr_clk(void);
                                        "$kernel_size && bootm

$kernel_load"
#endif

include/configs/ls1046aqds.h +0 -17

-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:2m(uboot)," \
-                       "14m(free)"
-#else
-#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \
-                       "2m at 0x100000(nor_bank0_uboot),"\
-                       "40m at 0x1100000(nor_bank0_fit)," \
-                       "7m(nor_bank0_user)," \
-                       "2m at 0x4100000(nor_bank4_uboot)," \
-                       "40m at 0x5100000(nor_bank4_fit),"\
-                       "-(nor_bank4_user);" \
-                       "7e800000.flash:" \
-                       "4m(nand_uboot),36m(nand_kernel)," \
-                       "472m(nand_free);spi0.0:2m(uboot)," \
-                       "14m(free)"
-#endif
-
 #include <asm/fsl_secure_boot.h>
 
 #endif /* __LS1046AQDS_H__ */

include/configs/ls1046ardb.h +0 -4

index 7bbd4ada707a..4d4962684d31 100644
@@ -236,10 +236,6 @@
 #undef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \
                           "&& esbc_halt; run qspi_bootcmd;"
-#define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \
-                       "15m(u-boot),48m(kernel.itb);" \
-                       "7e800000.flash:16m(nand_uboot)," \
-                       "48m(nand_kernel),448m(nand_free)"
 #endif
 
 #include <asm/fsl_secure_boot.h>

include/configs/m28evk.h +0 -9

index 4fcf4805eec1..900e76413927 100644
@@ -33,15 +33,6 @@
 
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT                 "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT                       \
-       "mtdparts=gpmi-nand:"                   \
-               "3m(u-boot),"                   \
-               "512k(env1),"                   \
-               "512k(env2),"                   \
-               "14m(boot),"                    \
-               "238m(data),"                   \
-               "- at 4096k(UBI)"
 #endif
 
 /* FEC Ethernet on SoC */

include/configs/m53evk.h +0 -9

index 8b5f16973338..29eb59a3cba1 100644
@@ -91,15 +91,6 @@
 
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT                 "nand0=mxc_nand"
-#define MTDPARTS_DEFAULT                       \
-       "mtdparts=mxc_nand:"                    \
-               "1024k(u-boot),"                \
-               "512k(env1),"                   \
-               "512k(env2),"                   \
-               "14m(boot),"                    \
-               "240m(data),"                   \
-               "- at 2048k(UBI)"
 #endif
 
 /*

include/configs/mccmon6.h +3 -15

index 755c949b7649..0cb8b17fa33b 100644
@@ -83,18 +83,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
-#define MTDIDS_DEFAULT                  "nor0=8000000.nor"
-#define MTDPARTS_DEFAULT  \
-       "mtdparts=8000000.nor:" \
-       "32m at 0x0(mccmon6-image.nor)," \
-       "256k at 0x40000(u-boot-env.nor)," \
-       "1m at 0x80000(u-boot.nor)," \
-       "8m at 0x180000(kernel.nor)," \
-       "8m at 0x980000(swupdate-kernel.nor)," \
-       "8m at 0x1180000(swupdate-rootfs.nor)," \
-       "128k at 0x1980000(kernel-dtb.nor)," \
-       "128k at 0x19C0000(swupdate-kernel-dtb.nor)"
-
 /* USB Configs */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)

@@ -141,7 +129,7 @@
                "setenv kernelnor 0x08180000;" \
                "setenv dtbnor 0x09980000;" \
                "setenv bootargs console=${console} " \
-               ""MTDPARTS_DEFAULT" " \
+               CONFIG_MTDPARTS_DEFAULT " " \
                "root=/dev/mmcblk1 rootfstype=ext4 rw rootwait noinitrd;" \
                "cp.l ${dtbnor} ${dtbloadaddr} 0x8000;" \
                "bootm ${kernelnor} - ${dtbloadaddr};\0" \

@@ -154,7 +142,7 @@
                "setenv swurootfsnor 0x09180000;" \
                "setenv swudtbnor 0x099A0000;" \
                "setenv bootargs console=${console} " \
-               ""MTDPARTS_DEFAULT" " \
+               CONFIG_MTDPARTS_DEFAULT " " \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
                    ":${hostname}::off root=/dev/ram rw;" \
                "cp.l ${swurootfsnor} ${rootfsloadaddr} 0x200000;" \

@@ -186,7 +174,7 @@
                          "fi;" \
                     "fi;" \
                "fi\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "fdt_addr=0x18000000\0" \
        "bootdev=1\0" \
        "bootpart=1\0" \

include/configs/mcx.h +0 -5

index b4b8c4367ed4..f0ab990e14fd 100644
@@ -109,11 +109,6 @@
 #define CONFIG_BOOTFILE                "uImage"
 
 /* Setup MTD for NAND on the SOM */
-#define MTDIDS_DEFAULT         "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT       "mtdparts=omap2-nand.0:512k(MLO),"      \
-                               "1m(u-boot),256k(env1),"                \
-                               "256k(env2),6m(kernel),6m(k_recovery)," \
-                               "8m(fs_recovery),-(common_data)"
 
 #define CONFIG_HOSTNAME mcx
 #define CONFIG_EXTRA_ENV_SETTINGS \

include/configs/microblaze-generic.h +0 -4

index 2cc4b8a1a36c..41e6790d68e1 100644
@@ -172,12 +172,8 @@
 /* MTD partitions */
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT         "nor0=flash-0"
 
 /* default mtd partition table */
-#define MTDPARTS_DEFAULT       "mtdparts=flash-0:256k(u-boot),"\
-                               "256k(env),3m(kernel),1m(romfs),"\
-                               "1m(cramfs),-(jffs2)"
 #endif
 
 /* size of console buffer */

include/configs/mt_ventoux.h +0 -6

index ed83eeba548c..11ba3e752a3a 100644
@@ -29,12 +29,6 @@
 /*
  * Set its own mtdparts, different from common
  */
-#undef MTDIDS_DEFAULT
-#undef MTDPARTS_DEFAULT
-#define MTDIDS_DEFAULT         "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT       "mtdparts=omap2-nand.0:512k(MLO)," \
-                               "1m(u-boot),256k(env1)," \
-                               "256k(env2),8m(ubisystem),-(rootfs)"
 
 /*
  * FPGA

include/configs/mx28evk.h +0 -10

index e191d3a8a205..4ada38454790 100644
@@ -61,16 +61,6 @@
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT                 "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT                       \
-       "mtdparts=gpmi-nand:"                   \
-               "3m(bootloader)ro,"             \
-               "512k(environment),"            \
-               "512k(redundant-environment),"  \
-               "4m(kernel),"                   \
-               "512k(fdt),"                    \
-               "8m(ramdisk),"                  \
-               "-(filesystem)"
 #endif
 
 /* FEC Ethernet on SoC */

include/configs/mx35pdk.h +0 -4

index 8cc5163258b2..6a334cb730c4 100644
@@ -135,10 +135,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_FLASH_CFI_MTD
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT         "nand0=mxc_nand,nor0=physmap-flash.0"
-#define MTDPARTS_DEFAULT       "mtdparts=mxc_nand:1m(boot),5m(linux)," \
-                               "96m(root),8m(cfg),1938m(user);"        \
-                               "physmap-flash.0:512k(b),4m(k)

,30m(u),28m(r)"

/*
* FLASH and environment organization

include/configs/nokia_rx51.h +6 -14

index 20b8c345f066..b7fe7341e407 100644
@@ -164,15 +164,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
-#define MTDIDS_DEFAULT                 "onenand0=onenand"
-#define MTDPARTS_DEFAULT               "mtdparts=onenand:" \
-               __stringify(PART1_SIZE) PART1_SUFF "(" PART1_NAME ")ro," \
-               __stringify(PART2_SIZE) PART2_SUFF "(" PART2_NAME ")," \
-               __stringify(PART3_SIZE) PART3_SUFF "(" PART3_NAME ")," \
-               __stringify(PART4_SIZE) PART4_SUFF "(" PART4_NAME ")," \
-               __stringify(PART5_SIZE) PART5_SUFF "(" PART5_NAME ")," \
-               "-(" PART6_NAME ")"
-
 #endif
 
 /* Watchdog support */

@@ -198,13 +189,14 @@ int rx51_kp_tstc(struct stdio_dev *sdev);
 int rx51_kp_getc(struct stdio_dev *sdev);
 #endif
 
-#ifndef MTDPARTS_DEFAULT
-#define MTDPARTS_DEFAULT
-#endif
-
 /* Environment information */
+#ifdef CONFIG_MTDPARTS_DEFAULT
+#define MTDPARTS "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
+#else
+#define MTDPARTS
+#endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       MTDPARTS \
        "usbtty=cdc_acm\0" \
        "stdin=vga\0" \
        "stdout=vga\0" \

include/configs/nsa310s.h +1 -8

index 896c32996ce0..190fd535dfca 100644
@@ -49,17 +49,10 @@
        "fdt addr 0x700000; fdt resize; fdt chosen; " \
        "bootz 0x800000 - 0x700000"
 
-#define CONFIG_MTDPARTS \
-       "mtdparts=orion_nand:" \
-       "0xe0000 at 0x0(uboot)," \
-       "0x20000 at 0xe0000(uboot_env)," \
-       "0x100000 at 0x100000(second_stage_uboot)," \
-       "- at 0x200000(root)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
        "mtdids=nand0=orion_nand\0" \
-       "mtdparts="CONFIG_MTDPARTS \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "kernel=/boot/zImage\0" \
        "fdt=/boot/nsa310s.dtb\0" \
        "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"

include/configs/omap3_ renamed from include/configs/omap3_beagle.h +0 -0

beagle.h
index 399ed078554b..394bfb743464 100644

include/configs/omap3_beagle.h +0 -5

@@ -53,11 +53,6 @@
 
 /* commands to include */
 
-#define MTDIDS_DEFAULT                 "nand0=nand"
-#define MTDPARTS_DEFAULT               "mtdparts=nand:512k(x-loader),"\
-                                       "1920k(u-boot),128k(u-boot-env),"\
-                                       "4m(kernel),-(fs)"
-
 #define CONFIG_VIDEO_OMAP3     /* DSS Support                  */
 
 /*

include/configs/omap3_logic.h +0 -0

index a5a2af19e58f..3ecfb5891860 100644
@@ -87,13 +87,6 @@
 #define CONFIG_SYS_NAND_MAX_ECCPOS     56
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS          /* required for UBI partition

support */

include/configs/omap3_logic.h +2 -9

-#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT       "mtdparts=omap2-nand.0:"\
-                                                       "512k(MLO),"\
-                                                       "1792k(u-boot),"\
-                                                       "128k(spl-os)," \
-
 "128k(u-boot-env),"\
-                                                       "6m(kernel),-(fs)"
 #endif
 
 /* Environment information */

@@ -105,8 +98,8 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
-       "mtdids=" MTDIDS_DEFAULT "\0"   \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"    \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "mmcdev=0\0" \
        "mmcroot=/dev/mmcblk0p2 rw\0" \
        "mmcrootfstype=ext4 rootwait\0" \

include/configs/omap3_overo.h +1 -10

index 756b50c664f8..55190a5368b5 100644
@@ -51,15 +51,6 @@
  *  linux               64 * NAND_BLOCK_SIZE = 8 MiB
  *  rootfs              remainder
  */
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:"      \
-       "512k(xloader),"                                \
-       "1792k(u-boot),"                                \
-       "256k(environ),"                                \
-       "8m(linux),"                                    \
-       "-(rootfs)"
-#else /* CONFIG_NAND */
-#define MTDPARTS_DEFAULT
 #endif /* CONFIG_NAND */
 
 /* Board NAND Info. */

@@ -82,7 +73,7 @@
        "mmcrootfstype=ext4 rootwait\0" \
        "nandroot=ubi0:rootfs ubi.mtd=4\0" \
        "nandrootfstype=ubifs\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "mmcargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "mpurate=${mpurate} " \

include/configs/omap3_ renamed from include/configs/omap3_pandora.h +0 -0

pandora.h
index 659bf0776f0b..d38114662e9e 100644

include/configs/omap3_pandora.h +1 -8

@@ -54,13 +54,6 @@
 
 #ifdef CONFIG_NAND
 #define CONFIG_MTD_PARTITIONS  /* required for UBI partition support */
-
-#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:512k(
 xloader),"\
-                                       "1920k(uboot),128k(uboot-env),"\
-                                       "10m(boot),-(rootfs)"
-#else
[… more lines in the raw message]

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

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

/* memtest works on */

include/configs/omap3_zoom1.h +0 -5

index 70613b5e7531..d1ff48d39fae 100644

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

include/configs/openrd.h +4 -9

index d685411bbbe8..1bea7f58cb9d 100644

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

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

/*
* Ethernet Driver configuration

include/configs/p1_p2_rdb_ renamed from include/configs/p1_p2_rdb_pc.h +0 -0

pc.h
index 3c85f534e8b8..1b665b2c15d8 100644

include/configs/p1_p2_rdb_pc.h +0 -3

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

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

#if defined(CONFIG_TARGET_P1021RDB)

include/configs/p1_p2_rdb_pc.h +0 -11

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

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

#if defined(CONFIG_TARGET_P1024RDB)

include/configs/p1_p2_rdb_pc.h +0 -9

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

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

#ifdef CONFIG_SDCARD

include/configs/p1_twr.h +0 -4

index 5a3245c4737e..e9692048d14c 100644

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

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

/*
* Environment

include/configs/pcm052.h +1 -14

index 8144a83db259..d53ef5346adc 100644

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

include/configs/pcm058.h +0 -2

index 2c1221d0854f..3067fc63ef66 100644

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

include/configs/pengwyn.h +2 -9

index 570c375cdc0a..7be04328004a 100644

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

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

(rootfs)"
#define CONFIG_ENV_OFFSET 0x260000 /* environment starts
here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
/* NAND: SPL falcon mode configs */

include/configs/pfla02.h +0 -3

index be90ce9bff4e..ae0331004093 100644

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

include/configs/platinum.h +2 -14

index bb0e92940460..453c37d3f84f 100644

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

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

        "mmcrootpart=1\0"                                               \
        \

include/configs/pm9261.h +2 -11

index 51a72a46b0fd..dec23a70c3b2 100644

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

include/configs/pm9263.h +2 -11

index 8edd8cae4ca3..8aab3e1dd302 100644

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

include/configs/pxm2.h +0 -1

index e8e0c7edd89e..157b32a6a43d 100644

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

include/configs/rastaban.h +0 -2

index 721f94c5c92f..116728fc2289 100644

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

include/configs/rut.h +0 -1

index 9f9bc718cd20..71078e99806e 100644

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

include/configs/s5p_goni.h +0 -9

index 7a6eed4ea809..d81a36e06505 100644

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

include/configs/s5pc210_universal.h +3 -16

index 9859f307181c..bcaab4b7991b 100644

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

include/configs/sheevaplug.h +1 -11

index d4c9995d50af..9acd4d32b34c 100644

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

include/configs/siemens-am33x-common.h +7 -18

index 7ef95faca44d..78708a23ce42 100644

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

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

address */

                                                        /* to access nand
at */
                                                        /* CS0 */

include/configs/smartweb.h +0 -9

index 4cbc90309823..49c838bf72a8 100644

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

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

*/

include/configs/smartweb.h +1 -1

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

include/configs/smdkc100.h +2 -11

index ed097b5cb6bf..be0bf4a51b42 100644

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

include/configs/socfpga_ renamed from include/configs/socfpga_common.h +0 -0

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

common.h
index 7b5417a75bca..99f7f2b5c0b7 100644

include/configs/socfpga_common.h +0 -10

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

include/configs/socfpga_vining_fpga.h +0 -9

index 4977881030ad..0c76a775256d 100644

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

include/configs/stmark2.h +0 -7

index 5f711d03d8db..75ca1ff2f686 100644

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

include/configs/suvd3.h +0 -10

index 00deed6a6621..a1d19844f0ef 100644

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

include/configs/tam3517- renamed from include/configs/tam3517-common.h +0 -0

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

common.h
index 80828272f232..7f05cb07caf2 100644

include/configs/tam3517-common.h +0 -4

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

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

        "netdev=eth0\0"                                                 \

include/configs/tao3530.h +0 -4

index 8ca50dc07811..0e9fe681750b 100644

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

include/configs/thuban.h +0 -2

index 23f4dbfe4666..78674a14c818 100644

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

include/configs/ti816x_evm.h +2 -14

index ddeef6007d8d..b0f84ed852ce 100644

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

include/configs/ti_armv7_keystone2.h +0 -4

index 53046a2110ed..562bb6563697 100644

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

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

#define CONFIG_USB_XHCI_KEYSTONE

include/configs/titanium.h +0 -4

index 882b1d7f5f0a..cc655f296007 100644

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

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

        "kernel_fs=/boot/uImage\0"                                      \

include/configs/titanium.h +2 -2

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

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

                " addcon addmtd;"                                       \
                "bootm ${kernel_addr} - ${dtb_addr}\0"                  \

include/configs/tricorder.h +0 -10

index 8e245e91828e..d9ab91c967d6 100644

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

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

address */

                                                        /* to access nand

*/

include/configs/tricorder.h +2 -2

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

include/configs/usb_a9263.h +1 -4

index d8cb43a7cb59..cd28c4dcb578 100644

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

include/configs/vct.h +0 -6

index 9515f93da7c0..00ad134382e6 100644

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

include/configs/vf610twr.h +0 -8

index 3430f27c40dd..abab428621db 100644

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

include/configs/woodburn_ renamed from include/configs/woodburn_common.h +0 -0

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

common.h
index 8ea5e4848344..baafec384844 100644

include/configs/woodburn_common.h +0 -8

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

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

* FLASH and environment organization

include/configs/x600.h +0 -3

index dc8ec3663ba1..1d34ba32a01d 100644

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

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

        "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.spr\0"          \

include/configs/x600.h +2 -2

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

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

                " addcon addmisc addmtd;"                               \
                "bootm ${kernel_addr} - ${dtb_addr}\0"                  \

scripts/config_whitelist.txt +0 -3

index 5ee1601f0e7a..ee20065756b8 100644

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

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

2.7.4