summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-12-07 22:10:26 +0900
committerTom Rini <trini@konsulko.com>2016-12-29 13:08:07 -0500
commitc27269953b94d19b3fc7a21a1c3e19985507b94d (patch)
tree6824ca3c92ed9da414da26e7ff1618201cd5a54b
parent187809517da0f488f6f2069543783cf2923abb23 (diff)
mmc: complete unfinished move of CONFIG_MMC
Commit 7a777f6d6f35 ("mmc: Add generic Kconfig option") created a Kconfig entry for this option without any actual moves, then commit 44c798799f66 ("sunxi: Use Kconfig CONFIG_MMC") moved instances only for SUNXI. We generally do not like such partial moves. This kind of work is automated by tools/moveconfig.py, so it is pretty easy to complete this move. I am adding "default ARM || PPC || SANDBOX" (suggested by Tom). This shortens the configs and will ease new board porting. This commit was created as follows: [1] Edit Kconfig (remove the "depends on", add the "default", copy the prompt and help message from Linux) [2] Run 'tools/moveconfig.py -y -s -r HEAD MMC' Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
-rw-r--r--configs/B4420QDS_NAND_defconfig1
-rw-r--r--configs/B4420QDS_SPIFLASH_defconfig1
-rw-r--r--configs/B4420QDS_defconfig1
-rw-r--r--configs/B4860QDS_NAND_defconfig1
-rw-r--r--configs/B4860QDS_SECURE_BOOT_defconfig1
-rw-r--r--configs/B4860QDS_SPIFLASH_defconfig1
-rw-r--r--configs/B4860QDS_SRIO_PCIE_BOOT_defconfig1
-rw-r--r--configs/B4860QDS_defconfig1
-rw-r--r--configs/BSC9131RDB_NAND_SYSCLK100_defconfig1
-rw-r--r--configs/BSC9131RDB_NAND_defconfig1
-rw-r--r--configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig1
-rw-r--r--configs/BSC9131RDB_SPIFLASH_defconfig1
-rw-r--r--configs/C29XPCIE_NAND_defconfig1
-rw-r--r--configs/C29XPCIE_NOR_SECBOOT_defconfig1
-rw-r--r--configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig1
-rw-r--r--configs/C29XPCIE_SPIFLASH_defconfig1
-rw-r--r--configs/C29XPCIE_defconfig1
-rw-r--r--configs/CPCI2DP_defconfig1
-rw-r--r--configs/CPCI4052_defconfig1
-rw-r--r--configs/MIP405T_defconfig1
-rw-r--r--configs/MIP405_defconfig1
-rw-r--r--configs/MPC8313ERDB_33_defconfig1
-rw-r--r--configs/MPC8313ERDB_66_defconfig1
-rw-r--r--configs/MPC8313ERDB_NAND_33_defconfig1
-rw-r--r--configs/MPC8313ERDB_NAND_66_defconfig1
-rw-r--r--configs/MPC8315ERDB_defconfig1
-rw-r--r--configs/MPC8323ERDB_defconfig1
-rw-r--r--configs/MPC832XEMDS_ATM_defconfig1
-rw-r--r--configs/MPC832XEMDS_HOST_33_defconfig1
-rw-r--r--configs/MPC832XEMDS_HOST_66_defconfig1
-rw-r--r--configs/MPC832XEMDS_SLAVE_defconfig1
-rw-r--r--configs/MPC832XEMDS_defconfig1
-rw-r--r--configs/MPC8349EMDS_defconfig1
-rw-r--r--configs/MPC8349ITXGP_defconfig1
-rw-r--r--configs/MPC8349ITX_LOWBOOT_defconfig1
-rw-r--r--configs/MPC8349ITX_defconfig1
-rw-r--r--configs/MPC8540ADS_defconfig1
-rw-r--r--configs/MPC8541CDS_defconfig1
-rw-r--r--configs/MPC8541CDS_legacy_defconfig1
-rw-r--r--configs/MPC8544DS_defconfig1
-rw-r--r--configs/MPC8548CDS_36BIT_defconfig1
-rw-r--r--configs/MPC8548CDS_defconfig1
-rw-r--r--configs/MPC8548CDS_legacy_defconfig1
-rw-r--r--configs/MPC8555CDS_defconfig1
-rw-r--r--configs/MPC8555CDS_legacy_defconfig1
-rw-r--r--configs/MPC8560ADS_defconfig1
-rw-r--r--configs/MPC8568MDS_defconfig1
-rw-r--r--configs/MPC8572DS_36BIT_defconfig1
-rw-r--r--configs/MPC8572DS_defconfig1
-rw-r--r--configs/MPC8610HPCD_defconfig1
-rw-r--r--configs/MPC8641HPCN_36BIT_defconfig1
-rw-r--r--configs/MPC8641HPCN_defconfig1
-rw-r--r--configs/MiniFAP_defconfig1
-rw-r--r--configs/O2D300_defconfig1
-rw-r--r--configs/O2DNT2_RAMBOOT_defconfig1
-rw-r--r--configs/O2DNT2_defconfig1
-rw-r--r--configs/O2D_defconfig1
-rw-r--r--configs/O2I_defconfig1
-rw-r--r--configs/O2MNT_O2M110_defconfig1
-rw-r--r--configs/O2MNT_O2M112_defconfig1
-rw-r--r--configs/O2MNT_O2M113_defconfig1
-rw-r--r--configs/O2MNT_defconfig1
-rw-r--r--configs/O3DNT_defconfig1
-rw-r--r--configs/P1023RDB_defconfig1
-rw-r--r--configs/PATI_defconfig1
-rw-r--r--configs/PIP405_defconfig1
-rw-r--r--configs/PLU405_defconfig1
-rw-r--r--configs/PMC405DE_defconfig1
-rw-r--r--configs/PMC440_defconfig1
-rw-r--r--configs/TQM5200S_HIGHBOOT_defconfig1
-rw-r--r--configs/TQM5200S_defconfig1
-rw-r--r--configs/TQM5200_B_HIGHBOOT_defconfig1
-rw-r--r--configs/TQM5200_B_defconfig1
-rw-r--r--configs/TQM5200_STK100_defconfig1
-rw-r--r--configs/TQM5200_defconfig1
-rw-r--r--configs/TQM823L_LCD_defconfig1
-rw-r--r--configs/TQM823L_defconfig1
-rw-r--r--configs/TQM823M_defconfig1
-rw-r--r--configs/TQM834x_defconfig1
-rw-r--r--configs/TQM850L_defconfig1
-rw-r--r--configs/TQM850M_defconfig1
-rw-r--r--configs/TQM855L_defconfig1
-rw-r--r--configs/TQM855M_defconfig1
-rw-r--r--configs/TQM860L_defconfig1
-rw-r--r--configs/TQM860M_defconfig1
-rw-r--r--configs/TQM862L_defconfig1
-rw-r--r--configs/TQM862M_defconfig1
-rw-r--r--configs/TQM866M_defconfig1
-rw-r--r--configs/TQM885D_defconfig1
-rw-r--r--configs/TTTech_defconfig1
-rw-r--r--configs/VOM405_defconfig1
-rw-r--r--configs/a3m071_defconfig1
-rw-r--r--configs/a4m072_defconfig1
-rw-r--r--configs/a4m2k_defconfig1
-rw-r--r--configs/ac14xx_defconfig1
-rw-r--r--configs/acadia_defconfig1
-rw-r--r--configs/adp-ag101p_defconfig1
-rw-r--r--configs/arches_defconfig1
-rw-r--r--configs/aria_defconfig1
-rw-r--r--configs/armadillo-800eva_defconfig1
-rw-r--r--configs/aspenite_defconfig1
-rw-r--r--configs/at91rm9200ek_defconfig1
-rw-r--r--configs/at91rm9200ek_ram_defconfig1
-rw-r--r--configs/at91sam9260ek_dataflash_cs0_defconfig1
-rw-r--r--configs/at91sam9260ek_dataflash_cs1_defconfig1
-rw-r--r--configs/at91sam9260ek_nandflash_defconfig1
-rw-r--r--configs/at91sam9261ek_dataflash_cs0_defconfig1
-rw-r--r--configs/at91sam9261ek_dataflash_cs3_defconfig1
-rw-r--r--configs/at91sam9261ek_nandflash_defconfig1
-rw-r--r--configs/at91sam9g10ek_dataflash_cs0_defconfig1
-rw-r--r--configs/at91sam9g10ek_dataflash_cs3_defconfig1
-rw-r--r--configs/at91sam9g10ek_nandflash_defconfig1
-rw-r--r--configs/at91sam9g20ek_dataflash_cs0_defconfig1
-rw-r--r--configs/at91sam9g20ek_dataflash_cs1_defconfig1
-rw-r--r--configs/at91sam9g20ek_nandflash_defconfig1
-rw-r--r--configs/at91sam9xeek_dataflash_cs0_defconfig1
-rw-r--r--configs/at91sam9xeek_dataflash_cs1_defconfig1
-rw-r--r--configs/at91sam9xeek_nandflash_defconfig1
-rw-r--r--configs/atngw100_defconfig1
-rw-r--r--configs/atngw100mkii_defconfig1
-rw-r--r--configs/atstk1002_defconfig1
-rw-r--r--configs/axm_defconfig1
-rw-r--r--configs/axs101_defconfig1
-rw-r--r--configs/axs103_defconfig1
-rw-r--r--configs/bamboo_defconfig1
-rw-r--r--configs/bayleybay_defconfig1
-rw-r--r--configs/bcm911360_entphn-ns_defconfig1
-rw-r--r--configs/bcm911360_entphn_defconfig1
-rw-r--r--configs/bcm911360k_defconfig1
-rw-r--r--configs/bcm958300k-ns_defconfig1
-rw-r--r--configs/bcm958300k_defconfig1
-rw-r--r--configs/bcm958305k_defconfig1
-rw-r--r--configs/bcm958622hr_defconfig1
-rw-r--r--configs/bf518f-ezbrd_defconfig1
-rw-r--r--configs/bf527-ad7160-eval_defconfig1
-rw-r--r--configs/bf537-stamp_defconfig1
-rw-r--r--configs/bf548-ezkit_defconfig1
-rw-r--r--configs/bf609-ezkit_defconfig1
-rw-r--r--configs/bg0900_defconfig1
-rw-r--r--configs/blanche_defconfig1
-rw-r--r--configs/brppt1_nand_defconfig1
-rw-r--r--configs/bubinga_defconfig1
-rw-r--r--configs/caddy2_defconfig1
-rw-r--r--configs/calimain_defconfig1
-rw-r--r--configs/cam5200_defconfig1
-rw-r--r--configs/cam5200_niosflash_defconfig1
-rw-r--r--configs/canmb_defconfig1
-rw-r--r--configs/canyonlands_defconfig1
-rw-r--r--configs/charon_defconfig1
-rw-r--r--configs/cm-bf537e_defconfig1
-rw-r--r--configs/cm-bf537u_defconfig1
-rw-r--r--configs/cm5200_defconfig1
-rw-r--r--configs/conga-qeval20-qa3-e3845-internal-uart_defconfig1
-rw-r--r--configs/conga-qeval20-qa3-e3845_defconfig1
-rw-r--r--configs/corvus_defconfig1
-rw-r--r--configs/crownbay_defconfig1
-rw-r--r--configs/d2net_v2_defconfig1
-rw-r--r--configs/da850evm_direct_nor_defconfig1
-rw-r--r--configs/db-88f6720_defconfig1
-rw-r--r--configs/db-88f6820-amc_defconfig1
-rw-r--r--configs/db-mv784mp-gp_defconfig1
-rw-r--r--configs/devconcenter_defconfig1
-rw-r--r--configs/devkit3250_defconfig1
-rw-r--r--configs/dfi-bt700-q7x-151_defconfig1
-rw-r--r--configs/digsy_mtc_RAMBOOT_defconfig1
-rw-r--r--configs/digsy_mtc_defconfig1
-rw-r--r--configs/digsy_mtc_rev5_RAMBOOT_defconfig1
-rw-r--r--configs/digsy_mtc_rev5_defconfig1
-rw-r--r--configs/dlvision-10g_defconfig1
-rw-r--r--configs/dlvision_defconfig1
-rw-r--r--configs/dns325_defconfig1
-rw-r--r--configs/dockstar_defconfig1
-rw-r--r--configs/dreamplug_defconfig1
-rw-r--r--configs/ds109_defconfig1
-rw-r--r--configs/ds414_defconfig1
-rw-r--r--configs/ea20_defconfig1
-rw-r--r--configs/edb9315a_defconfig1
-rw-r--r--configs/edminiv2_defconfig1
-rw-r--r--configs/espresso7420_defconfig1
-rw-r--r--configs/flea3_defconfig1
-rw-r--r--configs/fo300_defconfig1
-rw-r--r--configs/galileo_defconfig1
-rw-r--r--configs/gdppc440etx_defconfig1
-rw-r--r--configs/glacier_defconfig1
-rw-r--r--configs/glacier_ramboot_defconfig1
-rw-r--r--configs/goflexhome_defconfig1
-rw-r--r--configs/gplugd_defconfig1
-rw-r--r--configs/guruplug_defconfig1
-rw-r--r--configs/h2200_defconfig1
-rw-r--r--configs/haleakala_defconfig1
-rw-r--r--configs/highbank_defconfig1
-rw-r--r--configs/ib62x0_defconfig1
-rw-r--r--configs/icon_defconfig1
-rw-r--r--configs/iconnect_defconfig1
-rw-r--r--configs/ids8313_defconfig1
-rw-r--r--configs/imx31_phycore_defconfig1
-rw-r--r--configs/imx31_phycore_eet_defconfig1
-rw-r--r--configs/inetspace_v2_defconfig1
-rw-r--r--configs/inka4x0_defconfig1
-rw-r--r--configs/integratorap_cm720t_defconfig1
-rw-r--r--configs/integratorap_cm920t_defconfig1
-rw-r--r--configs/integratorap_cm926ejs_defconfig1
-rw-r--r--configs/integratorap_cm946es_defconfig1
-rw-r--r--configs/integratorcp_cm1136_defconfig1
-rw-r--r--configs/integratorcp_cm920t_defconfig1
-rw-r--r--configs/integratorcp_cm926ejs_defconfig1
-rw-r--r--configs/integratorcp_cm946es_defconfig1
-rw-r--r--configs/intip_defconfig1
-rw-r--r--configs/io64_defconfig1
-rw-r--r--configs/io_defconfig1
-rw-r--r--configs/iocon_defconfig1
-rw-r--r--configs/ipam390_defconfig1
-rw-r--r--configs/ipek01_defconfig1
-rw-r--r--configs/jupiter_defconfig1
-rw-r--r--configs/k2e_evm_defconfig1
-rw-r--r--configs/k2hk_evm_defconfig1
-rw-r--r--configs/k2l_evm_defconfig1
-rw-r--r--configs/katmai_defconfig1
-rw-r--r--configs/kilauea_defconfig1
-rw-r--r--configs/km_kirkwood_128m16_defconfig1
-rw-r--r--configs/km_kirkwood_defconfig1
-rw-r--r--configs/km_kirkwood_pci_defconfig1
-rw-r--r--configs/kmcoge4_defconfig1
-rw-r--r--configs/kmcoge5ne_defconfig1
-rw-r--r--configs/kmcoge5un_defconfig1
-rw-r--r--configs/kmeter1_defconfig1
-rw-r--r--configs/kmlion1_defconfig1
-rw-r--r--configs/kmnusa_defconfig1
-rw-r--r--configs/kmopti2_defconfig1
-rw-r--r--configs/kmsugp1_defconfig1
-rw-r--r--configs/kmsupx5_defconfig1
-rw-r--r--configs/kmsuv31_defconfig1
-rw-r--r--configs/kmtegr1_defconfig1
-rw-r--r--configs/kmtepr2_defconfig1
-rw-r--r--configs/kmvect1_defconfig1
-rw-r--r--configs/kzm9g_defconfig1
-rw-r--r--configs/ls1012afrdm_qspi_defconfig1
-rw-r--r--configs/ls2080a_emu_defconfig1
-rw-r--r--configs/lschlv2_defconfig1
-rw-r--r--configs/lsxhl_defconfig1
-rw-r--r--configs/luan_defconfig1
-rw-r--r--configs/lwmon5_defconfig1
-rw-r--r--configs/makalu_defconfig1
-rw-r--r--configs/maxbcm_defconfig1
-rw-r--r--configs/mecp5123_defconfig1
-rw-r--r--configs/meesc_dataflash_defconfig1
-rw-r--r--configs/meesc_defconfig1
-rw-r--r--configs/mgcoge3ne_defconfig1
-rw-r--r--configs/mgcoge3un_defconfig1
-rw-r--r--configs/mgcoge_defconfig1
-rw-r--r--configs/minnowmax_defconfig1
-rw-r--r--configs/motionpro_defconfig1
-rw-r--r--configs/mpc5121ads_defconfig1
-rw-r--r--configs/mpc5121ads_rev2_defconfig1
-rw-r--r--configs/mpc8308_p1m_defconfig1
-rw-r--r--configs/munices_defconfig1
-rw-r--r--configs/mvebu_db-88f3720_defconfig1
-rw-r--r--configs/mvebu_db-88f7040_defconfig1
-rw-r--r--configs/mvebu_db-88f8040_defconfig1
-rw-r--r--configs/mx31ads_defconfig1
-rw-r--r--configs/mx31pdk_defconfig1
-rw-r--r--configs/nas220_defconfig1
-rw-r--r--configs/neo_defconfig1
-rw-r--r--configs/net2big_v2_defconfig1
-rw-r--r--configs/netspace_lite_v2_defconfig1
-rw-r--r--configs/netspace_max_v2_defconfig1
-rw-r--r--configs/netspace_mini_v2_defconfig1
-rw-r--r--configs/netspace_v2_defconfig1
-rw-r--r--configs/nsa310s_defconfig1
-rw-r--r--configs/odroid-c2_defconfig1
-rw-r--r--configs/pcm030_LOWBOOT_defconfig1
-rw-r--r--configs/pcm030_defconfig1
-rw-r--r--configs/pdm360ng_defconfig1
-rw-r--r--configs/pic32mzdask_defconfig1
-rw-r--r--configs/pm9261_defconfig1
-rw-r--r--configs/pm9263_defconfig1
-rw-r--r--configs/pm9g45_defconfig1
-rw-r--r--configs/pogo_e02_defconfig1
-rw-r--r--configs/portl2_defconfig1
-rw-r--r--configs/qemu-ppce500_defconfig1
-rw-r--r--configs/rainier_defconfig1
-rw-r--r--configs/rainier_ramboot_defconfig1
-rw-r--r--configs/redwood_defconfig1
-rw-r--r--configs/salvator-x_defconfig1
-rw-r--r--configs/sama5d2_ptc_nandflash_defconfig1
-rw-r--r--configs/sama5d2_ptc_spiflash_defconfig1
-rw-r--r--configs/sama5d2_xplained_mmc_defconfig1
-rw-r--r--configs/sama5d2_xplained_spiflash_defconfig1
-rw-r--r--configs/sandbox_defconfig1
-rw-r--r--configs/sandbox_noblk_defconfig1
-rw-r--r--configs/sandbox_spl_defconfig1
-rw-r--r--configs/sbc8349_PCI_33_defconfig1
-rw-r--r--configs/sbc8349_PCI_66_defconfig1
-rw-r--r--configs/sbc8349_defconfig1
-rw-r--r--configs/sbc8548_PCI_33_PCIE_defconfig1
-rw-r--r--configs/sbc8548_PCI_33_defconfig1
-rw-r--r--configs/sbc8548_PCI_66_PCIE_defconfig1
-rw-r--r--configs/sbc8548_PCI_66_defconfig1
-rw-r--r--configs/sbc8548_defconfig1
-rw-r--r--configs/sbc8641d_defconfig1
-rw-r--r--configs/sequoia_defconfig1
-rw-r--r--configs/sequoia_ramboot_defconfig1
-rw-r--r--configs/sh7752evb_defconfig1
-rw-r--r--configs/sh7753evb_defconfig1
-rw-r--r--configs/sh7757lcr_defconfig1
-rw-r--r--configs/smartweb_defconfig1
-rw-r--r--configs/smdkc100_defconfig1
-rw-r--r--configs/snapper9260_defconfig1
-rw-r--r--configs/snapper9g20_defconfig1
-rw-r--r--configs/socfpga_is1_defconfig1
-rw-r--r--configs/socrates_defconfig1
-rw-r--r--configs/spear300_defconfig1
-rw-r--r--configs/spear300_nand_defconfig1
-rw-r--r--configs/spear300_usbtty_defconfig1
-rw-r--r--configs/spear300_usbtty_nand_defconfig1
-rw-r--r--configs/spear310_defconfig1
-rw-r--r--configs/spear310_nand_defconfig1
-rw-r--r--configs/spear310_pnor_defconfig1
-rw-r--r--configs/spear310_usbtty_defconfig1
-rw-r--r--configs/spear310_usbtty_nand_defconfig1
-rw-r--r--configs/spear310_usbtty_pnor_defconfig1
-rw-r--r--configs/spear320_defconfig1
-rw-r--r--configs/spear320_nand_defconfig1
-rw-r--r--configs/spear320_pnor_defconfig1
-rw-r--r--configs/spear320_usbtty_defconfig1
-rw-r--r--configs/spear320_usbtty_nand_defconfig1
-rw-r--r--configs/spear320_usbtty_pnor_defconfig1
-rw-r--r--configs/spear600_defconfig1
-rw-r--r--configs/spear600_nand_defconfig1
-rw-r--r--configs/spear600_usbtty_defconfig1
-rw-r--r--configs/spear600_usbtty_nand_defconfig1
-rw-r--r--configs/stm32f429-discovery_defconfig1
-rw-r--r--configs/stm32f746-disco_defconfig1
-rw-r--r--configs/stv0991_defconfig1
-rw-r--r--configs/suvd3_defconfig1
-rw-r--r--configs/sycamore_defconfig1
-rw-r--r--configs/t3corp_defconfig1
-rw-r--r--configs/taurus_defconfig1
-rw-r--r--configs/tcm-bf537_defconfig1
-rw-r--r--configs/theadorable-x86-dfi-bt700_defconfig1
-rw-r--r--configs/theadorable_debug_defconfig1
-rw-r--r--configs/theadorable_defconfig1
-rw-r--r--configs/thunderx_88xx_defconfig1
-rw-r--r--configs/tuge1_defconfig1
-rw-r--r--configs/tuxx1_defconfig1
-rw-r--r--configs/uniphier_ld11_defconfig1
-rw-r--r--configs/uniphier_ld20_defconfig1
-rw-r--r--configs/uniphier_ld4_sld8_defconfig1
-rw-r--r--configs/uniphier_pro4_defconfig1
-rw-r--r--configs/uniphier_pxs2_ld6b_defconfig1
-rw-r--r--configs/uniphier_sld3_defconfig1
-rw-r--r--configs/usb_a9263_dataflash_defconfig1
-rw-r--r--configs/v38b_defconfig1
-rw-r--r--configs/ve8313_defconfig1
-rw-r--r--configs/vexpress_aemv8a_dram_defconfig1
-rw-r--r--configs/vexpress_aemv8a_juno_defconfig1
-rw-r--r--configs/vexpress_aemv8a_semi_defconfig1
-rw-r--r--configs/vme8349_defconfig1
-rw-r--r--configs/walnut_defconfig1
-rw-r--r--configs/work_92105_defconfig1
-rw-r--r--configs/wtk_defconfig1
-rw-r--r--configs/x600_defconfig1
-rw-r--r--configs/xilinx-ppc405-generic_defconfig1
-rw-r--r--configs/xilinx-ppc440-generic_defconfig1
-rw-r--r--configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig1
-rw-r--r--configs/xpedite1000_defconfig1
-rw-r--r--configs/xpedite517x_defconfig1
-rw-r--r--configs/xpedite520x_defconfig1
-rw-r--r--configs/xpedite537x_defconfig1
-rw-r--r--configs/xpedite550x_defconfig1
-rw-r--r--configs/yellowstone_defconfig1
-rw-r--r--configs/yosemite_defconfig1
-rw-r--r--configs/yucca_defconfig1
-rw-r--r--configs/zmx25_defconfig1
-rw-r--r--configs/zynq_zc770_xm011_defconfig1
-rw-r--r--configs/zynq_zc770_xm012_defconfig1
-rw-r--r--configs/zynq_zc770_xm013_defconfig1
-rw-r--r--drivers/mmc/Kconfig10
-rw-r--r--include/configs/BSC9132QDS.h1
-rw-r--r--include/configs/MPC8308RDB.h2
-rw-r--r--include/configs/MPC837XEMDS.h2
-rw-r--r--include/configs/MPC837XERDB.h2
-rw-r--r--include/configs/MPC8536DS.h2
-rw-r--r--include/configs/MPC8569MDS.h2
-rw-r--r--include/configs/P1010RDB.h1
-rw-r--r--include/configs/P1022DS.h1
-rw-r--r--include/configs/P2041RDB.h2
-rw-r--r--include/configs/P3041DS.h1
-rw-r--r--include/configs/P4080DS.h1
-rw-r--r--include/configs/P5020DS.h1
-rw-r--r--include/configs/P5040DS.h1
-rw-r--r--include/configs/T102xQDS.h1
-rw-r--r--include/configs/T102xRDB.h1
-rw-r--r--include/configs/T1040QDS.h2
-rw-r--r--include/configs/T104xRDB.h2
-rw-r--r--include/configs/T208xQDS.h1
-rw-r--r--include/configs/T208xRDB.h1
-rw-r--r--include/configs/T4240QDS.h2
-rw-r--r--include/configs/T4240RDB.h2
-rw-r--r--include/configs/UCP1020.h2
-rw-r--r--include/configs/adp-ag101p.h1
-rw-r--r--include/configs/advantech_dms-ba16.h1
-rw-r--r--include/configs/alt.h1
-rw-r--r--include/configs/am3517_crane.h1
-rw-r--r--include/configs/am3517_evm.h1
-rw-r--r--include/configs/apalis_imx6.h1
-rw-r--r--include/configs/apalis_t30.h1
-rw-r--r--include/configs/apf27.h1
-rw-r--r--include/configs/at91sam9260ek.h1
-rw-r--r--include/configs/at91sam9263ek.h1
-rw-r--r--include/configs/at91sam9m10g45ek.h1
-rw-r--r--include/configs/at91sam9n12ek.h1
-rw-r--r--include/configs/at91sam9rlek.h1
-rw-r--r--include/configs/at91sam9x5ek.h1
-rw-r--r--include/configs/atngw100.h1
-rw-r--r--include/configs/atngw100mkii.h1
-rw-r--r--include/configs/atstk1002.h1
-rw-r--r--include/configs/axs10x.h1
-rw-r--r--include/configs/bayleybay.h1
-rw-r--r--include/configs/bcm23550_w1d.h1
-rw-r--r--include/configs/bcm28155_ap.h1
-rw-r--r--include/configs/beaver.h1
-rw-r--r--include/configs/bf518f-ezbrd.h1
-rw-r--r--include/configs/bf527-ad7160-eval.h1
-rw-r--r--include/configs/bf537-stamp.h1
-rw-r--r--include/configs/bf548-ezkit.h1
-rw-r--r--include/configs/bf609-ezkit.h1
-rw-r--r--include/configs/brppt1.h1
-rw-r--r--include/configs/brxre1.h1
-rw-r--r--include/configs/cardhu.h1
-rw-r--r--include/configs/cei-tk1-som.h1
-rw-r--r--include/configs/clearfog.h1
-rw-r--r--include/configs/cm-bf537e.h1
-rw-r--r--include/configs/cm-bf537u.h1
-rw-r--r--include/configs/cm_t35.h1
-rw-r--r--include/configs/cm_t3517.h1
-rw-r--r--include/configs/colibri_imx6.h1
-rw-r--r--include/configs/colibri_t20.h1
-rw-r--r--include/configs/colibri_t30.h1
-rw-r--r--include/configs/colibri_vf.h1
-rw-r--r--include/configs/conga-qeval20-qa3-e3845.h1
-rw-r--r--include/configs/controlcenterd.h1
-rw-r--r--include/configs/crownbay.h1
-rw-r--r--include/configs/cyrus.h1
-rw-r--r--include/configs/da850evm.h1
-rw-r--r--include/configs/dalmore.h1
-rw-r--r--include/configs/db-88f6820-gp.h1
-rw-r--r--include/configs/dfi-bt700.h1
-rw-r--r--include/configs/dragonboard410c.h1
-rw-r--r--include/configs/e2220-1170.h1
-rw-r--r--include/configs/edb93xx.h1
-rw-r--r--include/configs/ethernut5.h1
-rw-r--r--include/configs/exynos-common.h1
-rw-r--r--include/configs/galileo.h1
-rw-r--r--include/configs/ge_bx50v3.h1
-rw-r--r--include/configs/gose.h1
-rw-r--r--include/configs/harmony.h1
-rw-r--r--include/configs/hikey.h1
-rw-r--r--include/configs/hrcon.h1
-rw-r--r--include/configs/imx27lite-common.h1
-rw-r--r--include/configs/jetson-tk1.h1
-rw-r--r--include/configs/k2g_evm.h1
-rw-r--r--include/configs/kc1.h1
-rw-r--r--include/configs/koelsch.h1
-rw-r--r--include/configs/lager.h1
-rw-r--r--include/configs/legoev3.h1
-rw-r--r--include/configs/ls1012aqds.h1
-rw-r--r--include/configs/ls1012ardb.h1
-rw-r--r--include/configs/ls1021aiot.h1
-rw-r--r--include/configs/ls1021aqds.h1
-rw-r--r--include/configs/ls1021atwr.h1
-rw-r--r--include/configs/ls1043a_common.h1
-rw-r--r--include/configs/ls1046a_common.h1
-rw-r--r--include/configs/ls2080a_simu.h1
-rw-r--r--include/configs/ls2080aqds.h1
-rw-r--r--include/configs/ls2080ardb.h1
-rw-r--r--include/configs/m53evk.h1
-rw-r--r--include/configs/ma5d4evk.h1
-rw-r--r--include/configs/mcx.h1
-rw-r--r--include/configs/medcom-wide.h1
-rw-r--r--include/configs/minnowmax.h1
-rw-r--r--include/configs/mx25pdk.h1
-rw-r--r--include/configs/mx35pdk.h1
-rw-r--r--include/configs/mx51evk.h2
-rw-r--r--include/configs/mx53ard.h1
-rw-r--r--include/configs/mx53cx9020.h1
-rw-r--r--include/configs/mx53evk.h1
-rw-r--r--include/configs/mx53loco.h1
-rw-r--r--include/configs/mx53smd.h1
-rw-r--r--include/configs/mx6_common.h1
-rw-r--r--include/configs/mx7_common.h1
-rw-r--r--include/configs/mxs.h1
-rw-r--r--include/configs/nokia_rx51.h1
-rw-r--r--include/configs/nyan-big.h1
-rw-r--r--include/configs/omap3_evm.h1
-rw-r--r--include/configs/omapl138_lcdk.h1
-rw-r--r--include/configs/openrd.h1
-rw-r--r--include/configs/p1_p2_rdb_pc.h2
-rw-r--r--include/configs/p1_twr.h2
-rw-r--r--include/configs/p2371-0000.h1
-rw-r--r--include/configs/p2371-2180.h1
-rw-r--r--include/configs/p2571.h1
-rw-r--r--include/configs/p2771-0000.h1
-rw-r--r--include/configs/paz00.h1
-rw-r--r--include/configs/pcm052.h1
-rw-r--r--include/configs/pepper.h1
-rw-r--r--include/configs/pic32mzdask.h1
-rw-r--r--include/configs/pico-imx6ul.h1
-rw-r--r--include/configs/picosam9g45.h1
-rw-r--r--include/configs/plutux.h1
-rw-r--r--include/configs/porter.h1
-rw-r--r--include/configs/pxa-common.h1
-rw-r--r--include/configs/rk3036_common.h1
-rw-r--r--include/configs/rk3288_common.h1
-rw-r--r--include/configs/rk3399_common.h1
-rw-r--r--include/configs/rpi.h1
-rw-r--r--include/configs/s32v234evb.h1
-rw-r--r--include/configs/s5p_goni.h1
-rw-r--r--include/configs/sama5d3_xplained.h1
-rw-r--r--include/configs/sama5d3xek.h1
-rw-r--r--include/configs/sama5d4_xplained.h1
-rw-r--r--include/configs/sama5d4ek.h1
-rw-r--r--include/configs/seaboard.h1
-rw-r--r--include/configs/sh7752evb.h1
-rw-r--r--include/configs/sh7753evb.h1
-rw-r--r--include/configs/sh7757lcr.h1
-rw-r--r--include/configs/sheevaplug.h1
-rw-r--r--include/configs/siemens-am33x-common.h1
-rw-r--r--include/configs/silk.h1
-rw-r--r--include/configs/snapper9g45.h1
-rw-r--r--include/configs/sniper.h1
-rw-r--r--include/configs/socfpga_common.h1
-rw-r--r--include/configs/stout.h1
-rw-r--r--include/configs/strider.h1
-rw-r--r--include/configs/tam3517-common.h1
-rw-r--r--include/configs/tao3530.h1
-rw-r--r--include/configs/tcm-bf537.h1
-rw-r--r--include/configs/tec-ng.h1
-rw-r--r--include/configs/tec.h1
-rw-r--r--include/configs/tegra-common-post.h3
-rw-r--r--include/configs/ti814x_evm.h1
-rw-r--r--include/configs/ti816x_evm.h1
-rw-r--r--include/configs/ti_armv7_common.h1
-rw-r--r--include/configs/ti_armv7_keystone2.h1
-rw-r--r--include/configs/tricorder.h1
-rw-r--r--include/configs/trimslice.h1
-rw-r--r--include/configs/ts4800.h2
-rw-r--r--include/configs/usbarmory.h1
-rw-r--r--include/configs/venice2.h1
-rw-r--r--include/configs/ventana.h1
-rw-r--r--include/configs/vexpress_common.h1
-rw-r--r--include/configs/vf610twr.h1
-rw-r--r--include/configs/vinco.h1
-rw-r--r--include/configs/whistler.h1
-rw-r--r--include/configs/woodburn_common.h1
-rw-r--r--include/configs/xilinx_zynqmp.h1
-rw-r--r--include/configs/zipitz2.h1
-rw-r--r--include/configs/zynq-common.h1
558 files changed, 382 insertions, 202 deletions
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig
index dc5f5e36ab..5ee32b861e 100644
--- a/configs/B4420QDS_NAND_defconfig
+++ b/configs/B4420QDS_NAND_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_B4420QDS=y
CONFIG_FIT=y
diff --git a/configs/B4420QDS_SPIFLASH_defconfig b/configs/B4420QDS_SPIFLASH_defconfig
index fcf683d13c..69e47a2226 100644
--- a/configs/B4420QDS_SPIFLASH_defconfig
+++ b/configs/B4420QDS_SPIFLASH_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_B4420QDS=y
CONFIG_FIT=y
diff --git a/configs/B4420QDS_defconfig b/configs/B4420QDS_defconfig
index 6c3c5ab914..abc6a7c8de 100644
--- a/configs/B4420QDS_defconfig
+++ b/configs/B4420QDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_B4420QDS=y
CONFIG_FIT=y
diff --git a/configs/B4860QDS_NAND_defconfig b/configs/B4860QDS_NAND_defconfig
index 28ffcb6eb6..56e7318eb8 100644
--- a/configs/B4860QDS_NAND_defconfig
+++ b/configs/B4860QDS_NAND_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_FIT=y
diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
index 69edc0008e..3a77f0d023 100644
--- a/configs/B4860QDS_SECURE_BOOT_defconfig
+++ b/configs/B4860QDS_SECURE_BOOT_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_SECURE_BOOT=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
# CONFIG_SYS_MALLOC_F is not set
diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
index 94a07fa2cf..9bebdf7f04 100644
--- a/configs/B4860QDS_SPIFLASH_defconfig
+++ b/configs/B4860QDS_SPIFLASH_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_FIT=y
diff --git a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
index cb3e134077..d832455449 100644
--- a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_FIT=y
diff --git a/configs/B4860QDS_defconfig b/configs/B4860QDS_defconfig
index 077ffd248c..fd00b60e2c 100644
--- a/configs/B4860QDS_defconfig
+++ b/configs/B4860QDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_FIT=y
diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
index e88e2340d1..8c1ab70d44 100644
--- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
@@ -1,6 +1,7 @@
CONFIG_PPC=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_FIT=y
diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig
index 5c4d45d9e7..f8de2e6dc6 100644
--- a/configs/BSC9131RDB_NAND_defconfig
+++ b/configs/BSC9131RDB_NAND_defconfig
@@ -1,6 +1,7 @@
CONFIG_PPC=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_FIT=y
diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
index 23a74c333f..940b5363b5 100644
--- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_FIT=y
diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig
index 2c5d637a67..481fd9285d 100644
--- a/configs/BSC9131RDB_SPIFLASH_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_FIT=y
diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig
index 9398844800..e2490dc134 100644
--- a/configs/C29XPCIE_NAND_defconfig
+++ b/configs/C29XPCIE_NAND_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_FIT=y
diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
index 737467dba1..801c10e5ed 100644
--- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
+++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_SECURE_BOOT=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
# CONFIG_SYS_MALLOC_F is not set
diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
index 56e7066b71..0639457323 100644
--- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_SECURE_BOOT=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
# CONFIG_SYS_MALLOC_F is not set
diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig
index 43c88ee0e8..dc536a71ea 100644
--- a/configs/C29XPCIE_SPIFLASH_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_FIT=y
diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig
index c2b58d19df..5d7f03e9df 100644
--- a/configs/C29XPCIE_defconfig
+++ b/configs/C29XPCIE_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_FIT=y
diff --git a/configs/CPCI2DP_defconfig b/configs/CPCI2DP_defconfig
index 1df74dde44..2dfd63c09a 100644
--- a/configs/CPCI2DP_defconfig
+++ b/configs/CPCI2DP_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_CPCI2DP=y
CONFIG_BOOTDELAY=3
diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig
index 605d85f728..b5135f7023 100644
--- a/configs/CPCI4052_defconfig
+++ b/configs/CPCI4052_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_CPCI4052=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 591fca5885..76d0ef4d9a 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING="\n(c) 2003 by MPL AG Switzerland, MEV-10082-001 released"
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_4xx=y
CONFIG_TARGET_MIP405T=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index eee1811d5c..0c358f98b8 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING="\n(c) 2003 by MPL AG Switzerland, MEV-10072-001 released"
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_4xx=y
CONFIG_TARGET_MIP405=y
diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig
index 2fdffa9b43..2513632178 100644
--- a/configs/MPC8313ERDB_33_defconfig
+++ b/configs/MPC8313ERDB_33_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8313ERDB=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig
index 56538ccb94..9d611fcdc8 100644
--- a/configs/MPC8313ERDB_66_defconfig
+++ b/configs/MPC8313ERDB_66_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8313ERDB=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig
index c64b4e8f0d..79a9c27205 100644
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -1,6 +1,7 @@
CONFIG_PPC=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8313ERDB=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig
index a97f6341a5..aa4a1c4300 100644
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -1,6 +1,7 @@
CONFIG_PPC=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8313ERDB=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig
index 50fa7862c0..4e2b705fcf 100644
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8315ERDB=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig
index 5e5a2d0f98..043ab9b01a 100644
--- a/configs/MPC8323ERDB_defconfig
+++ b/configs/MPC8323ERDB_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8323ERDB=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC832XEMDS_ATM_defconfig b/configs/MPC832XEMDS_ATM_defconfig
index 690357e656..7d5914918d 100644
--- a/configs/MPC832XEMDS_ATM_defconfig
+++ b/configs/MPC832XEMDS_ATM_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC832XEMDS_HOST_33_defconfig b/configs/MPC832XEMDS_HOST_33_defconfig
index 1fbd0fb6eb..5a53b1d204 100644
--- a/configs/MPC832XEMDS_HOST_33_defconfig
+++ b/configs/MPC832XEMDS_HOST_33_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC832XEMDS_HOST_66_defconfig b/configs/MPC832XEMDS_HOST_66_defconfig
index 0adc3834ac..9a47c62367 100644
--- a/configs/MPC832XEMDS_HOST_66_defconfig
+++ b/configs/MPC832XEMDS_HOST_66_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC832XEMDS_SLAVE_defconfig b/configs/MPC832XEMDS_SLAVE_defconfig
index 838e5e6e0c..cdd3d77100 100644
--- a/configs/MPC832XEMDS_SLAVE_defconfig
+++ b/configs/MPC832XEMDS_SLAVE_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC832XEMDS_defconfig b/configs/MPC832XEMDS_defconfig
index e27314a49a..af617e61da 100644
--- a/configs/MPC832XEMDS_defconfig
+++ b/configs/MPC832XEMDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
index 28945a6229..3a8844e51b 100644
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8349EMDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index f1afcf853c..e85ec166f5 100644
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8349ITX=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index 10299f504b..56e9607cdc 100644
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8349ITX=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index 4a63f49783..8cdcf2b15e 100644
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8349ITX=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8540ADS_defconfig b/configs/MPC8540ADS_defconfig
index e3cb0d5e9a..629111162b 100644
--- a/configs/MPC8540ADS_defconfig
+++ b/configs/MPC8540ADS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8540ADS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig
index 1ea8800441..fc0aa99580 100644
--- a/configs/MPC8541CDS_defconfig
+++ b/configs/MPC8541CDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8541CDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8541CDS_legacy_defconfig b/configs/MPC8541CDS_legacy_defconfig
index ae529d1725..61eed37185 100644
--- a/configs/MPC8541CDS_legacy_defconfig
+++ b/configs/MPC8541CDS_legacy_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8541CDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index 705cc7080a..d160f045e3 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8544DS=y
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index 5d834e6249..65e937f769 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
CONFIG_PHYS_64BIT=y
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index ee400a38fd..684217003a 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index b7334615f9..defdfc0ff8 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig
index da42112fab..9f9168ae35 100644
--- a/configs/MPC8555CDS_defconfig
+++ b/configs/MPC8555CDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8555CDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig
index fb148912b9..51d17ad4eb 100644
--- a/configs/MPC8555CDS_legacy_defconfig
+++ b/configs/MPC8555CDS_legacy_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8555CDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8560ADS_defconfig b/configs/MPC8560ADS_defconfig
index 67063c81da..5a8cc2697a 100644
--- a/configs/MPC8560ADS_defconfig
+++ b/configs/MPC8560ADS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8560ADS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8568MDS_defconfig b/configs/MPC8568MDS_defconfig
index 2e7dcebd07..c6bc814ae0 100644
--- a/configs/MPC8568MDS_defconfig
+++ b/configs/MPC8568MDS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8568MDS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
index 1239d08a74..b05496a1a9 100644
--- a/configs/MPC8572DS_36BIT_defconfig
+++ b/configs/MPC8572DS_36BIT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8572DS=y
diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
index 13df52ec6c..19d3d33ece 100644
--- a/configs/MPC8572DS_defconfig
+++ b/configs/MPC8572DS_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8572DS=y
diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index 932795508c..563896d303 100644
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8610HPCD=y
diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index d1f9e10857..9bd0e3d5db 100644
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8641HPCN=y
diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index 0672345190..43a5290359 100644
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8641HPCN=y
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index f07aa3efdd..ff79c12853 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
diff --git a/configs/O2D300_defconfig b/configs/O2D300_defconfig
index 37fc2f6f73..36c55b6627 100644
--- a/configs/O2D300_defconfig
+++ b/configs/O2D300_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2D300=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O2DNT2_RAMBOOT_defconfig b/configs/O2DNT2_RAMBOOT_defconfig
index 19bbc269f5..b374c281da 100644
--- a/configs/O2DNT2_RAMBOOT_defconfig
+++ b/configs/O2DNT2_RAMBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2DNT2=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O2DNT2_defconfig b/configs/O2DNT2_defconfig
index 0cb9df5962..00a713b95f 100644
--- a/configs/O2DNT2_defconfig
+++ b/configs/O2DNT2_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2DNT2=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O2D_defconfig b/configs/O2D_defconfig
index fcfedd54a0..9bc2342b40 100644
--- a/configs/O2D_defconfig
+++ b/configs/O2D_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2D=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O2I_defconfig b/configs/O2I_defconfig
index cf69bde175..2f3276ccf1 100644
--- a/configs/O2I_defconfig
+++ b/configs/O2I_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2I=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O2MNT_O2M110_defconfig b/configs/O2MNT_O2M110_defconfig
index 5025ef359a..57c9f7bfa6 100644
--- a/configs/O2MNT_O2M110_defconfig
+++ b/configs/O2MNT_O2M110_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O2MNT_O2M112_defconfig b/configs/O2MNT_O2M112_defconfig
index 54281661a6..3afa43bd45 100644
--- a/configs/O2MNT_O2M112_defconfig
+++ b/configs/O2MNT_O2M112_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O2MNT_O2M113_defconfig b/configs/O2MNT_O2M113_defconfig
index 19543c9eff..a543a3bde5 100644
--- a/configs/O2MNT_O2M113_defconfig
+++ b/configs/O2MNT_O2M113_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O2MNT_defconfig b/configs/O2MNT_defconfig
index 10e5c70d05..859ba732ce 100644
--- a/configs/O2MNT_defconfig
+++ b/configs/O2MNT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/O3DNT_defconfig b/configs/O3DNT_defconfig
index 6333d63f2c..c4f2f69dbf 100644
--- a/configs/O3DNT_defconfig
+++ b/configs/O3DNT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_O3DNT=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/P1023RDB_defconfig b/configs/P1023RDB_defconfig
index 80fcfe1025..3001575aa0 100644
--- a/configs/P1023RDB_defconfig
+++ b/configs/P1023RDB_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_P1023RDB=y
CONFIG_FIT=y
diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
index a24dcb2edb..ae1c1b6af0 100644
--- a/configs/PATI_defconfig
+++ b/configs/PATI_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING="\n(c) 2003 by MPL AG Switzerland, MEV-10084-001 released"
+# CONFIG_MMC is not set
CONFIG_5xx=y
CONFIG_TARGET_PATI=y
CONFIG_BOOTDELAY=5
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 707b6c0802..229448f9c4 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING="\n(c) 2002 by MPL AG Switzerland, MEV-10066-001 released"
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_4xx=y
CONFIG_TARGET_PIP405=y
diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig
index 3ff7c8568c..fe26fed896 100644
--- a/configs/PLU405_defconfig
+++ b/configs/PLU405_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_PLU405=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig
index ed285d5098..fe96b07616 100644
--- a/configs/PMC405DE_defconfig
+++ b/configs/PMC405DE_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_PMC405DE=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig
index cd2f0d2a5b..8c4454eab5 100644
--- a/configs/PMC440_defconfig
+++ b/configs/PMC440_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_PMC440=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig
index 8afa7ced65..df873ee459 100644
--- a/configs/TQM5200S_HIGHBOOT_defconfig
+++ b/configs/TQM5200S_HIGHBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig
index c30c71702c..2a59758526 100644
--- a/configs/TQM5200S_defconfig
+++ b/configs/TQM5200S_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index 564fa1808b..73ff1612da 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index ebad386728..c0d5c4bc88 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index ac8c9b7b70..58689123ef 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index dfe47ed22f..9d0e915108 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig
index f78b7f7650..0c6b2d9f4b 100644
--- a/configs/TQM823L_LCD_defconfig
+++ b/configs/TQM823L_LCD_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig
index 1524013175..7081ed624d 100644
--- a/configs/TQM823L_defconfig
+++ b/configs/TQM823L_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig
index fed4d81bc5..496dc067fd 100644
--- a/configs/TQM823M_defconfig
+++ b/configs/TQM823M_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM823M=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index b56d780bb4..8b24dfb930 100644
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_TQM834X=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig
index 028a0b87c3..0f711d1a59 100644
--- a/configs/TQM850L_defconfig
+++ b/configs/TQM850L_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM850L=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig
index 983a37c4c2..7a72ce95cb 100644
--- a/configs/TQM850M_defconfig
+++ b/configs/TQM850M_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM850M=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig
index 731d7e4186..b034a04f4f 100644
--- a/configs/TQM855L_defconfig
+++ b/configs/TQM855L_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM855L=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig
index 31ed1e0023..05b45186a3 100644
--- a/configs/TQM855M_defconfig
+++ b/configs/TQM855M_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM855M=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig
index 045bf014c7..5d8a08827f 100644
--- a/configs/TQM860L_defconfig
+++ b/configs/TQM860L_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM860L=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig
index 4733f4a0a9..023751d57f 100644
--- a/configs/TQM860M_defconfig
+++ b/configs/TQM860M_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM860M=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig
index 4fa6a69ae1..628d687bf6 100644
--- a/configs/TQM862L_defconfig
+++ b/configs/TQM862L_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM862L=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig
index 6cebdf4002..d1cf91c8cd 100644
--- a/configs/TQM862M_defconfig
+++ b/configs/TQM862M_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM862M=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig
index 256a7e295c..e0cf770b51 100644
--- a/configs/TQM866M_defconfig
+++ b/configs/TQM866M_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM866M=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig
index 64e18f5494..889de7bdc2 100644
--- a/configs/TQM885D_defconfig
+++ b/configs/TQM885D_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM885D=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig
index 5d1a7c4b82..97e4330db0 100644
--- a/configs/TTTech_defconfig
+++ b/configs/TTTech_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/VOM405_defconfig b/configs/VOM405_defconfig
index 6944478b17..aaaf31aaba 100644
--- a/configs/VOM405_defconfig
+++ b/configs/VOM405_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_VOM405=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index 250a90f611..0cfdd984e5 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -3,6 +3,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_A3M071=y
CONFIG_FIT=y
diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig
index bf4ac25ad6..f68b966bbc 100644
--- a/configs/a4m072_defconfig
+++ b/configs/a4m072_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_A4M072=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index e9510ff28d..da7719c019 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -3,6 +3,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_A3M071=y
CONFIG_FIT=y
diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig
index 834d2b2e4f..6c84fc692b 100644
--- a/configs/ac14xx_defconfig
+++ b/configs/ac14xx_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC512X=y
CONFIG_TARGET_AC14XX=y
CONFIG_FIT=y
diff --git a/configs/acadia_defconfig b/configs/acadia_defconfig
index 69053d5f1f..790d8a91e8 100644
--- a/configs/acadia_defconfig
+++ b/configs/acadia_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_ACADIA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index 0def407446..23ca68b147 100644
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -1,4 +1,5 @@
CONFIG_NDS32=y
+CONFIG_MMC=y
CONFIG_TARGET_ADP_AG101P=y
CONFIG_BOOTDELAY=3
CONFIG_SYS_PROMPT="NDS32 # "
diff --git a/configs/arches_defconfig b/configs/arches_defconfig
index a869d2fd64..88bf4df43e 100644
--- a/configs/arches_defconfig
+++ b/configs/arches_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_CANYONLANDS=y
CONFIG_ARCHES=y
diff --git a/configs/aria_defconfig b/configs/aria_defconfig
index 0f416450cc..d54708ee8e 100644
--- a/configs/aria_defconfig
+++ b/configs/aria_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC512X=y
CONFIG_TARGET_ARIA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 7d0a592d78..9409b8a6e6 100644
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_ARMADILLO_800EVA=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_VERSION_VARIABLE=y
# CONFIG_CMD_BDI is not set
diff --git a/configs/aspenite_defconfig b/configs/aspenite_defconfig
index 0dbb245217..b4260a1cb1 100644
--- a/configs/aspenite_defconfig
+++ b/configs/aspenite_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_ASPENITE=y
CONFIG_IDENT_STRING="\nMarvell-Aspenite DB"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig
index 291fb0d9b3..9674a04d08 100644
--- a/configs/at91rm9200ek_defconfig
+++ b/configs/at91rm9200ek_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91RM9200EK=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_SYS_STDIO_DEREGISTER is not set
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig
index 7c00ede0f9..39c1afe93a 100644
--- a/configs/at91rm9200ek_ram_defconfig
+++ b/configs/at91rm9200ek_ram_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91RM9200EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
CONFIG_BOOTDELAY=3
# CONFIG_SYS_STDIO_DEREGISTER is not set
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index d11b9a615e..36423b2c73 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index 4779d66774..3b2817205e 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index 25f92587b0..4f88507b35 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 502e1ea17e..6b26c78368 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index f51a145287..293009d663 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index d44ef1bcc6..4760c4e07b 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index 00cbeeb1c3..02cd5fa6a5 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index 70ef4baedb..453a75ddf2 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index 2ba3703091..0c8297884a 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 6d93ff9b79..4d94b84bd6 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index 8f1a682588..cbe0376b30 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index 998f863b1a..1b53332759 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index 40853005ff..4092bfa7cb 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index 1f5e34aa94..5ff6902351 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index d00843fbe0..fea620c476 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 52dbefdbce..be48af1168 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -1,4 +1,5 @@
CONFIG_AVR32=y
+CONFIG_MMC=y
CONFIG_TARGET_ATNGW100=y
CONFIG_BOOTDELAY=1
CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
index bfceedb426..9c1ee73a0b 100644
--- a/configs/atngw100mkii_defconfig
+++ b/configs/atngw100mkii_defconfig
@@ -1,4 +1,5 @@
CONFIG_AVR32=y
+CONFIG_MMC=y
CONFIG_TARGET_ATNGW100MKII=y
CONFIG_BOOTDELAY=1
CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig
index df5756873a..1a5c97d613 100644
--- a/configs/atstk1002_defconfig
+++ b/configs/atstk1002_defconfig
@@ -1,4 +1,5 @@
CONFIG_AVR32=y
+CONFIG_MMC=y
CONFIG_TARGET_ATSTK1002=y
CONFIG_BOOTDELAY=1
CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index 3e7f77ca77..db988c8be7 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM"
CONFIG_BOOTDELAY=3
diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
index b8d8baff98..04f5ffe959 100644
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARC=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_SYS_CLK_FREQ=750000000
+CONFIG_MMC=y
CONFIG_SYS_TEXT_BASE=0x81000000
CONFIG_DEFAULT_DEVICE_TREE="axs10x"
CONFIG_BOOTDELAY=3
diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig
index 5e44633faf..54fad6d958 100644
--- a/configs/axs103_defconfig
+++ b/configs/axs103_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARC=y
CONFIG_ISA_ARCV2=y
CONFIG_SYS_CLK_FREQ=100000000
+CONFIG_MMC=y
CONFIG_SYS_TEXT_BASE=0x81000000
CONFIG_DEFAULT_DEVICE_TREE="axs10x"
CONFIG_BOOTDELAY=3
diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig
index e47d4ecfe9..54b8380890 100644
--- a/configs/bamboo_defconfig
+++ b/configs/bamboo_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_BAMBOO=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 1eb6142524..419a10dec7 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_MMC=y
CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="bayleybay"
CONFIG_TARGET_BAYLEYBAY=y
diff --git a/configs/bcm911360_entphn-ns_defconfig b/configs/bcm911360_entphn-ns_defconfig
index c2d04a68e2..adcc152cbf 100644
--- a/configs/bcm911360_entphn-ns_defconfig
+++ b/configs/bcm911360_entphn-ns_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_BCMCYGNUS=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000,ARMV7_NONSEC"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/bcm911360_entphn_defconfig b/configs/bcm911360_entphn_defconfig
index 2937801783..e49071d5b9 100644
--- a/configs/bcm911360_entphn_defconfig
+++ b/configs/bcm911360_entphn_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_BCMCYGNUS=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/bcm911360k_defconfig b/configs/bcm911360k_defconfig
index 00f6f13de0..8077c4ae02 100644
--- a/configs/bcm911360k_defconfig
+++ b/configs/bcm911360k_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_BCMCYGNUS=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/bcm958300k-ns_defconfig b/configs/bcm958300k-ns_defconfig
index dc26bf7e35..26d0b0b080 100644
--- a/configs/bcm958300k-ns_defconfig
+++ b/configs/bcm958300k-ns_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_BCMCYGNUS=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000,ARMV7_NONSEC"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig
index 00f6f13de0..8077c4ae02 100644
--- a/configs/bcm958300k_defconfig
+++ b/configs/bcm958300k_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_BCMCYGNUS=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/bcm958305k_defconfig b/configs/bcm958305k_defconfig
index 00f6f13de0..8077c4ae02 100644
--- a/configs/bcm958305k_defconfig
+++ b/configs/bcm958305k_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_BCMCYGNUS=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/bcm958622hr_defconfig b/configs/bcm958622hr_defconfig
index c7b6d5dfde..c8679ace1b 100644
--- a/configs/bcm958622hr_defconfig
+++ b/configs/bcm958622hr_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_BCMNSP=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/bf518f-ezbrd_defconfig b/configs/bf518f-ezbrd_defconfig
index 7f302376a9..d5b6e6e468 100644
--- a/configs/bf518f-ezbrd_defconfig
+++ b/configs/bf518f-ezbrd_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+CONFIG_MMC=y
CONFIG_TARGET_BF518F_EZBRD=y
CONFIG_BOOTDELAY=5
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/bf527-ad7160-eval_defconfig b/configs/bf527-ad7160-eval_defconfig
index ccbb148375..d26bd271fc 100644
--- a/configs/bf527-ad7160-eval_defconfig
+++ b/configs/bf527-ad7160-eval_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+CONFIG_MMC=y
CONFIG_TARGET_BF527_AD7160_EVAL=y
CONFIG_BOOTDELAY=5
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/bf537-stamp_defconfig b/configs/bf537-stamp_defconfig
index b691702bd6..d06ed7eb2c 100644
--- a/configs/bf537-stamp_defconfig
+++ b/configs/bf537-stamp_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+CONFIG_MMC=y
CONFIG_TARGET_BF537_STAMP=y
CONFIG_BOOTDELAY=5
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
index 19ac4e92ec..166b21a99a 100644
--- a/configs/bf548-ezkit_defconfig
+++ b/configs/bf548-ezkit_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+CONFIG_MMC=y
CONFIG_TARGET_BF548_EZKIT=y
CONFIG_BOOTDELAY=5
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/bf609-ezkit_defconfig b/configs/bf609-ezkit_defconfig
index b333c0209a..8fc0bf9cf3 100644
--- a/configs/bf609-ezkit_defconfig
+++ b/configs/bf609-ezkit_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+CONFIG_MMC=y
CONFIG_TARGET_BF609_EZKIT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_CMD_MMC=y
diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig
index 6c14965e8b..319c3e232b 100644
--- a/configs/bg0900_defconfig
+++ b/configs/bg0900_defconfig
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index fa6735d71a..8dcbdd27ec 100644
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_BLANCHE=y
+# CONFIG_MMC is not set
CONFIG_BOOTSTAGE_USER_COUNT=0x20
CONFIG_BOOTSTAGE_STASH_ADDR=0x0
CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index f8d5539ad4..31cd1808d4 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
diff --git a/configs/bubinga_defconfig b/configs/bubinga_defconfig
index ea629f6317..8a72e44893 100644
--- a/configs/bubinga_defconfig
+++ b/configs/bubinga_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_BUBINGA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig
index c2e454a658..78dc4e1c20 100644
--- a/configs/caddy2_defconfig
+++ b/configs/caddy2_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_VME8349=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index 7eee28a309..33a221a03b 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=0
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/cam5200_defconfig b/configs/cam5200_defconfig
index 960ab55a38..3bf1aa7046 100644
--- a/configs/cam5200_defconfig
+++ b/configs/cam5200_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/cam5200_niosflash_defconfig b/configs/cam5200_niosflash_defconfig
index 27f1032da6..602988e8ee 100644
--- a/configs/cam5200_niosflash_defconfig
+++ b/configs/cam5200_niosflash_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/canmb_defconfig b/configs/canmb_defconfig
index ae8e0400f4..f4cf5c33c4 100644
--- a/configs/canmb_defconfig
+++ b/configs/canmb_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_CANMB=y
CONFIG_BOOTDELAY=5
diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index 6f89b5851a..fb1f9ec45a 100644
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_CANYONLANDS=y
CONFIG_CANYONLANDS=y
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index 6b02a94e62..67d22b68a9 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_CHARON=y
diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
index db636e12aa..d687c43c11 100644
--- a/configs/cm-bf537e_defconfig
+++ b/configs/cm-bf537e_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+CONFIG_MMC=y
CONFIG_TARGET_CM_BF537E=y
CONFIG_BOOTDELAY=5
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/cm-bf537u_defconfig b/configs/cm-bf537u_defconfig
index f4726b0d97..38c6d4212c 100644
--- a/configs/cm-bf537u_defconfig
+++ b/configs/cm-bf537u_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+CONFIG_MMC=y
CONFIG_TARGET_CM_BF537U=y
CONFIG_BOOTDELAY=5
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig
index 675a143312..b09f31fd94 100644
--- a/configs/cm5200_defconfig
+++ b/configs/cm5200_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_CM5200=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 28f69e42ed..9144beb7c9 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_MMC=y
CONFIG_VENDOR_CONGATEC=y
CONFIG_TARGET_CONGA_QEVAL20_QA3_E3845=y
CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845"
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 2528db9c62..8a2e311127 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_MMC=y
CONFIG_VENDOR_CONGATEC=y
CONFIG_TARGET_CONGA_QEVAL20_QA3_E3845=y
CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845"
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index c373096427..e33d3719b9 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-corvus"
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 5aa72340bb..be4986bd2f 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -1,5 +1,6 @@
CONFIG_X86=y
CONFIG_MAX_CPUS=2
+CONFIG_MMC=y
CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="crownbay"
CONFIG_TARGET_CROWNBAY=y
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index eeea7e5db1..87686aa644 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NET2BIG_V2=y
CONFIG_IDENT_STRING=" D2 v2"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index ead968558d..8120b9d5d6 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA850EVM=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
CONFIG_BOOTDELAY=3
CONFIG_VERSION_VARIABLE=y
diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig
index 8ec8bdfbce..20539d172c 100644
--- a/configs/db-88f6720_defconfig
+++ b/configs/db-88f6720_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-375-db"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_BOOTDELAY=3
diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig
index 27ec6565ba..5543be88d4 100644
--- a/configs/db-88f6820-amc_defconfig
+++ b/configs/db-88f6820-amc_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index b3e2e1d99b..ffd9c5030b 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_BOOTDELAY=3
diff --git a/configs/devconcenter_defconfig b/configs/devconcenter_defconfig
index 6c3d7b52c2..6ce8786d17 100644
--- a/configs/devconcenter_defconfig
+++ b/configs/devconcenter_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" devconcenter 0.06"
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_INTIP=y
CONFIG_FIT=y
diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig
index 4c4d03102a..2bbea13f7f 100644
--- a/configs/devkit3250_defconfig
+++ b/configs/devkit3250_defconfig
@@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=1
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index f657ef6b38..efe1fc7e68 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_MMC=y
CONFIG_VENDOR_DFI=y
CONFIG_DEFAULT_DEVICE_TREE="dfi-bt700-q7x-151"
CONFIG_TARGET_DFI_BT700=y
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index 66c3393ef2..d4b9628895 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index daf08ce3c5..f8be655bd7 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index e55653bf03..46a4d107be 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index f1f5f2e771..6bb8e08d9f 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig
index 1731c5a8e6..2a5af4b52e 100644
--- a/configs/dlvision-10g_defconfig
+++ b/configs/dlvision-10g_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" dlvision-10g 0.06"
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_DLVISION_10G=y
CONFIG_FIT=y
diff --git a/configs/dlvision_defconfig b/configs/dlvision_defconfig
index 3376abee19..f8e96ac03a 100644
--- a/configs/dlvision_defconfig
+++ b/configs/dlvision_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" dlvision 0.02"
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_DLVISION=y
CONFIG_FIT=y
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 2ab31fa4c0..3a31a66ab1 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DNS325=y
CONFIG_IDENT_STRING="\nD-Link DNS-325"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index e263c5b599..2b13f00cfb 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DOCKSTAR=y
CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="DockStar> "
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index ec9ab9bcfb..cb15755489 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DREAMPLUG=y
CONFIG_IDENT_STRING="\nMarvell-DreamPlug"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index 34a4673c0f..94d3c7440b 100644
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DS109=y
+# CONFIG_MMC is not set
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
index 3950782df7..502d6f8c33 100644
--- a/configs/ds414_defconfig
+++ b/configs/ds414_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 7e1cefd765..bb6d3f1fd0 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_EA20=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig
index 6e7c5d86b9..9e8c6bb074 100644
--- a/configs/edb9315a_defconfig
+++ b/configs/edb9315a_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_EDB93XX=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="MK_edb9315a"
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 036935e5ea..df054d698d 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_TARGET_EDMINIV2=y
CONFIG_IDENT_STRING=" EDMiniV2"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y
diff --git a/configs/espresso7420_defconfig b/configs/espresso7420_defconfig
index 22267bbdbd..39837e9621 100644
--- a/configs/espresso7420_defconfig
+++ b/configs/espresso7420_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_ARCH_EXYNOS7=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_IDENT_STRING=" for ESPRESSO7420"
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="exynos7420-espresso7420"
CONFIG_SILENT_CONSOLE=y
CONFIG_CONSOLE_MUX=y
diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
index c5ccbd6cd9..1dec625a80 100644
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_FLEA3=y
+# CONFIG_MMC is not set
CONFIG_FIT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=3
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index faeafc4c7b..dd2f965b20 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 0220357e06..32c3237c3a 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_MMC=y
CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="galileo"
CONFIG_TARGET_GALILEO=y
diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig
index 3fc9261b5e..2a5a484432 100644
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_GDPPC440ETX=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig
index eb57e28346..0343128bd8 100644
--- a/configs/glacier_defconfig
+++ b/configs/glacier_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_CANYONLANDS=y
CONFIG_GLACIER=y
diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig
index 2d55edeb85..31c9d0b8d3 100644
--- a/configs/glacier_ramboot_defconfig
+++ b/configs/glacier_ramboot_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_CANYONLANDS=y
CONFIG_GLACIER=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 46527e5ca9..57a4c78864 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_GOFLEXHOME=y
CONFIG_IDENT_STRING="\nSeagate GoFlex Home"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index 3d98f8d7eb..3b22e6c2df 100644
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_GPLUGD=y
CONFIG_IDENT_STRING="\nMarvell-gplugD"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 43127de091..73a1213d5f 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_GURUPLUG=y
CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
index a47159a283..e7afd81007 100644
--- a/configs/h2200_defconfig
+++ b/configs/h2200_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_H2200=y
+# CONFIG_MMC is not set
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig
index 44471ccc12..2447cdd9b4 100644
--- a/configs/haleakala_defconfig
+++ b/configs/haleakala_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_KILAUEA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index b4f3975138..b1c8afdd49 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_HIGHBANK=y
+# CONFIG_MMC is not set
CONFIG_FIT=y
CONFIG_OF_BOARD_SETUP=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 4260245164..9c95b47828 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_IB62X0=y
CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 9a9544bb63..39ae1f3f41 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_4xx=y
CONFIG_TARGET_ICON=y
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 5b570b799d..d869628dda 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_ICONNECT=y
CONFIG_IDENT_STRING=" Iomega iConnect"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="iconnect => "
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 368441819e..fd43503214 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_IDS8313=y
CONFIG_FIT=y
diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig
index 136b9d14ad..d555c8acb8 100644
--- a/configs/imx31_phycore_defconfig
+++ b/configs/imx31_phycore_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_IMX31_PHYCORE=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_SYS_PROMPT="uboot> "
CONFIG_CMD_I2C=y
diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig
index 39fd439e0c..eb56222c78 100644
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_IMX31_PHYCORE=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX31_PHYCORE_EET"
CONFIG_BOOTDELAY=3
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index ba7f959011..bbe20a153a 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_IDENT_STRING=" IS v2"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
diff --git a/configs/inka4x0_defconfig b/configs/inka4x0_defconfig
index fe033c643a..cf21cfbbaa 100644
--- a/configs/inka4x0_defconfig
+++ b/configs/inka4x0_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_INKA4X0=y
CONFIG_BOOTDELAY=1
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index 7ddb47dd18..acef43776c 100644
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM720T=y
+# CONFIG_MMC is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index d9d66f4804..fe084db8cb 100644
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM920T=y
+# CONFIG_MMC is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index 81e5fe4aaf..b4bfa6ad15 100644
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM926EJ_S=y
+# CONFIG_MMC is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index 1b3c6f869f..4ada1f5e57 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM946ES=y
+# CONFIG_MMC is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 29b1cd5466..be082599f0 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM1136=y
+# CONFIG_MMC is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index 35da8c7765..ef4bbb5390 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM920T=y
+# CONFIG_MMC is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index e99cd80a4e..3641279906 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM926EJ_S=y
+# CONFIG_MMC is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index 02bc0f3e7d..8964a09655 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM946ES=y
+# CONFIG_MMC is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/intip_defconfig b/configs/intip_defconfig
index c833ebacb5..c929277d83 100644
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" intip 0.06"
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_INTIP=y
CONFIG_FIT=y
diff --git a/configs/io64_defconfig b/configs/io64_defconfig
index 635475e188..2791557c33 100644
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" io64 0.02"
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_IO64=y
CONFIG_FIT=y
diff --git a/configs/io_defconfig b/configs/io_defconfig
index e6e205a01a..1c9323a613 100644
--- a/configs/io_defconfig
+++ b/configs/io_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" io 0.06"
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_IO=y
CONFIG_FIT=y
diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig
index 787e7601ba..175979d531 100644
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" iocon 0.06"
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_IOCON=y
CONFIG_FIT=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index f80b0598a0..258ffe69e4 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig
index 215e9fdd81..a4a637f26e 100644
--- a/configs/ipek01_defconfig
+++ b/configs/ipek01_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_IPEK01=y
diff --git a/configs/jupiter_defconfig b/configs/jupiter_defconfig
index 416f50f9da..1558ab1794 100644
--- a/configs/jupiter_defconfig
+++ b/configs/jupiter_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_JUPITER=y
CONFIG_BOOTDELAY=5
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index ffa1c4aa38..835d0c9cc2 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="k2e-evm"
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 8b0e00f194..34defa81d0 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="k2hk-evm"
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 6424ec7e2d..75bcd9f9b3 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="k2l-evm"
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig
index b2cfe837d0..703347e2f3 100644
--- a/configs/katmai_defconfig
+++ b/configs/katmai_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_KATMAI=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig
index 20e4487581..c57dc1bac5 100644
--- a/configs/kilauea_defconfig
+++ b/configs/kilauea_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_KILAUEA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index a3535dd91e..ff3d14cc7a 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile Kirkwood 128M16"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index e7461bb1f7..1fdf0ac9ea 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile Kirkwood"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index b2dd27bad3..6c0360376d 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile Kirkwood PCI"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index 02a352a113..9b3061cc89 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_KMP204X=y
CONFIG_FIT=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index d5d63782ac..82ba9c1a64 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_KM8360=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index bd718f2843..6e4e73e92b 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile COGE5UN"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index e845a72161..c4e20f41fb 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_KM8360=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index 39a85e1d4c..6f18dbc91f 100644
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_KMP204X=y
CONFIG_FIT=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index b2666313c9..634b808ad2 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile NUSA"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 2a301dca0e..cc8083455e 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index 29a439a5cb..af3fbe49fe 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile SUGP1"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index 924c1b9f4a..400601bce7 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 81b98db968..7708b111ee 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile SUV31"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index ef93ec0739..8082a22add 100644
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_SUVD3=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index 898de4aa6d..a51db853b2 100644
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index cef97cedde..2013350b78 100644
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_SUVD3=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index ba75147e0e..f76496278f 100644
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_RMOBILE=y
CONFIG_TARGET_KZM9G=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_VERSION_VARIABLE=y
CONFIG_SYS_PROMPT="KZM-A9-GT# "
diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig
index 252d45ab75..9b2ca4fded 100644
--- a/configs/ls1012afrdm_qspi_defconfig
+++ b/configs/ls1012afrdm_qspi_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1012AFRDM=y
CONFIG_QSPI_AHB_INIT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-frdm"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_FIT=y
diff --git a/configs/ls2080a_emu_defconfig b/configs/ls2080a_emu_defconfig
index 760557a384..b0508a59ba 100644
--- a/configs/ls2080a_emu_defconfig
+++ b/configs/ls2080a_emu_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_LS2080A_EMU=y
CONFIG_IDENT_STRING=" LS2080A-EMU"
+# CONFIG_MMC is not set
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 6a8e690079..b6d95e949d 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_LSXL=y
CONFIG_IDENT_STRING=" LS-CHLv2"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index cae0deb545..1da81b9232 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_LSXL=y
CONFIG_IDENT_STRING=" LS-XHL"
+# CONFIG_MMC is not set
CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
CONFIG_BOOTDELAY=3
diff --git a/configs/luan_defconfig b/configs/luan_defconfig
index 95cb1d7f2b..8e01f68b5f 100644
--- a/configs/luan_defconfig
+++ b/configs/luan_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_LUAN=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
index 968b39132c..dab49e784a 100644
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" - v2.0"
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_4xx=y
CONFIG_TARGET_LWMON5=y
diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig
index eff9fc7f1d..a04a93471a 100644
--- a/configs/makalu_defconfig
+++ b/configs/makalu_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_MAKALU=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 93b03673db..39992e8f36 100644
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-maxbcm"
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/mecp5123_defconfig b/configs/mecp5123_defconfig
index 903f6f2e66..3612416e7a 100644
--- a/configs/mecp5123_defconfig
+++ b/configs/mecp5123_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC512X=y
CONFIG_TARGET_MECP5123=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
index b214a923e4..5c25eeb698 100644
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_MEESC=y
+# CONFIG_MMC is not set
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
CONFIG_BOOTDELAY=3
diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig
index 727d193679..8b42500bed 100644
--- a/configs/meesc_defconfig
+++ b/configs/meesc_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_MEESC=y
+# CONFIG_MMC is not set
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig
index c9642361b1..779a9c5a17 100644
--- a/configs/mgcoge3ne_defconfig
+++ b/configs/mgcoge3ne_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC8260=y
CONFIG_TARGET_KM82XX=y
CONFIG_FIT=y
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index becc257b83..8179922241 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile COGE3UN"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig
index 832ff49753..8004d7832f 100644
--- a/configs/mgcoge_defconfig
+++ b/configs/mgcoge_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC8260=y
CONFIG_TARGET_KM82XX=y
CONFIG_FIT=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 45d8a879f8..2cacf5bfd7 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_MMC=y
CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="minnowmax"
CONFIG_TARGET_MINNOWMAX=y
diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig
index db6ac3512f..d5c9317aa2 100644
--- a/configs/motionpro_defconfig
+++ b/configs/motionpro_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_MOTIONPRO=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig
index 34e271b15f..fff0e9b379 100644
--- a/configs/mpc5121ads_defconfig
+++ b/configs/mpc5121ads_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC512X=y
CONFIG_TARGET_MPC5121ADS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig
index 1bd7b5c9e7..4007351b45 100644
--- a/configs/mpc5121ads_rev2_defconfig
+++ b/configs/mpc5121ads_rev2_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC512X=y
CONFIG_TARGET_MPC5121ADS=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/mpc8308_p1m_defconfig b/configs/mpc8308_p1m_defconfig
index a1fdcf26ec..a45c9b770b 100644
--- a/configs/mpc8308_p1m_defconfig
+++ b/configs/mpc8308_p1m_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8308_P1M=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/munices_defconfig b/configs/munices_defconfig
index f32bbadb77..b47c2b3a98 100644
--- a/configs/munices_defconfig
+++ b/configs/munices_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_MUNICES=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
index b7a16459d5..0605174026 100644
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_MVEBU_DB_88F3720=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-3720-db"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
diff --git a/configs/mvebu_db-88f7040_defconfig b/configs/mvebu_db-88f7040_defconfig
index 4304bda8ff..8dc455a3b8 100644
--- a/configs/mvebu_db-88f7040_defconfig
+++ b/configs/mvebu_db-88f7040_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_MVEBU_ARMADA_8K=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-7040-db"
CONFIG_SMBIOS_PRODUCT_NAME=""
CONFIG_AHCI=y
diff --git a/configs/mvebu_db-88f8040_defconfig b/configs/mvebu_db-88f8040_defconfig
index e6bd1ef6f8..4a43e73e80 100644
--- a/configs/mvebu_db-88f8040_defconfig
+++ b/configs/mvebu_db-88f8040_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_MVEBU_ARMADA_8K=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="armada-8040-db"
CONFIG_SMBIOS_PRODUCT_NAME=""
CONFIG_AHCI=y
diff --git a/configs/mx31ads_defconfig b/configs/mx31ads_defconfig
index b4c2ad3135..2a098ee9ff 100644
--- a/configs/mx31ads_defconfig
+++ b/configs/mx31ads_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_MX31ADS=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_CMD_SPI=y
# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig
index a31ad5b02a..bb1f121f3f 100644
--- a/configs/mx31pdk_defconfig
+++ b/configs/mx31pdk_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_MX31PDK=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=1
CONFIG_SPL=y
CONFIG_CMD_BOOTZ=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 3000d729a1..9d42a0384f 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NAS220=y
CONFIG_IDENT_STRING="\nNAS 220"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/neo_defconfig b/configs/neo_defconfig
index 29c7fc2d66..2dd2f6e364 100644
--- a/configs/neo_defconfig
+++ b/configs/neo_defconfig
@@ -1,5 +1,6 @@
CONFIG_PPC=y
CONFIG_IDENT_STRING=" neo 0.02"
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_NEO=y
CONFIG_FIT=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 802879bad3..0fb0cde444 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NET2BIG_V2=y
CONFIG_IDENT_STRING=" 2Big v2"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index f42c49af1b..72f761aa60 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_IDENT_STRING=" NS v2 Lite"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 3ec5e63a3c..3eb1188913 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_IDENT_STRING=" NS Max v2"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 11e453c9b0..16f544c5db 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_IDENT_STRING=" NS v2 Mini"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index b8ccecd372..5b5954b785 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_IDENT_STRING=" NS v2"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
CONFIG_BOOTDELAY=3
CONFIG_CONSOLE_MUX=y
diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index add5e073b9..72333543e1 100644
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NSA310S=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
index 9db718c0fc..7d0b2b1835 100644
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_MESON=y
CONFIG_MESON_GXBB=y
CONFIG_TARGET_ODROID_C2=y
CONFIG_IDENT_STRING=" odroid-c2"
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2"
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/pcm030_LOWBOOT_defconfig b/configs/pcm030_LOWBOOT_defconfig
index ddf7dde10e..3e39dc0ef4 100644
--- a/configs/pcm030_LOWBOOT_defconfig
+++ b/configs/pcm030_LOWBOOT_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_PCM030=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/pcm030_defconfig b/configs/pcm030_defconfig
index d3181c8779..fdb0d1b715 100644
--- a/configs/pcm030_defconfig
+++ b/configs/pcm030_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_PCM030=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig
index b1c8f5ddcd..52b5d6fc64 100644
--- a/configs/pdm360ng_defconfig
+++ b/configs/pdm360ng_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC512X=y
CONFIG_TARGET_PDM360NG=y
diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig
index bcbb4d2a2b..d98f299230 100644
--- a/configs/pic32mzdask_defconfig
+++ b/configs/pic32mzdask_defconfig
@@ -1,5 +1,6 @@
CONFIG_MIPS=y
CONFIG_SYS_MALLOC_F_LEN=0x600
+CONFIG_MMC=y
CONFIG_MACH_PIC32=y
# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
CONFIG_MIPS_BOOT_FDT=y
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index da7c44ea3d..6bc5f6fdfc 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_PM9261=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index 786a13a7b7..1a3de43a00 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_PM9263=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig
index 5b0fade83e..8561097674 100644
--- a/configs/pm9g45_defconfig
+++ b/configs/pm9g45_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_PM9G45=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 1882995541..b98093ec8c 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_POGO_E02=y
CONFIG_IDENT_STRING="\nPogo E02"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="PogoE02> "
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index acc359e1e8..4da0ceac38 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_IDENT_STRING="\nKeymile Port-L2"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
index c3df65ad90..64135670ff 100644
--- a/configs/qemu-ppce500_defconfig
+++ b/configs/qemu-ppce500_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_QEMU_PPCE500=y
CONFIG_FIT=y
diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig
index 04fce58ae6..c76b7b9937 100644
--- a/configs/rainier_defconfig
+++ b/configs/rainier_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/rainier_ramboot_defconfig b/configs/rainier_ramboot_defconfig
index e4af2e9bdd..7bb948dc06 100644
--- a/configs/rainier_ramboot_defconfig
+++ b/configs/rainier_ramboot_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/redwood_defconfig b/configs/redwood_defconfig
index 62a7453a93..9fdfd7d71a 100644
--- a/configs/redwood_defconfig
+++ b/configs/redwood_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_REDWOOD=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index 9df4867b14..bf8f7c7a53 100644
--- a/configs/salvator-x_defconfig
+++ b/configs/salvator-x_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_RCAR_GEN3=y
CONFIG_TARGET_SALVATOR_X=y
+# CONFIG_MMC is not set
CONFIG_BOOTSTAGE_USER_COUNT=0x20
CONFIG_BOOTSTAGE_STASH_ADDR=0x0
CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig
index 04bd12b3ad..5d977bd583 100644
--- a/configs/sama5d2_ptc_nandflash_defconfig
+++ b/configs/sama5d2_ptc_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig
index 1e8825e535..29238a3615 100644
--- a/configs/sama5d2_ptc_spiflash_defconfig
+++ b/configs/sama5d2_ptc_spiflash_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
index 931defcd98..525e08bf69 100644
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
index a04f9ea900..939fc8ee35 100644
--- a/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 7568bdfe7d..8ac231db99 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -1,5 +1,4 @@
CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_MMC=y
CONFIG_DEFAULT_DEVICE_TREE="sandbox"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 833caf1858..a9456cc1bb 100644
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -1,4 +1,5 @@
CONFIG_SYS_MALLOC_F_LEN=0x2000
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="sandbox"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index e5947973d5..f4b656c49b 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
-CONFIG_MMC=y
CONFIG_SANDBOX_SPL=y
CONFIG_DEFAULT_DEVICE_TREE="sandbox"
CONFIG_DISTRO_DEFAULTS=y
diff --git a/configs/sbc8349_PCI_33_defconfig b/configs/sbc8349_PCI_33_defconfig
index 8fb5a35f16..201c9edbee 100644
--- a/configs/sbc8349_PCI_33_defconfig
+++ b/configs/sbc8349_PCI_33_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_SBC8349=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sbc8349_PCI_66_defconfig b/configs/sbc8349_PCI_66_defconfig
index 3deec7c05e..afc4d1080c 100644
--- a/configs/sbc8349_PCI_66_defconfig
+++ b/configs/sbc8349_PCI_66_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_SBC8349=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sbc8349_defconfig b/configs/sbc8349_defconfig
index 31ef79aac1..cafc16dfe0 100644
--- a/configs/sbc8349_defconfig
+++ b/configs/sbc8349_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_SBC8349=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sbc8548_PCI_33_PCIE_defconfig b/configs/sbc8548_PCI_33_PCIE_defconfig
index b7eae973b6..3af5c70d47 100644
--- a/configs/sbc8548_PCI_33_PCIE_defconfig
+++ b/configs/sbc8548_PCI_33_PCIE_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sbc8548_PCI_33_defconfig b/configs/sbc8548_PCI_33_defconfig
index dd974e827c..671b35d699 100644
--- a/configs/sbc8548_PCI_33_defconfig
+++ b/configs/sbc8548_PCI_33_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sbc8548_PCI_66_PCIE_defconfig b/configs/sbc8548_PCI_66_PCIE_defconfig
index c20021badc..61b74705a1 100644
--- a/configs/sbc8548_PCI_66_PCIE_defconfig
+++ b/configs/sbc8548_PCI_66_PCIE_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sbc8548_PCI_66_defconfig b/configs/sbc8548_PCI_66_defconfig
index 53f6022f38..8c8b38dfc5 100644
--- a/configs/sbc8548_PCI_66_defconfig
+++ b/configs/sbc8548_PCI_66_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sbc8548_defconfig b/configs/sbc8548_defconfig
index 3efb72079b..fe2a6b97b4 100644
--- a/configs/sbc8548_defconfig
+++ b/configs/sbc8548_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sbc8641d_defconfig b/configs/sbc8641d_defconfig
index d55e178b0f..24305daf37 100644
--- a/configs/sbc8641d_defconfig
+++ b/configs/sbc8641d_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC86xx=y
CONFIG_TARGET_SBC8641D=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig
index 75eb727782..33261b871e 100644
--- a/configs/sequoia_defconfig
+++ b/configs/sequoia_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sequoia_ramboot_defconfig b/configs/sequoia_ramboot_defconfig
index e3f3078dba..000be91650 100644
--- a/configs/sequoia_ramboot_defconfig
+++ b/configs/sequoia_ramboot_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig
index 73b1ac6804..ae5e038dde 100644
--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@@ -1,4 +1,5 @@
CONFIG_SH=y
+CONFIG_MMC=y
CONFIG_SH_32BIT=y
CONFIG_TARGET_SH7752EVB=y
CONFIG_BOOTDELAY=3
diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig
index e0037a6362..f8b9d86ae3 100644
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@@ -1,4 +1,5 @@
CONFIG_SH=y
+CONFIG_MMC=y
CONFIG_TARGET_SH7753EVB=y
CONFIG_BOOTDELAY=3
CONFIG_VERSION_VARIABLE=y
diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index a80c10c444..b12c11e6ee 100644
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@@ -1,4 +1,5 @@
CONFIG_SH=y
+CONFIG_MMC=y
CONFIG_SH_32BIT=y
CONFIG_TARGET_SH7757LCR=y
CONFIG_BOOTDELAY=3
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index c0fe23ac71..eab598e41f 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="at91sam9260-smartweb"
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index 6bfe26c487..b69f5d40cc 100644
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_S5PC1XX=y
CONFIG_TARGET_SMDKC100=y
CONFIG_IDENT_STRING=" for SMDKC100"
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index 7cd5f57684..d66635d4d7 100644
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_SNAPPER9260=y
+# CONFIG_MMC is not set
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
CONFIG_BOOTDELAY=3
diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index 1bd44269d0..416f543194 100644
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_SNAPPER9260=y
+# CONFIG_MMC is not set
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
CONFIG_BOOTDELAY=3
diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig
index a0f04d0470..5ac6c496d1 100644
--- a/configs/socfpga_is1_defconfig
+++ b/configs/socfpga_is1_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_SOCFPGA_IS1=y
+# CONFIG_MMC is not set
CONFIG_SPL_STACK_R_ADDR=0x00800000
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
CONFIG_FIT=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 3da85b4ff4..078a797d3c 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_MPC85xx=y
CONFIG_TARGET_SOCRATES=y
diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig
index 8337deef91..30a00c6379 100644
--- a/configs/spear300_defconfig
+++ b/configs/spear300_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR300=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR300"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig
index eb3ec56fe3..0af3a45e2b 100644
--- a/configs/spear300_nand_defconfig
+++ b/configs/spear300_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR300=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,NAND"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig
index d00b0bfbd5..b517b1bdb2 100644
--- a/configs/spear300_usbtty_defconfig
+++ b/configs/spear300_usbtty_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR300=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig
index 657724c79b..a33459aa0a 100644
--- a/configs/spear300_usbtty_nand_defconfig
+++ b/configs/spear300_usbtty_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR300=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY,NAND"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig
index 2f47557891..9c9a8abf65 100644
--- a/configs/spear310_defconfig
+++ b/configs/spear310_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR310"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig
index 4f35daedd4..8da365eedb 100644
--- a/configs/spear310_nand_defconfig
+++ b/configs/spear310_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,NAND"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig
index 27bc87c7b4..1ff5feabf6 100644
--- a/configs/spear310_pnor_defconfig
+++ b/configs/spear310_pnor_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,FLASH_PNOR"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig
index e9767daaae..1f20e45059 100644
--- a/configs/spear310_usbtty_defconfig
+++ b/configs/spear310_usbtty_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig
index 5bf1070b3d..2490ac3666 100644
--- a/configs/spear310_usbtty_nand_defconfig
+++ b/configs/spear310_usbtty_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,NAND"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig
index 8b79a6a7a1..3ebae7b3c1 100644
--- a/configs/spear310_usbtty_pnor_defconfig
+++ b/configs/spear310_usbtty_pnor_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR310=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,FLASH_PNOR"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig
index 588519c66b..60feb7e747 100644
--- a/configs/spear320_defconfig
+++ b/configs/spear320_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR320"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig
index c6230ae8cb..0a481e4336 100644
--- a/configs/spear320_nand_defconfig
+++ b/configs/spear320_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,NAND"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig
index 3008620c7e..b3e2725ee9 100644
--- a/configs/spear320_pnor_defconfig
+++ b/configs/spear320_pnor_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,FLASH_PNOR"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig
index 678525a28d..a72998065c 100644
--- a/configs/spear320_usbtty_defconfig
+++ b/configs/spear320_usbtty_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig
index a579e2beca..858ee65900 100644
--- a/configs/spear320_usbtty_nand_defconfig
+++ b/configs/spear320_usbtty_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,NAND"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig
index d3e0b6c94a..fea30279fe 100644
--- a/configs/spear320_usbtty_pnor_defconfig
+++ b/configs/spear320_usbtty_pnor_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR320=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,FLASH_PNOR"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig
index 9eb6494bc7..acd1542b52 100644
--- a/configs/spear600_defconfig
+++ b/configs/spear600_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR600"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig
index e4a149bd35..6e0a912ec1 100644
--- a/configs/spear600_nand_defconfig
+++ b/configs/spear600_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,NAND"
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig
index 252c789655..f42f1a8948 100644
--- a/configs/spear600_usbtty_defconfig
+++ b/configs/spear600_usbtty_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig
index 8a2c1337dd..b736dc83c4 100644
--- a/configs/spear600_usbtty_nand_defconfig
+++ b/configs/spear600_usbtty_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY,NAND"
CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index f7d3fc29c1..c554d2dfbe 100644
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_STM32=y
CONFIG_STM32F4=y
CONFIG_TARGET_STM32F429_DISCOVERY=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig
index 6d71d0a475..55b9eba5c0 100644
--- a/configs/stm32f746-disco_defconfig
+++ b/configs/stm32f746-disco_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_STM32=y
CONFIG_STM32F7=y
CONFIG_TARGET_STM32F746_DISCO=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index c728182da4..f808ce2214 100644
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_STV0991=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="stv0991"
CONFIG_SYS_EXTRA_OPTIONS="STV0991"
CONFIG_BOOTDELAY=3
diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index b9d392ace4..cd5e1cb97e 100644
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_SUVD3=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/sycamore_defconfig b/configs/sycamore_defconfig
index f2c47211b8..b19146bd68 100644
--- a/configs/sycamore_defconfig
+++ b/configs/sycamore_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_WALNUT=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig
index 9257e0bb5b..84372a9481 100644
--- a/configs/t3corp_defconfig
+++ b/configs/t3corp_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_T3CORP=y
CONFIG_FIT=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index ca80bd658d..793de2909f 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
CONFIG_BOOTDELAY=3
diff --git a/configs/tcm-bf537_defconfig b/configs/tcm-bf537_defconfig
index 8459390332..fd2e76e801 100644
--- a/configs/tcm-bf537_defconfig
+++ b/configs/tcm-bf537_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
+CONFIG_MMC=y
CONFIG_TARGET_TCM_BF537=y
CONFIG_BOOTDELAY=5
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 135c90423e..70dbe728cd 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
+CONFIG_MMC=y
CONFIG_VENDOR_DFI=y
CONFIG_DEFAULT_DEVICE_TREE="theadorable-x86-dfi-bt700"
CONFIG_TARGET_DFI_BT700=y
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index e6424750f4..b97c12817d 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig
index a063047cd0..3c2e140abe 100644
--- a/configs/theadorable_defconfig
+++ b/configs/theadorable_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
diff --git a/configs/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig
index a752b226c5..196bf6fdd5 100644
--- a/configs/thunderx_88xx_defconfig
+++ b/configs/thunderx_88xx_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_THUNDERX_88XX=y
CONFIG_IDENT_STRING=" for Cavium Thunder CN88XX ARM v8 Multi-Core"
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="thunderx-88xx"
CONFIG_BOOTDELAY=5
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index af70832c6a..c2b8ba8ed8 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index db346660b9..83fb28e5c5 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig
index d8199f84a7..e939124be6 100644
--- a/configs/uniphier_ld11_defconfig
+++ b/configs/uniphier_ld11_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_LD11=y
CONFIG_MICRO_SUPPORT_CARD=y
+# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld11-ref"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig
index 449093a3fb..02f93cc312 100644
--- a/configs/uniphier_ld20_defconfig
+++ b/configs/uniphier_ld20_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_LD20=y
CONFIG_MICRO_SUPPORT_CARD=y
+# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld20-ref"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig
index 8391a0aea8..b4242c4d43 100644
--- a/configs/uniphier_ld4_sld8_defconfig
+++ b/configs/uniphier_ld4_sld8_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_LD4_SLD8=y
CONFIG_MICRO_SUPPORT_CARD=y
+# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld4-ref"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig
index c8a7573ace..e10d312b78 100644
--- a/configs/uniphier_pro4_defconfig
+++ b/configs/uniphier_pro4_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_MICRO_SUPPORT_CARD=y
+# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-pro4-ref"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig
index 560b11b7be..03d43e11ac 100644
--- a/configs/uniphier_pxs2_ld6b_defconfig
+++ b/configs/uniphier_pxs2_ld6b_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y
CONFIG_MICRO_SUPPORT_CARD=y
+# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-pxs2-vodka"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig
index 7e30acc4f5..cfadf3e436 100644
--- a/configs/uniphier_sld3_defconfig
+++ b/configs/uniphier_sld3_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_SLD3=y
CONFIG_MICRO_SUPPORT_CARD=y
+# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-sld3-ref"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index c640aa73f1..8ec623bdf8 100644
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_USB_A9263=y
+# CONFIG_MMC is not set
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/v38b_defconfig b/configs/v38b_defconfig
index 17c1f7f91e..fb198b6a1a 100644
--- a/configs/v38b_defconfig
+++ b/configs/v38b_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC5xxx=y
CONFIG_TARGET_V38B=y
CONFIG_BOOTDELAY=3
diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig
index faeb15cc16..9d1090b21c 100644
--- a/configs/ve8313_defconfig
+++ b/configs/ve8313_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_VE8313=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig
index b5458328d3..9fa1095a83 100644
--- a/configs/vexpress_aemv8a_dram_defconfig
+++ b/configs/vexpress_aemv8a_dram_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_IDENT_STRING=" vexpress_aemv8a"
+# CONFIG_MMC is not set
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=1
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 71b40eecdb..ae0a69137f 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS64_JUNO=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_IDENT_STRING=" vexpress_aemv8a"
+# CONFIG_MMC is not set
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=1
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 941768266a..97505daf51 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS64_BASE_FVP=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_IDENT_STRING=" vexpress_aemv8a"
+# CONFIG_MMC is not set
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=1
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig
index b23f2356dc..4213e8aac4 100644
--- a/configs/vme8349_defconfig
+++ b/configs/vme8349_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC83xx=y
CONFIG_TARGET_VME8349=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/walnut_defconfig b/configs/walnut_defconfig
index f2c47211b8..b19146bd68 100644
--- a/configs/walnut_defconfig
+++ b/configs/walnut_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_WALNUT=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig
index ca3b731436..a705e8b83c 100644
--- a/configs/work_92105_defconfig
+++ b/configs/work_92105_defconfig
@@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig
index f98be1f80d..fa2eea02f6 100644
--- a/configs/wtk_defconfig
+++ b/configs/wtk_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index 65b7d9565a..4b47fc68f6 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_IDENT_STRING="-SPEAr"
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
index ec12dbe6cd..f686fe99bb 100644
--- a/configs/xilinx-ppc405-generic_defconfig
+++ b/configs/xilinx-ppc405-generic_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_XILINX_PPC405_GENERIC=y
CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc405-generic"
diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
index 464bee1222..ef2822236b 100644
--- a/configs/xilinx-ppc440-generic_defconfig
+++ b/configs/xilinx-ppc440-generic_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_XILINX_PPC440_GENERIC=y
CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic"
diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index f8f596f9df..d0b19f4d88 100644
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
# CONFIG_SPL_MMC_SUPPORT is not set
CONFIG_ZYNQMP_USB=y
CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm016 dc2"
+# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm016-dc2"
CONFIG_DISTRO_DEFAULTS=y
diff --git a/configs/xpedite1000_defconfig b/configs/xpedite1000_defconfig
index f023c73084..ee98fc5fdf 100644
--- a/configs/xpedite1000_defconfig
+++ b/configs/xpedite1000_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_XPEDITE1000=y
CONFIG_FIT=y
diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig
index 2839bc6b2a..731466ead8 100644
--- a/configs/xpedite517x_defconfig
+++ b/configs/xpedite517x_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC86xx=y
CONFIG_TARGET_XPEDITE517X=y
CONFIG_FIT=y
diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig
index c3b91f4e95..8763be8881 100644
--- a/configs/xpedite520x_defconfig
+++ b/configs/xpedite520x_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_XPEDITE520X=y
CONFIG_FIT=y
diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig
index 5ababef491..e38e1da299 100644
--- a/configs/xpedite537x_defconfig
+++ b/configs/xpedite537x_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_XPEDITE537X=y
CONFIG_FIT=y
diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig
index b6d3c8a9d7..e186c7e945 100644
--- a/configs/xpedite550x_defconfig
+++ b/configs/xpedite550x_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_MPC85xx=y
CONFIG_TARGET_XPEDITE550X=y
CONFIG_FIT=y
diff --git a/configs/yellowstone_defconfig b/configs/yellowstone_defconfig
index 5b1e4bc5ea..c26c844206 100644
--- a/configs/yellowstone_defconfig
+++ b/configs/yellowstone_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_YOSEMITE=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig
index 0d15583ae5..c77cd22ee1 100644
--- a/configs/yosemite_defconfig
+++ b/configs/yosemite_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_YOSEMITE=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/yucca_defconfig b/configs/yucca_defconfig
index 935bc5c634..ee04b008f6 100644
--- a/configs/yucca_defconfig
+++ b/configs/yucca_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
+# CONFIG_MMC is not set
CONFIG_4xx=y
CONFIG_TARGET_YUCCA=y
CONFIG_OF_BOARD_SETUP=y
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index 8c46e16018..5eef16a3bc 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_ZMX25=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=5
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
index 2f4fc1e37d..247fb6d7f3 100644
--- a/configs/zynq_zc770_xm011_defconfig
+++ b/configs/zynq_zc770_xm011_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index d3116e171a..8e80a90165 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index add038ce7f..286f0bdd29 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
+# CONFIG_MMC is not set
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 9983913289..e9a1d18cd1 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -1,10 +1,14 @@
menu "MMC Host controller Support"
config MMC
- bool "Enable MMC support"
- depends on ARCH_SUNXI || SANDBOX
+ bool "MMC/SD/SDIO card support"
+ default ARM || PPC || SANDBOX
help
- TODO: Move all architectures to use this option
+ This selects MultiMediaCard, Secure Digital and Secure
+ Digital I/O support.
+
+ If you want MMC/SD/SDIO support, you should say Y here and
+ also to your specific host controller driver.
config DM_MMC
bool "Enable MMC controllers using Driver Model"
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 5cfdbb26cb..6663a923ef 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -482,7 +482,6 @@ combinations. this should be removed later
#endif /* CONFIG_TSEC_ENET */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_DOS_PARTITION
#define CONFIG_FSL_ESDHC
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 6335c553c1..753ce1353c 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -21,8 +21,6 @@
#define CONFIG_MISC_INIT_R
-#define CONFIG_MMC 1
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index adc3193c4f..f86b008879 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -483,8 +483,6 @@ extern int board_pci_host_broken(void);
#undef CONFIG_WATCHDOG /* watchdog disabled */
-#define CONFIG_MMC 1
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_ESDHC_PIN_MUX
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 48e06af22a..d843bd1a75 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -495,8 +495,6 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */
-#define CONFIG_MMC 1
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_ESDHC_PIN_MUX
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index d8f7961ded..b17a6c570d 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -609,8 +609,6 @@
#undef CONFIG_WATCHDOG /* watchdog disabled */
-#define CONFIG_MMC 1
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index bd520543ef..bd15645934 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -466,8 +466,6 @@ extern unsigned long get_clock_freq(void);
#undef CONFIG_WATCHDOG /* watchdog disabled */
-#define CONFIG_MMC 1
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_ESDHC_PIN_MUX
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 78e006492d..4d0ae9d8b0 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -673,7 +673,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_LBA48
#endif /* #ifdef CONFIG_FSL_SATA */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_DOS_PARTITION
#define CONFIG_FSL_ESDHC
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 81e8c29c28..169f94a366 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -508,7 +508,6 @@
#define CONFIG_DOS_PARTITION
#endif
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_GENERIC_MMC
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 91e5f8b901..7a3fa03c3d 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -609,8 +609,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
-#define CONFIG_MMC
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h
index 52ef4321d6..e32cddec59 100644
--- a/include/configs/P3041DS.h
+++ b/include/configs/P3041DS.h
@@ -10,7 +10,6 @@
*/
#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */
-#define CONFIG_MMC
#define CONFIG_NAND_FSL_ELBC
#define CONFIG_FSL_SATA_V2
#define CONFIG_PCIE3
diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h
index 65ec8f704d..a6fa6a8e26 100644
--- a/include/configs/P4080DS.h
+++ b/include/configs/P4080DS.h
@@ -10,7 +10,6 @@
*/
#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */
-#define CONFIG_MMC
#define CONFIG_PCIE3
#define CONFIG_CMD_SATA
diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h
index 17e941e4e7..0a8c38767f 100644
--- a/include/configs/P5020DS.h
+++ b/include/configs/P5020DS.h
@@ -10,7 +10,6 @@
*/
#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */
-#define CONFIG_MMC
#define CONFIG_NAND_FSL_ELBC
#define CONFIG_FSL_SATA_V2
#define CONFIG_PCIE3
diff --git a/include/configs/P5040DS.h b/include/configs/P5040DS.h
index 078e60c4c2..5933fc0860 100644
--- a/include/configs/P5040DS.h
+++ b/include/configs/P5040DS.h
@@ -10,7 +10,6 @@
*/
#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */
-#define CONFIG_MMC
#define CONFIG_NAND_FSL_ELBC
#define CONFIG_PCIE3
#define CONFIG_FSL_SATA_V2
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index fda83d2c20..303c73bf1b 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -662,7 +662,6 @@ unsigned long get_board_ddr_clk(void);
/*
* SDHC
*/
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 054b323663..e451851549 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -664,7 +664,6 @@ unsigned long get_board_ddr_clk(void);
/*
* SDHC
*/
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 00676ddf50..7779c3189a 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -551,8 +551,6 @@ unsigned long get_board_ddr_clk(void);
#endif
#endif
-#define CONFIG_MMC
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 7521dd02f8..41cb43cfa1 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -661,8 +661,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#endif
#endif
-#define CONFIG_MMC
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index b984fcd96e..878dbed1a1 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -12,7 +12,6 @@
#define __T208xQDS_H
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
-#define CONFIG_MMC
#define CONFIG_USB_EHCI
#if defined(CONFIG_ARCH_T2080)
#define CONFIG_T2080QDS
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index e013e725a8..ee27a8fb34 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -13,7 +13,6 @@
#define CONFIG_T2080RDB
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
-#define CONFIG_MMC
#define CONFIG_USB_EHCI
#define CONFIG_FSL_SATA_V2
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index d90fb35ab7..78ad86c4a6 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -516,8 +516,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_HAS_FSL_DR_USB
-#define CONFIG_MMC
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index fd5dbc54a4..5b3c6fa9d6 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -703,8 +703,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_HAS_FSL_DR_USB
-#define CONFIG_MMC
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index c194ec7815..0775603b9e 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -45,7 +45,6 @@
#endif
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_MMC
#define CONFIG_SYS_L2_SIZE (256 << 10)
#define CONFIG_LAST_STAGE_INIT
@@ -81,7 +80,6 @@
#endif
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_MMC
#define CONFIG_SYS_L2_SIZE (256 << 10)
#define CONFIG_LAST_STAGE_INIT
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 5cb79f1524..93fa6149b0 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -100,7 +100,6 @@
/*
* SD (MMC) controller
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
#define CONFIG_FTSDC010
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 3626636ad4..99f9ef757f 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -55,7 +55,6 @@
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 7d6ec7814b..726e6d6cc1 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -87,7 +87,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
/* MMCIF */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SH_MMCIF
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 07ef9e98e9..ad0de2c817 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -76,7 +76,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
#define CONFIG_GENERIC_MMC 1
-#define CONFIG_MMC 1
#define CONFIG_OMAP_HSMMC 1
#define CONFIG_DOS_PARTITION 1
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index ad56d240c1..3247a4af9d 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -77,7 +77,6 @@
115200}
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index d3af2da44f..fdf9ed0382 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -69,7 +69,6 @@
#define CONFIG_SYS_FSL_USDHC_NUM 3
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_FAT_WRITE
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index f2a24c11de..12a287742c 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -28,7 +28,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC support */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index b903ba53d1..e9d8232814 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -308,7 +308,6 @@
* SD/MMC
*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MXC_MMC
#define CONFIG_MXC_MCI_REGS_BASE 0x10014000
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index e1f934ce09..f07366e653 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -146,7 +146,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#endif
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index cc1695ee38..6806cc7e25 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -105,7 +105,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#endif
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index fd0504d40b..12a92c2871 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -99,7 +99,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#endif
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index b825464f70..9c9e809acc 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -123,7 +123,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#endif
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 23184ceba0..b5aebe634a 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -106,7 +106,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 843f03a1ea..6dee45a9f2 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -111,7 +111,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#endif
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index a0f451b1a0..00a8c7970f 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -86,7 +86,6 @@
#define CONFIG_PORTMUX_PIO
#define CONFIG_SYS_NR_PIOS 5
#define CONFIG_SYS_HSDRAMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define CONFIG_GENERIC_MMC
#define CONFIG_ATMEL_SPI
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 4d9282a7bf..d1f61b3243 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -105,7 +105,6 @@
#define CONFIG_PORTMUX_PIO
#define CONFIG_SYS_NR_PIOS 5
#define CONFIG_SYS_HSDRAMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define CONFIG_GENERIC_MMC
#define CONFIG_ATMEL_SPI
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 9ddfff2b2c..3d17ae1264 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -107,7 +107,6 @@
#define CONFIG_PORTMUX_PIO
#define CONFIG_SYS_NR_PIOS 5
#define CONFIG_SYS_HSDRAMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define CONFIG_GENERIC_MMC
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index b99248ec98..296fbd1264 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -85,7 +85,6 @@
/*
* SD/MMC configuration
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DWMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index 408c0f52d9..8a4950f2d7 100644
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -24,7 +24,6 @@
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
-#define CONFIG_MMC
#define CONFIG_SDHCI
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SDMA
diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h
index eb4c497c94..f822f48a50 100644
--- a/include/configs/bcm23550_w1d.h
+++ b/include/configs/bcm23550_w1d.h
@@ -34,7 +34,6 @@
#define CONFIG_SDHCI
#define CONFIG_MMC_SDMA
#define CONFIG_KONA_SDHCI
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 7a75fdb3f4..9d06dad561 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -33,7 +33,6 @@
#define CONFIG_SDHCI
#define CONFIG_MMC_SDMA
#define CONFIG_KONA_SDHCI
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index ab1ab14103..2e43a097b5 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -28,7 +28,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 510cd47a98..43e4971b74 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -129,7 +129,6 @@
*/
#if !defined(__ADSPBF512__)
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_BFIN_SDH
#endif
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index 258115a69e..40ca18d2b1 100644
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -115,7 +115,6 @@
/*
* SPI_MMC Settings
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SPI
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 4f861aa432..651770524a 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -125,7 +125,6 @@
*/
#define CONFIG_MMC_SPI
#ifdef CONFIG_MMC_SPI
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#endif
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 9376283ffc..b79aa2bd30 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -143,7 +143,6 @@
*/
#if !defined(__ADSPBF544__)
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_BFIN_SDH
#endif
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 4deb2d247e..337bb0a580 100644
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -127,7 +127,6 @@
* SDH Settings
*/
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_BFIN_SDH
/*
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index a5fdbbba3a..eb2419c315 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -48,7 +48,6 @@
/* MMC/SD IP block */
#if defined(CONFIG_EMMC_BOOT)
- #define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_SUPPORT_EMMC_BOOT
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index a6369d63b8..ac338c465e 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -43,7 +43,6 @@
/* GPIO */
/* MMC/SD IP block */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_SUPPORT_EMMC_BOOT
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 462b7841b6..b7df2bce4c 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -31,7 +31,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index f3bb279b30..6eed4bc562 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -30,7 +30,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index c976ec867c..e3735f7d1d 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -43,7 +43,6 @@
/*
* SDIO/MMC Card Configuration
*/
-#define CONFIG_MMC
#define CONFIG_MMC_SDMA
#define CONFIG_GENERIC_MMC
#define CONFIG_SDHCI
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 78841cd749..32229d2182 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -118,7 +118,6 @@
/*
* SPI_MMC Settings
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SPI
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 5785ebd334..dc2eabd3e5 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -116,7 +116,6 @@
/*
* SPI_MMC Settings
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SPI
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index da5a4b3fb8..1ce27e32ba 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -81,7 +81,6 @@
115200}
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 1e2a477027..bae9697ca7 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -88,7 +88,6 @@
#define CONFIG_OMAP_GPIO
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 86ed4d243d..b05fca6828 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -67,7 +67,6 @@
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_FAT_WRITE
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 6a52869026..e9db97f1ad 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC support */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index e8b3f99f53..4d13856439 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -28,7 +28,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC support */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 62131c7359..933b179be3 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -56,7 +56,6 @@
"512k(u-boot-env)," \
"-(ubi)"
-#define CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 5ef999c674..cc191480a9 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -27,7 +27,6 @@
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
-#define CONFIG_MMC
#define CONFIG_SDHCI
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SDMA
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 971549e2e7..e0290e72af 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -210,7 +210,6 @@
/*
* MMC
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_FSL_ESDHC
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index 55aa03bead..f863810984 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -26,7 +26,6 @@
#define CONFIG_SCSI_DEV_LIST \
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA}
-#define CONFIG_MMC
#define CONFIG_SDHCI
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SDMA
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 45caf9f4d7..0307b144bd 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -13,7 +13,6 @@
#error Must call Cyrus CONFIG with a specific CPU enabled.
#endif
-#define CONFIG_MMC
#define CONFIG_SDCARD
#define CONFIG_FSL_SATA_V2
#define CONFIG_PCIE3
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 18a8e26a22..ceb9ceab5a 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -313,7 +313,6 @@
/* SD/MMC configuration */
#ifndef CONFIG_USE_NOR
-#define CONFIG_MMC
#define CONFIG_DAVINCI_MMC_SD1
#define CONFIG_GENERIC_MMC
#define CONFIG_DAVINCI_MMC
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index b0311bf9a1..04ab48da68 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -24,7 +24,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index b8c5232178..7333e481f3 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -43,7 +43,6 @@
/*
* SDIO/MMC Card Configuration
*/
-#define CONFIG_MMC
#define CONFIG_MMC_SDMA
#define CONFIG_GENERIC_MMC
#define CONFIG_SDHCI
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 75e1d1ce66..c11e581010 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -29,7 +29,6 @@
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
-#define CONFIG_MMC
#define CONFIG_SDHCI
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SDMA
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index 1b440eaf0f..cbc6126361 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -32,7 +32,6 @@
#define COUNTER_FREQUENCY 19000000
/* This are needed to have proper mmc support */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SDHCI
diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h
index c9e8c8ece3..d4aca55b3c 100644
--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -22,7 +22,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 7053795309..a83c617d89 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -234,7 +234,6 @@
#ifdef CONFIG_EP93XX_SPI_MMC
#define CONFIG_EP93XX_SPI
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SPI
#define CONFIG_MMC_SPI_NPOWER_EGPIO 9
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index b4a0388ad5..c78eebfdef 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -127,7 +127,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define CONFIG_SYS_MMC_CD_PIN AT91_PIO_PORTC, 8
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 566f2464ce..2a051a98ec 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -39,7 +39,6 @@
/* SD/MMC configuration */
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_S5P_SDHCI
#define CONFIG_SDHCI
#define CONFIG_DWMMC
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 6d25035d13..b87b04df70 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -30,7 +30,6 @@
#undef CONFIG_SCSI
/* SD/MMC support */
-#define CONFIG_MMC
#define CONFIG_SDHCI
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SDMA
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 2560c88456..0039c8c126 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -67,7 +67,6 @@
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 23707ed936..45395cdda6 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -94,7 +94,6 @@
#define CONFIG_SMSTP7_ENA 0x00200000
/* SDHI */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SH_SDHI_FREQ 97500000
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 3d6b5fcc1f..cf3c4938d6 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -27,7 +27,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_HARMONY
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 7a03d0f30a..c725833675 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -72,7 +72,6 @@
/* SD/MMC configuration */
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_DWMMC
#define CONFIG_HIKEY_DWMMC
#define CONFIG_BOUNCE_BUFFER
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 9677aab4b4..9f076576e5 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -24,7 +24,6 @@
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT
-#define CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 14c43b814c..30168bccfd 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -137,7 +137,6 @@
/*
* SD/MMC
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MXC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 90e282feaf..c1fa2c6507 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -26,7 +26,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 2da0d8dd7f..e9e69a7805 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -61,7 +61,6 @@
#define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */
/* MMC/SD */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 76f2b8b7b4..7a4ba09fc6 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -88,7 +88,6 @@
* MMC
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index a1d96ff59e..c7aa7cc084 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -94,7 +94,6 @@
#define CONFIG_SMSTP7_ENA 0x00200000
/* SD */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SH_SDHI_FREQ 97500000
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 664999c48d..a7894ca19b 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -86,7 +86,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
/* MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SH_MMCIF
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index f2f82acc99..3b118bb723 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -215,7 +215,6 @@
#define CONFIG_ENV_SIZE (16 << 10)
/* SD/MMC configuration */
-#define CONFIG_MMC
#define CONFIG_DAVINCI_MMC_SD1
#define CONFIG_GENERIC_MMC
#define CONFIG_DAVINCI_MMC
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 0cc17910d3..b5b4d7eeb5 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -131,7 +131,6 @@
#endif
/* MMC */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 15410ddfdf..f35fd31cae 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -44,7 +44,6 @@
#define __SW_REV_B 0xF0
/* MMC */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 7af4bc41dc..ae8ee2412f 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -156,7 +156,6 @@
/*
* MMC
*/
-#define CONFIG_MMC
#define CONFIG_CMD_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_GENERIC_MMC
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 128da8a352..6f857a75ad 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -393,7 +393,6 @@ unsigned long get_board_ddr_clk(void);
/*
* MMC
*/
-#define CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_GENERIC_MMC
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 145833287e..b48cd0062b 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -294,7 +294,6 @@
/*
* MMC
*/
-#define CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_GENERIC_MMC
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index c1e3ec6784..3e704640ed 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -147,7 +147,6 @@
#define CONFIG_CMD_ENV
/* MMC */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 3887faa97b..40e6af8127 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -115,7 +115,6 @@
#define CONFIG_CMD_ENV
/* MMC */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h
index f0ec6c4d6a..07be30c48f 100644
--- a/include/configs/ls2080a_simu.h
+++ b/include/configs/ls2080a_simu.h
@@ -133,7 +133,6 @@
#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3
/* MMC */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 838568fd21..37d5704a72 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -355,7 +355,6 @@ unsigned long get_board_ddr_clk(void);
#endif
/* MMC */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 31df781934..713e86b41e 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -299,7 +299,6 @@ unsigned long get_board_sys_clk(void);
#endif
/* MMC */
-#define CONFIG_MMC
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 7e05bfd6b4..8ec98fd633 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -82,7 +82,6 @@
* MMC Driver
*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 91037d6cb5..de83d6c97b 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -87,7 +87,6 @@
* SD/MMC
*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#endif
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0c6b1e89fc..f15abd3ac9 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -81,7 +81,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
-#define CONFIG_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index ae7ca3b3f5..d42976b709 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 3aa22d2b52..292227114a 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -27,7 +27,6 @@
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
-#define CONFIG_MMC
#define CONFIG_SDHCI
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SDMA
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 81826eae00..3853c052d5 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -87,7 +87,6 @@
#define CONFIG_ENV_OVERWRITE
/* ESDHC driver */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR IMX_MMC_SDHC1_BASE
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 3f064fd8b2..c0fb8d15b4 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -219,7 +219,6 @@
#define CONFIG_MXC_USB_PORTSC (MXC_EHCI_UTMI_16BIT | MXC_EHCI_MODE_UTMI)
/* mmc driver */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 3c1d53fdf8..b62360bac9 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -67,8 +67,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR
#define CONFIG_SYS_FSL_ESDHC_NUM 2
-#define CONFIG_MMC
-
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 27e7738a7b..d84d524deb 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -53,7 +53,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 2
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 87c75d4e53..8fec94eda2 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -38,7 +38,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 2
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
/* bootz: zImage/initrd.img support */
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 7a896c7e6f..aa829287e0 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -52,7 +52,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 2
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 6cc5d9c60a..6cc5f0f731 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -38,7 +38,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 2
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 262a913464..ad4964c182 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -43,7 +43,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index e79ec21256..3bb939ecf0 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -82,7 +82,6 @@
#define CONFIG_MXC_GPIO
/* MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_FSL_ESDHC
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 06452288ba..4348b43247 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -60,7 +60,6 @@
#define CONFIG_MXC_UART
/* MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_FSL_ESDHC
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index df0cc23e59..04c3ce9d6e 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -148,7 +148,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_MXS_MMC
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index ce74322954..99ce60f731 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -93,7 +93,6 @@
#define CONFIG_ENV_OVERWRITE
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index c548ee146f..ae49054389 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 6388a9ccaf..1a67584b9f 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -47,7 +47,6 @@
*/
/* MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 8119fb2184..cdc93c38c8 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -328,7 +328,6 @@
#endif
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DAVINCI_MMC
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 908a1af8f6..c21b849122 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -107,7 +107,6 @@
#endif /*CONFIG_MVSATA_IDE*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MVEBU_MMC
#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index c20ef5e339..8668495d17 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -846,8 +846,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
-#define CONFIG_MMC
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 5ff2e35036..a9b2020842 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -412,8 +412,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#endif
#endif
-#define CONFIG_MMC
-
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 968b89e9ac..cd981b9926 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -22,7 +22,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 9cf697f384..7ff545c5a2 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -22,7 +22,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 4fa345d59e..7daaf8e315 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -23,7 +23,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index 67a16039d1..0864e4dabc 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -18,7 +18,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index a8bb3ffef2..0cefee398e 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -23,7 +23,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_PAZ00
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index e70c3f01d2..3963efd1dd 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -65,7 +65,6 @@
#endif
-#define CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index d9c84f27ea..2aa63fcc73 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -7,7 +7,6 @@
#ifndef __CONFIG_PEPPER_H
#define __CONFIG_PEPPER_H
-#define CONFIG_MMC
#include <configs/ti_am335x_common.h>
#undef CONFIG_BOARD_LATE_INIT
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 52b7a2aad6..57b91e797b 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -92,7 +92,6 @@
* SDHC Configuration
*/
#define CONFIG_SDHCI
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
/*--------------------------------------------------
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index a214c4d53c..2bd7076499 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -37,7 +37,6 @@
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
#define CONFIG_SUPPORT_EMMC_BOOT
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 9051c1cefc..20fb0366f3 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -92,7 +92,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#endif
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 635e4397c4..8ad5af1899 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 7d8a0950cf..ccaa796271 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -88,7 +88,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
/* SD */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SH_SDHI_FREQ 97500000
diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
index 3fa77399cf..4598bd9881 100644
--- a/include/configs/pxa-common.h
+++ b/include/configs/pxa-common.h
@@ -22,7 +22,6 @@
* MMC Card Configuration
*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_PXA_MMC_GENERIC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 92be29e7bb..27dfbcef66 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -37,7 +37,6 @@
#define CONFIG_ROCKCHIP_CHIP_TAG "RK30"
/* MMC/SD IP block */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DWMMC
#define CONFIG_BOUNCE_BUFFER
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 5358372587..535797a72d 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -40,7 +40,6 @@
#define CONFIG_SPL_TEXT_BASE 0xff704004
/* MMC/SD IP block */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DWMMC
#define CONFIG_BOUNCE_BUFFER
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index aa646c6f52..394ec40ca4 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
/* MMC/SD IP block */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DWMMC
#define CONFIG_SDHCI
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 4406366b18..b105fc18d5 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -83,7 +83,6 @@
/* SD/MMC configuration */
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_SDHCI
#define CONFIG_MMC_SDHCI_IO_ACCESSORS
#define CONFIG_BCM2835_SDHCI
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 9f85fdc11b..c55f6b9700 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -77,7 +77,6 @@
#undef CONFIG_CMD_IMLS
-#define CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 6a5425a679..c1057aa1cb 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -48,7 +48,6 @@
/* MMC */
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_SDHCI
#define CONFIG_S5P_SDHCI
#define SDHCI_MAX_HOSTS 4
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index f48559e321..b840315626 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -81,7 +81,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define CONFIG_ATMEL_MCI_8BIT
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index ed91bdc124..831a45c255 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -113,7 +113,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define ATMEL_BASE_MMCI ATMEL_BASE_MCI0
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index 5d78847450..bcd5c37710 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -64,7 +64,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define ATMEL_BASE_MMCI ATMEL_BASE_MCI1
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 498b32b639..90097307bd 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -64,7 +64,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define ATMEL_BASE_MMCI ATMEL_BASE_MCI1
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 2b6509a7a2..3ee655562c 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -32,7 +32,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 67ca4a660d..e2af82dd58 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -88,7 +88,6 @@
#define CONFIG_SH_SPI_BASE 0xfe002000
/* MMCIF */
-#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC 1
#define CONFIG_SH_MMCIF 1
#define CONFIG_SH_MMCIF_ADDR 0xffcb0000
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index d77b4702eb..0859109603 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -88,7 +88,6 @@
#define CONFIG_SH_SPI_BASE 0xfe002000
/* MMCIF */
-#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC 1
#define CONFIG_SH_MMCIF 1
#define CONFIG_SH_MMCIF_ADDR 0xffcb0000
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index efb7ad951d..05b5faa81d 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -89,7 +89,6 @@
#define CONFIG_SH_SPI_BASE 0xfe002000
/* MMCIF */
-#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC 1
#define CONFIG_SH_MMCIF 1
#define CONFIG_SH_MMCIF_ADDR 0xffcb0000
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 748a2ea5bb..9f22d4c1c6 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -83,7 +83,6 @@
* SDIO/MMC Card Configuration
*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MVEBU_MMC
#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 456429694e..e4d0ad9309 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -77,7 +77,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 19c6297c6e..a343cd1daa 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -88,7 +88,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
/* MMCIF */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_SH_MMCIF
#define CONFIG_SH_MMCIF_ADDR 0xee200000
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index c76c55fd5a..a19a38b25d 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -71,7 +71,6 @@
#define CONFIG_PARTITION_UUIDS
/* MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index e12b101333..0a3d24236f 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -95,7 +95,6 @@
* MMC
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 58a6550844..2c40827877 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -142,7 +142,6 @@
* MMC Driver
*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_GENERIC_MMC
#define CONFIG_DWMMC
diff --git a/include/configs/stout.h b/include/configs/stout.h
index e3b9325961..0d9e4aa4cb 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -92,7 +92,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
/* MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
/* Module stop status bits */
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 6604cecdcb..9733299148 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -24,7 +24,6 @@
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT
-#define CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR
#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index ff0c60d01c..44201a2546 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -73,7 +73,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
-#define CONFIG_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index a873e7b553..03fc42c877 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -71,7 +71,6 @@
#define CONFIG_ENV_OVERWRITE
#define CONFIG_BAUDRATE 115200
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index c294f704f2..97aa046854 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -118,7 +118,6 @@
/*
* SPI_MMC Settings
*/
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC_SPI
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 0e9d98c2d0..067e1718db 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 7b1429925e..c03dabf9db 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index a9990b7383..5144d5aace 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -115,9 +115,6 @@
#endif
/* remove MMC support */
-#ifdef CONFIG_MMC
-#undef CONFIG_MMC
-#endif
#ifdef CONFIG_GENERIC_MMC
#undef CONFIG_GENERIC_MMC
#endif
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 6a5ed196bf..86ab1e0f4a 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -113,7 +113,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default */
#define CONFIG_OMAP_GPIO
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 5db4c60546..d909f25fa8 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -52,7 +52,6 @@
#define CONFIG_CMD_ASKEN
#define CONFIG_OMAP_GPIO
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index d13fc94785..dbe494a6e3 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -168,7 +168,6 @@
#endif
/* MMC/SD IP block */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
/* McSPI IP block */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index cfb4b30da7..28a80f5267 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -306,7 +306,6 @@
/* We wont be loading up OS from SPL for now.. */
/* We do not have MMC support.. yet.. */
-#undef CONFIG_MMC
#undef CONFIG_GENERIC_MMC
/* And no support for GPIO, yet.. */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 07a92ebcf8..1c36d0751c 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -89,7 +89,6 @@
/* MMC */
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index cfc8451481..ff006143d6 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -28,7 +28,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 2e5f38d478..9050ae42b9 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -61,8 +61,6 @@
#define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001
-#define CONFIG_MMC
-
#define CONFIG_GENERIC_MMC
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index b2d54d53b0..904b7727a8 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -43,7 +43,6 @@
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
/* USB */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 72fa9736d7..7c7b20031c 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -23,7 +23,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 7a388698eb..f5459a8949 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -21,7 +21,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index a8eba314e3..0bc4ea58c5 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -150,7 +150,6 @@
#define CONFIG_SYS_SERIAL0 V2M_UART0
#define CONFIG_SYS_SERIAL1 V2M_UART1
-#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC
#define CONFIG_ARM_PL180_MMCI
#define CONFIG_ARM_PL180_MMCI_BASE V2M_MMCI
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 6aeb078261..20f0d6eafc 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -64,7 +64,6 @@
"-(rootfs)"
#endif
-#define CONFIG_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 0f3fc8f7d5..07fe616687 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -57,7 +57,6 @@
#ifdef CONFIG_CMD_MMC
#define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
#define ATMEL_BASE_MMCI ATMEL_BASE_MCI1
diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 0cd892ed73..ffd9a2c242 100644
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_I2C_TEGRA
/* SD/MMC */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 50495bfa0e..4aaeea91fe 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -60,7 +60,6 @@
#define CONFIG_RTC_MC13XXX
/* mmc driver */
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index fb4f6d6806..97de13704f 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -81,7 +81,6 @@
#define CONFIG_AUTO_COMPLETE
#if defined(CONFIG_ZYNQ_SDHCI)
-# define CONFIG_MMC
# define CONFIG_GENERIC_MMC
# define CONFIG_SUPPORT_EMMC_BOOT
# define CONFIG_SDHCI
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 97dfc0e6ec..a30aefbae8 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -62,7 +62,6 @@
* MMC Card Configuration
*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_PXA_MMC_GENERIC
#define CONFIG_SYS_MMC_BASE 0xF0000000
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 953e7311a6..01e2fca020 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -85,7 +85,6 @@
/* MMC */
#if defined(CONFIG_ZYNQ_SDHCI)
-# define CONFIG_MMC
# define CONFIG_GENERIC_MMC
# define CONFIG_SDHCI
# define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000