[U-Boot] [PATCH v2 0/6] mmc: move some config options to Kconfig
I wrote a new SDHCI driver for my new SoCs, but before posting it, I just want to make a clean base for my driver entry.
Of course, I could enable some needed options in my header file (for options in the "white-list"), but I just thought it is a good habit to contribute to Kconfig moves in the area I am working on now.
Some people are actively working on such moves, so this kind of work is really conflict-prone.
I described how to generate each commit in its git-log in case this series becomes out of date.
I created this series based on v2017.01-rc1, but if some other pull requests go in first, I hope Tom will easily reproduce it by following each instruction in the log.
Changes in v2: - Regenerate based on v2017.01-rc1 - Fix doubled "help" - Add "default ARM || PPC ||SANDBOX"
Masahiro Yamada (6): Sync defconfig files by savedefconfig mmc: complete unfinished move of CONFIG_MMC mmc: make MMC driver entries dependent on MMC mmc: move CONFIG_SDHCI to Kconfig, renaming to CONFIG_MMC_SDHCI mmc: move some SDHCI related options to Kconfig mmc: move MMC_SDHCI_IO_ACCESSORS to Kconfig
arch/arm/mach-mvebu/cpu.c | 2 +- board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 2 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 2 +- board/samsung/common/board.c | 2 +- configs/A10-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino-Lime2_defconfig | 2 +- configs/A20-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino_MICRO_defconfig | 2 +- configs/A20-Olimex-SOM-EVB_defconfig | 2 +- configs/B4420QDS_NAND_defconfig | 1 + configs/B4420QDS_SPIFLASH_defconfig | 1 + configs/B4420QDS_defconfig | 1 + configs/B4860QDS_NAND_defconfig | 1 + configs/B4860QDS_SECURE_BOOT_defconfig | 3 +- configs/B4860QDS_SPIFLASH_defconfig | 1 + configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/B4860QDS_defconfig | 1 + configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_NAND_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_defconfig | 1 + configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 2 +- .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 2 +- .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 2 +- .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 2 +- .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 2 +- configs/Bananapi_defconfig | 2 +- configs/Bananapro_defconfig | 2 +- configs/C29XPCIE_NAND_defconfig | 1 + configs/C29XPCIE_NOR_SECBOOT_defconfig | 3 +- configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 3 +- configs/C29XPCIE_SPIFLASH_defconfig | 1 + configs/C29XPCIE_defconfig | 1 + configs/CPCI2DP_defconfig | 1 + configs/CPCI4052_defconfig | 1 + configs/Chuwi_V7_CW0825_defconfig | 1 - configs/Cubieboard2_defconfig | 2 +- configs/Cubieboard_defconfig | 2 +- configs/Cubietruck_defconfig | 2 +- configs/Itead_Ibox_A20_defconfig | 2 +- configs/Lamobo_R1_defconfig | 2 +- configs/Linksprite_pcDuino3_Nano_defconfig | 2 +- configs/Linksprite_pcDuino3_defconfig | 2 +- configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MPC8313ERDB_33_defconfig | 1 + configs/MPC8313ERDB_66_defconfig | 1 + configs/MPC8313ERDB_NAND_33_defconfig | 1 + configs/MPC8313ERDB_NAND_66_defconfig | 1 + configs/MPC8315ERDB_defconfig | 1 + configs/MPC8323ERDB_defconfig | 1 + configs/MPC832XEMDS_ATM_defconfig | 1 + configs/MPC832XEMDS_HOST_33_defconfig | 1 + configs/MPC832XEMDS_HOST_66_defconfig | 1 + configs/MPC832XEMDS_SLAVE_defconfig | 1 + configs/MPC832XEMDS_defconfig | 1 + configs/MPC8349EMDS_defconfig | 1 + configs/MPC8349ITXGP_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MPC8540ADS_defconfig | 1 + configs/MPC8541CDS_defconfig | 1 + configs/MPC8541CDS_legacy_defconfig | 1 + configs/MPC8544DS_defconfig | 1 + configs/MPC8548CDS_36BIT_defconfig | 1 + configs/MPC8548CDS_defconfig | 1 + configs/MPC8548CDS_legacy_defconfig | 1 + configs/MPC8555CDS_defconfig | 1 + configs/MPC8555CDS_legacy_defconfig | 1 + configs/MPC8560ADS_defconfig | 1 + configs/MPC8568MDS_defconfig | 1 + configs/MPC8572DS_36BIT_defconfig | 1 + configs/MPC8572DS_defconfig | 1 + configs/MPC8610HPCD_defconfig | 4 +- configs/MPC8641HPCN_36BIT_defconfig | 4 +- configs/MPC8641HPCN_defconfig | 4 +- configs/MSI_Primo81_defconfig | 1 - configs/Marsboard_A10_defconfig | 2 +- configs/Mele_A1000_defconfig | 2 +- configs/Mele_M5_defconfig | 2 +- configs/MiniFAP_defconfig | 1 + configs/O2D300_defconfig | 1 + configs/O2DNT2_RAMBOOT_defconfig | 1 + configs/O2DNT2_defconfig | 1 + configs/O2D_defconfig | 1 + configs/O2I_defconfig | 1 + configs/O2MNT_O2M110_defconfig | 1 + configs/O2MNT_O2M112_defconfig | 1 + configs/O2MNT_O2M113_defconfig | 1 + configs/O2MNT_defconfig | 1 + configs/O3DNT_defconfig | 1 + configs/Orangepi_defconfig | 2 +- configs/Orangepi_mini_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 2 +- .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 2 +- .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1023RDB_defconfig | 1 + configs/P2041RDB_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_SECURE_BOOT_defconfig | 2 +- configs/P4080DS_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_SECURE_BOOT_defconfig | 2 +- configs/PATI_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/PLU405_defconfig | 1 + configs/PMC405DE_defconfig | 1 + configs/PMC440_defconfig | 1 + configs/T1023RDB_SECURE_BOOT_defconfig | 2 +- configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 2 +- configs/T1024QDS_SECURE_BOOT_defconfig | 2 +- configs/T1024RDB_SECURE_BOOT_defconfig | 2 +- configs/T1040D4RDB_SECURE_BOOT_defconfig | 2 +- configs/T1040QDS_SECURE_BOOT_defconfig | 2 +- configs/T1040RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042D4RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 2 +- configs/T1042RDB_SECURE_BOOT_defconfig | 2 +- configs/T2080QDS_SECURE_BOOT_defconfig | 2 +- configs/T2080RDB_SECURE_BOOT_defconfig | 2 +- configs/T4160QDS_SECURE_BOOT_defconfig | 2 +- configs/T4240QDS_SECURE_BOOT_defconfig | 2 +- configs/TQM5200S_HIGHBOOT_defconfig | 1 + configs/TQM5200S_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM834x_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/VOM405_defconfig | 1 + configs/Wits_Pro_A20_DKT_defconfig | 2 +- configs/a3m071_defconfig | 1 + configs/a4m072_defconfig | 1 + configs/a4m2k_defconfig | 1 + configs/ac14xx_defconfig | 1 + configs/acadia_defconfig | 1 + configs/adp-ag101p_defconfig | 1 + configs/am43xx_evm_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/am57xx_evm_defconfig | 4 +- configs/am57xx_hs_evm_defconfig | 4 +- configs/arches_defconfig | 1 + configs/aria_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/arndale_defconfig | 3 +- configs/aspenite_defconfig | 1 + configs/at91rm9200ek_defconfig | 1 + configs/at91rm9200ek_ram_defconfig | 1 + configs/at91sam9260ek_dataflash_cs0_defconfig | 1 + configs/at91sam9260ek_dataflash_cs1_defconfig | 1 + configs/at91sam9260ek_nandflash_defconfig | 1 + configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 + configs/at91sam9g10ek_nandflash_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 + configs/at91sam9g20ek_nandflash_defconfig | 1 + configs/at91sam9xeek_dataflash_cs0_defconfig | 1 + configs/at91sam9xeek_dataflash_cs1_defconfig | 1 + configs/at91sam9xeek_nandflash_defconfig | 1 + configs/atngw100_defconfig | 1 + configs/atngw100mkii_defconfig | 1 + configs/atstk1002_defconfig | 1 + configs/axm_defconfig | 1 + configs/axs101_defconfig | 1 + configs/axs103_defconfig | 1 + configs/bamboo_defconfig | 1 + configs/bayleybay_defconfig | 5 +- configs/bcm11130_defconfig | 3 + configs/bcm11130_nand_defconfig | 3 + configs/bcm23550_w1d_defconfig | 3 + configs/bcm28155_ap_defconfig | 3 + configs/bcm28155_w1d_defconfig | 3 + configs/bcm911360_entphn-ns_defconfig | 1 + configs/bcm911360_entphn_defconfig | 1 + configs/bcm911360k_defconfig | 1 + configs/bcm958300k-ns_defconfig | 1 + configs/bcm958300k_defconfig | 1 + configs/bcm958305k_defconfig | 1 + configs/bcm958622hr_defconfig | 1 + configs/bf518f-ezbrd_defconfig | 1 + configs/bf527-ad7160-eval_defconfig | 1 + configs/bf537-stamp_defconfig | 1 + configs/bf548-ezkit_defconfig | 1 + configs/bf609-ezkit_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/blanche_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/bubinga_defconfig | 1 + configs/caddy2_defconfig | 1 + configs/calimain_defconfig | 1 + configs/cam5200_defconfig | 1 + configs/cam5200_niosflash_defconfig | 1 + configs/canmb_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/charon_defconfig | 1 + configs/chromebit_mickey_defconfig | 7 +- configs/chromebook_jerry_defconfig | 2 +- configs/chromebook_link_defconfig | 2 +- configs/chromebook_minnie_defconfig | 2 +- configs/chromebox_panther_defconfig | 2 +- configs/clearfog_defconfig | 3 + configs/cm-bf537e_defconfig | 1 + configs/cm-bf537u_defconfig | 1 + configs/cm5200_defconfig | 1 + ...conga-qeval20-qa3-e3845-internal-uart_defconfig | 5 +- configs/conga-qeval20-qa3-e3845_defconfig | 5 +- configs/coreboot-x86_defconfig | 2 +- configs/corvus_defconfig | 1 + configs/crownbay_defconfig | 5 +- configs/d2net_v2_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/db-88f6720_defconfig | 1 + configs/db-88f6820-amc_defconfig | 1 + configs/db-88f6820-gp_defconfig | 3 + configs/db-mv784mp-gp_defconfig | 1 + configs/devconcenter_defconfig | 1 + configs/devkit3250_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 5 +- configs/digsy_mtc_RAMBOOT_defconfig | 1 + configs/digsy_mtc_defconfig | 1 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 + configs/digsy_mtc_rev5_defconfig | 1 + configs/dlvision-10g_defconfig | 1 + configs/dlvision_defconfig | 1 + configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/dragonboard410c_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/ds414_defconfig | 1 + configs/e2220-1170_defconfig | 8 -- configs/ea20_defconfig | 1 + configs/edb9315a_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/espresso7420_defconfig | 1 + configs/evb-rk3288_defconfig | 2 +- configs/evb-rk3399_defconfig | 3 +- configs/fennec-rk3288_defconfig | 2 +- configs/flea3_defconfig | 1 + configs/fo300_defconfig | 1 + configs/galileo_defconfig | 3 + configs/gdppc440etx_defconfig | 1 + configs/ge_b450v3_defconfig | 2 +- configs/ge_b650v3_defconfig | 2 +- configs/ge_b850v3_defconfig | 2 +- configs/glacier_defconfig | 1 + configs/glacier_ramboot_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/gplugd_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/h2200_defconfig | 1 + configs/haleakala_defconfig | 1 + configs/highbank_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/icon_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/imx31_phycore_defconfig | 1 + configs/imx31_phycore_eet_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 43 ++++----- configs/imx6qdl_icore_nand_defconfig | 41 ++++----- configs/inetspace_v2_defconfig | 1 + configs/inka4x0_defconfig | 1 + configs/integratorap_cm720t_defconfig | 1 + configs/integratorap_cm920t_defconfig | 1 + configs/integratorap_cm926ejs_defconfig | 1 + configs/integratorap_cm946es_defconfig | 1 + configs/integratorcp_cm1136_defconfig | 1 + configs/integratorcp_cm920t_defconfig | 1 + configs/integratorcp_cm926ejs_defconfig | 1 + configs/integratorcp_cm946es_defconfig | 1 + configs/intip_defconfig | 1 + configs/io64_defconfig | 1 + configs/io_defconfig | 1 + configs/iocon_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/jupiter_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/katmai_defconfig | 1 + configs/kc1_defconfig | 2 +- configs/kilauea_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/kylin-rk3036_defconfig | 6 +- configs/kzm9g_defconfig | 1 + configs/ls1012afrdm_qspi_defconfig | 3 +- configs/ls1012aqds_qspi_defconfig | 2 +- configs/ls1012ardb_qspi_defconfig | 2 +- configs/ls1021aiot_qspi_defconfig | 10 +- configs/ls1021aiot_sdcard_defconfig | 13 ++- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 +- .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 1 - configs/ls1046aqds_lpuart_defconfig | 5 +- configs/ls1046ardb_qspi_defconfig | 2 +- configs/ls2080a_emu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 - configs/ls2080ardb_SECURE_BOOT_defconfig | 1 - configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/luan_defconfig | 1 + configs/lwmon5_defconfig | 1 + configs/makalu_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mecp5123_defconfig | 1 + configs/meesc_dataflash_defconfig | 1 + configs/meesc_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/miniarm-rk3288_defconfig | 2 +- configs/minnowmax_defconfig | 5 +- configs/motionpro_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/mpc8308_p1m_defconfig | 1 + configs/munices_defconfig | 1 + configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_db-88f7040_defconfig | 1 + configs/mvebu_db-88f8040_defconfig | 1 + configs/mx25pdk_defconfig | 2 +- configs/mx31ads_defconfig | 1 + configs/mx31pdk_defconfig | 1 + configs/mx53ard_defconfig | 2 +- configs/mx6ull_14x14_evk_plugin_defconfig | 2 +- configs/mx7dsabresd_secure_defconfig | 6 +- configs/nas220_defconfig | 1 + configs/neo_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/odroid-c2_defconfig | 1 + configs/odroid-xu3_defconfig | 3 +- configs/odroid_defconfig | 4 +- configs/origen_defconfig | 4 +- configs/p2371-0000_defconfig | 8 -- configs/p2371-2180_defconfig | 8 -- configs/p2571_defconfig | 8 -- configs/p2771-0000-000_defconfig | 8 -- configs/p2771-0000-500_defconfig | 8 -- configs/pcm030_LOWBOOT_defconfig | 1 + configs/pcm030_defconfig | 1 + configs/pdm360ng_defconfig | 1 + configs/peach-pi_defconfig | 3 +- configs/peach-pit_defconfig | 3 +- configs/pic32mzdask_defconfig | 2 + configs/pico-imx6ul_defconfig | 2 +- configs/pm9261_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/popmetal-rk3288_defconfig | 2 +- configs/portl2_defconfig | 1 + configs/qemu-ppce500_defconfig | 1 + configs/qemu-x86_defconfig | 2 +- configs/qemu-x86_efi_payload32_defconfig | 2 +- configs/qemu-x86_efi_payload64_defconfig | 4 +- configs/rainier_defconfig | 1 + configs/rainier_ramboot_defconfig | 1 + configs/redwood_defconfig | 1 + configs/rock2_defconfig | 1 - configs/rpi_2_defconfig | 2 + configs/rpi_3_32b_defconfig | 2 + configs/rpi_3_defconfig | 2 + configs/rpi_defconfig | 2 + configs/s5p_goni_defconfig | 2 + configs/s5pc210_universal_defconfig | 3 + configs/salvator-x_defconfig | 1 + configs/sama5d2_ptc_nandflash_defconfig | 1 + configs/sama5d2_ptc_spiflash_defconfig | 1 + configs/sama5d2_xplained_mmc_defconfig | 9 +- configs/sama5d2_xplained_spiflash_defconfig | 7 +- configs/sandbox_defconfig | 1 - configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 - configs/sbc8349_PCI_33_defconfig | 1 + configs/sbc8349_PCI_66_defconfig | 1 + configs/sbc8349_defconfig | 1 + configs/sbc8548_PCI_33_PCIE_defconfig | 1 + configs/sbc8548_PCI_33_defconfig | 1 + configs/sbc8548_PCI_66_PCIE_defconfig | 1 + configs/sbc8548_PCI_66_defconfig | 1 + configs/sbc8548_defconfig | 1 + configs/sbc8641d_defconfig | 1 + configs/sequoia_defconfig | 1 + configs/sequoia_ramboot_defconfig | 1 + configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/smdk5250_defconfig | 3 +- configs/smdk5420_defconfig | 3 +- configs/smdkc100_defconfig | 1 + configs/smdkv310_defconfig | 3 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/sniper_defconfig | 2 +- configs/snow_defconfig | 3 +- configs/socfpga_is1_defconfig | 1 + configs/socrates_defconfig | 1 + configs/som-db5800-som-6867_defconfig | 2 +- configs/spear300_defconfig | 1 + configs/spear300_nand_defconfig | 1 + configs/spear300_usbtty_defconfig | 1 + configs/spear300_usbtty_nand_defconfig | 1 + configs/spear310_defconfig | 1 + configs/spear310_nand_defconfig | 1 + configs/spear310_pnor_defconfig | 1 + configs/spear310_usbtty_defconfig | 1 + configs/spear310_usbtty_nand_defconfig | 1 + configs/spear310_usbtty_pnor_defconfig | 1 + configs/spear320_defconfig | 1 + configs/spear320_nand_defconfig | 1 + configs/spear320_pnor_defconfig | 1 + configs/spear320_usbtty_defconfig | 1 + configs/spear320_usbtty_nand_defconfig | 1 + configs/spear320_usbtty_pnor_defconfig | 1 + configs/spear600_defconfig | 1 + configs/spear600_nand_defconfig | 1 + configs/spear600_usbtty_defconfig | 1 + configs/spear600_usbtty_nand_defconfig | 1 + configs/spring_defconfig | 3 +- configs/stm32f429-discovery_defconfig | 3 +- configs/stm32f746-disco_defconfig | 1 + configs/stv0991_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/sycamore_defconfig | 1 + configs/t3corp_defconfig | 1 + configs/taurus_defconfig | 1 + configs/tcm-bf537_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 5 +- configs/theadorable_debug_defconfig | 2 +- configs/theadorable_defconfig | 2 +- configs/thunderx_88xx_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- configs/tqma6s_wru4_mmc_defconfig | 2 +- configs/trats2_defconfig | 3 + configs/trats_defconfig | 3 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/udoo_neo_defconfig | 3 +- configs/uniphier_ld11_defconfig | 1 + configs/usb_a9263_dataflash_defconfig | 1 + configs/v38b_defconfig | 1 + configs/ve8313_defconfig | 1 + configs/vexpress_aemv8a_dram_defconfig | 1 + configs/vexpress_aemv8a_juno_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/vining_2000_defconfig | 2 - configs/vme8349_defconfig | 1 + configs/walnut_defconfig | 1 + configs/work_92105_defconfig | 1 + configs/wtk_defconfig | 1 + configs/x600_defconfig | 1 + configs/xilinx-ppc405-generic_defconfig | 1 + configs/xilinx-ppc440-generic_defconfig | 1 + configs/xilinx_zynqmp_ep_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + configs/xilinx_zynqmp_zcu102_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/xpedite1000_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + configs/yellowstone_defconfig | 1 + configs/yosemite_defconfig | 1 + configs/yucca_defconfig | 1 + configs/zmx25_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm011_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + drivers/mmc/Kconfig | 102 ++++++++++++++++++++- drivers/mmc/Makefile | 14 +-- drivers/mmc/sdhci.c | 10 +- include/configs/BSC9132QDS.h | 1 - include/configs/MPC8308RDB.h | 2 - include/configs/MPC837XEMDS.h | 2 - include/configs/MPC837XERDB.h | 2 - include/configs/MPC8536DS.h | 2 - include/configs/MPC8569MDS.h | 2 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 2 - include/configs/P3041DS.h | 1 - include/configs/P4080DS.h | 1 - include/configs/P5020DS.h | 1 - include/configs/P5040DS.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 2 - include/configs/T104xRDB.h | 2 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 2 - include/configs/T4240RDB.h | 2 - include/configs/UCP1020.h | 2 - include/configs/adp-ag101p.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/alt.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/apf27.h | 1 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/axs10x.h | 1 - include/configs/bayleybay.h | 3 - include/configs/bcm23550_w1d.h | 4 - include/configs/bcm28155_ap.h | 4 - include/configs/beaver.h | 1 - include/configs/bf518f-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf537-stamp.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/bf609-ezkit.h | 1 - include/configs/brppt1.h | 1 - include/configs/brxre1.h | 1 - include/configs/cardhu.h | 1 - include/configs/cei-tk1-som.h | 1 - include/configs/clearfog.h | 4 - include/configs/cm-bf537e.h | 1 - include/configs/cm-bf537u.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/colibri_t20.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/conga-qeval20-qa3-e3845.h | 3 - include/configs/controlcenterd.h | 1 - include/configs/crownbay.h | 3 - include/configs/cyrus.h | 1 - include/configs/da850evm.h | 1 - include/configs/dalmore.h | 1 - include/configs/db-88f6820-gp.h | 4 - include/configs/dfi-bt700.h | 3 - include/configs/dragonboard410c.h | 2 - include/configs/e2220-1170.h | 1 - include/configs/edb93xx.h | 1 - include/configs/ethernut5.h | 1 - include/configs/exynos-common.h | 3 - include/configs/exynos4-common.h | 1 - include/configs/galileo.h | 3 - include/configs/ge_bx50v3.h | 1 - include/configs/gose.h | 1 - include/configs/harmony.h | 1 - include/configs/hikey.h | 1 - include/configs/hrcon.h | 1 - include/configs/imx27lite-common.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/k2g_evm.h | 1 - include/configs/kc1.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h | 1 - include/configs/legoev3.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/ls2080a_simu.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/m53evk.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/mcx.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/minnowmax.h | 3 - include/configs/mx25pdk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 2 - include/configs/mx53ard.h | 1 - include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53smd.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/mxs.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/nyan-big.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/openrd.h | 1 - include/configs/p1_p2_rdb_pc.h | 2 - include/configs/p1_twr.h | 2 - include/configs/p2371-0000.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/p2571.h | 1 - include/configs/p2771-0000.h | 1 - include/configs/paz00.h | 1 - include/configs/pcm052.h | 1 - include/configs/pepper.h | 1 - include/configs/pic32mzdask.h | 2 - include/configs/pico-imx6ul.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/plutux.h | 1 - include/configs/porter.h | 1 - include/configs/pxa-common.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3399_common.h | 2 - include/configs/rpi.h | 4 - include/configs/s32v234evb.h | 1 - include/configs/s5p_goni.h | 3 - include/configs/sama5d2_xplained.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/seaboard.h | 1 - include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sheevaplug.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/silk.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/sniper.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/stout.h | 1 - include/configs/strider.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/tcm-bf537.h | 1 - include/configs/tec-ng.h | 1 - include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 3 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/tricorder.h | 1 - include/configs/trimslice.h | 1 - include/configs/ts4800.h | 2 - include/configs/usbarmory.h | 1 - include/configs/venice2.h | 1 - include/configs/ventana.h | 1 - include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 1 - include/configs/vinco.h | 1 - include/configs/whistler.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/xilinx_zynqmp.h | 2 - include/configs/zipitz2.h | 1 - include/configs/zynq-common.h | 2 - 724 files changed, 769 insertions(+), 527 deletions(-)
Generated by "tools/moveconfig -s".
This will make config moves easier.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
Changes in v2: - Regenerate based on v2017.01-rc1
configs/A10-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino-Lime2_defconfig | 2 +- configs/A20-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino_MICRO_defconfig | 2 +- configs/A20-Olimex-SOM-EVB_defconfig | 2 +- configs/B4860QDS_SECURE_BOOT_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 2 +- .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 2 +- .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 2 +- .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 2 +- .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 2 +- configs/Bananapi_defconfig | 2 +- configs/Bananapro_defconfig | 2 +- configs/C29XPCIE_NOR_SECBOOT_defconfig | 2 +- configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 2 +- configs/Chuwi_V7_CW0825_defconfig | 1 - configs/Cubieboard2_defconfig | 2 +- configs/Cubieboard_defconfig | 2 +- configs/Cubietruck_defconfig | 2 +- configs/Itead_Ibox_A20_defconfig | 2 +- configs/Lamobo_R1_defconfig | 2 +- configs/Linksprite_pcDuino3_Nano_defconfig | 2 +- configs/Linksprite_pcDuino3_defconfig | 2 +- configs/MPC8610HPCD_defconfig | 3 +- configs/MPC8641HPCN_36BIT_defconfig | 3 +- configs/MPC8641HPCN_defconfig | 3 +- configs/MSI_Primo81_defconfig | 1 - configs/Marsboard_A10_defconfig | 2 +- configs/Mele_A1000_defconfig | 2 +- configs/Mele_M5_defconfig | 2 +- configs/Orangepi_defconfig | 2 +- configs/Orangepi_mini_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 2 +- .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 2 +- .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P2041RDB_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_SECURE_BOOT_defconfig | 2 +- configs/P4080DS_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_SECURE_BOOT_defconfig | 2 +- configs/T1023RDB_SECURE_BOOT_defconfig | 2 +- configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 2 +- configs/T1024QDS_SECURE_BOOT_defconfig | 2 +- configs/T1024RDB_SECURE_BOOT_defconfig | 2 +- configs/T1040D4RDB_SECURE_BOOT_defconfig | 2 +- configs/T1040QDS_SECURE_BOOT_defconfig | 2 +- configs/T1040RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042D4RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 2 +- configs/T1042RDB_SECURE_BOOT_defconfig | 2 +- configs/T2080QDS_SECURE_BOOT_defconfig | 2 +- configs/T2080RDB_SECURE_BOOT_defconfig | 2 +- configs/T4160QDS_SECURE_BOOT_defconfig | 2 +- configs/T4240QDS_SECURE_BOOT_defconfig | 2 +- configs/Wits_Pro_A20_DKT_defconfig | 2 +- configs/am43xx_evm_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/am57xx_evm_defconfig | 4 +- configs/am57xx_hs_evm_defconfig | 4 +- configs/arndale_defconfig | 1 - configs/bayleybay_defconfig | 2 +- configs/chromebit_mickey_defconfig | 7 +--- configs/chromebook_jerry_defconfig | 2 +- configs/chromebook_link_defconfig | 2 +- configs/chromebook_minnie_defconfig | 2 +- configs/chromebox_panther_defconfig | 2 +- ...conga-qeval20-qa3-e3845-internal-uart_defconfig | 2 +- configs/conga-qeval20-qa3-e3845_defconfig | 2 +- configs/coreboot-x86_defconfig | 2 +- configs/crownbay_defconfig | 2 +- configs/dfi-bt700-q7x-151_defconfig | 2 +- configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/e2220-1170_defconfig | 8 ---- configs/evb-rk3288_defconfig | 2 +- configs/evb-rk3399_defconfig | 2 +- configs/fennec-rk3288_defconfig | 2 +- configs/ge_b450v3_defconfig | 2 +- configs/ge_b650v3_defconfig | 2 +- configs/ge_b850v3_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 43 ++++++++++------------ configs/imx6qdl_icore_nand_defconfig | 41 +++++++++------------ configs/kc1_defconfig | 2 +- configs/kylin-rk3036_defconfig | 6 +-- configs/ls1012afrdm_qspi_defconfig | 2 +- configs/ls1012aqds_qspi_defconfig | 2 +- configs/ls1012ardb_qspi_defconfig | 2 +- configs/ls1021aiot_qspi_defconfig | 10 ++--- configs/ls1021aiot_sdcard_defconfig | 13 +++---- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 +- .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 1 - configs/ls1046aqds_lpuart_defconfig | 5 +-- configs/ls1046ardb_qspi_defconfig | 2 +- configs/ls2080aqds_SECURE_BOOT_defconfig | 1 - configs/ls2080ardb_SECURE_BOOT_defconfig | 1 - configs/miniarm-rk3288_defconfig | 2 +- configs/minnowmax_defconfig | 2 +- configs/mx25pdk_defconfig | 2 +- configs/mx53ard_defconfig | 2 +- configs/mx6ull_14x14_evk_plugin_defconfig | 2 +- configs/mx7dsabresd_secure_defconfig | 6 +-- configs/odroid-xu3_defconfig | 1 - configs/odroid_defconfig | 1 - configs/origen_defconfig | 1 - configs/p2371-0000_defconfig | 8 ---- configs/p2371-2180_defconfig | 8 ---- configs/p2571_defconfig | 8 ---- configs/p2771-0000-000_defconfig | 8 ---- configs/p2771-0000-500_defconfig | 8 ---- configs/peach-pi_defconfig | 1 - configs/peach-pit_defconfig | 1 - configs/pico-imx6ul_defconfig | 2 +- configs/popmetal-rk3288_defconfig | 2 +- configs/qemu-x86_defconfig | 2 +- configs/qemu-x86_efi_payload32_defconfig | 2 +- configs/qemu-x86_efi_payload64_defconfig | 4 +- configs/rock2_defconfig | 1 - configs/sama5d2_xplained_mmc_defconfig | 8 ++-- configs/sama5d2_xplained_spiflash_defconfig | 6 +-- configs/smdk5250_defconfig | 1 - configs/smdk5420_defconfig | 1 - configs/sniper_defconfig | 2 +- configs/snow_defconfig | 1 - configs/som-db5800-som-6867_defconfig | 2 +- configs/spring_defconfig | 1 - configs/stm32f429-discovery_defconfig | 2 +- configs/theadorable-x86-dfi-bt700_defconfig | 2 +- configs/theadorable_debug_defconfig | 1 - configs/theadorable_defconfig | 1 - configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- configs/tqma6s_wru4_mmc_defconfig | 2 +- configs/udoo_neo_defconfig | 3 +- configs/vining_2000_defconfig | 2 - 153 files changed, 184 insertions(+), 275 deletions(-)
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index bb7eaf8..50436a7 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -7,8 +7,8 @@ CONFIG_DRAM_EMR1=4 CONFIG_SYS_CLK_FREQ=912000000 CONFIG_MMC0_CD_PIN="PH1" CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,SATAPWR=SUNXI_GPC(3)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index d48e35d..8fd7c64 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -7,8 +7,8 @@ CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index 7c5d84d..26e6ace 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -5,8 +5,8 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=384 CONFIG_MMC0_CD_PIN="PH1" CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPC(3)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index 9eb5f1b..d629eb1 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -8,8 +8,8 @@ CONFIG_MMC3_CD_PIN="PH11" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_VIDEO_VGA=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig index 53d800f..b5d52db 100644 --- a/configs/A20-Olimex-SOM-EVB_defconfig +++ b/configs/A20-Olimex-SOM-EVB_defconfig @@ -10,8 +10,8 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5" CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig index e2e16fb..69edc00 100644 --- a/configs/B4860QDS_SECURE_BOOT_defconfig +++ b/configs/B4860QDS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_B4860QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig index 52d5fe9..c05788c 100644 --- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig +++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_BSC9132QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT,SYS_CLK_100_DDR_100" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig index afa4aad..b501c20 100644 --- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig +++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_BSC9132QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT,SYS_CLK_100_DDR_133" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig index 5c3f150..61655c7 100644 --- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig +++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_BSC9132QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_CLK_100_DDR_100" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig index 0c0b5e3..3c71a0b 100644 --- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig +++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_BSC9132QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_CLK_100_DDR_133" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig index 45b46df..63a208c 100644 --- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig +++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_BSC9132QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SDCARD,SYS_CLK_100_DDR_100" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig index 417ac5a..9e540c4 100644 --- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig +++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_BSC9132QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SDCARD,SYS_CLK_100_DDR_133" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig index 5145c3a..6b445d6 100644 --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_BSC9132QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH,SYS_CLK_100_DDR_100" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig index 0f65f96..8994e99 100644 --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_BSC9132QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH,SYS_CLK_100_DDR_133" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig index 3da1cf7..0f2ef1b 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig @@ -6,8 +6,8 @@ CONFIG_DRAM_CLK=432 CONFIG_VIDEO_COMPOSITE=y CONFIG_GMAC_TX_DELAY=3 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig index 2b9c865..e3bb4b2 100644 --- a/configs/Bananapro_defconfig +++ b/configs/Bananapro_defconfig @@ -8,8 +8,8 @@ CONFIG_USB2_VBUS_PIN="PH1" CONFIG_VIDEO_COMPOSITE=y CONFIG_GMAC_TX_DELAY=3 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig index ed46dbe..737467d 100644 --- a/configs/C29XPCIE_NOR_SECBOOT_defconfig +++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_C29XPCIE=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig index ef1100f..56e7066 100644 --- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig +++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_C29XPCIE=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig index a67038b..8507f73 100644 --- a/configs/Chuwi_V7_CW0825_defconfig +++ b/configs/Chuwi_V7_CW0825_defconfig @@ -22,4 +22,3 @@ CONFIG_USB_MUSB_HOST=y CONFIG_VIDEO_LCD_SPI_CS="PA0" CONFIG_VIDEO_LCD_SPI_SCLK="PA1" CONFIG_VIDEO_LCD_SPI_MOSI="PA2" -CONFIG_CFB_CONSOLE=y diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig index 9212a17..dfeb66c 100644 --- a/configs/Cubieboard2_defconfig +++ b/configs/Cubieboard2_defconfig @@ -5,8 +5,8 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 CONFIG_MMC0_CD_PIN="PH1" CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig index 6e7e741..64aebed 100644 --- a/configs/Cubieboard_defconfig +++ b/configs/Cubieboard_defconfig @@ -5,8 +5,8 @@ CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=480 CONFIG_MMC0_CD_PIN="PH1" CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,SATAPWR=SUNXI_GPB(8)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 37b60b85..10f3237 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -10,8 +10,8 @@ CONFIG_USB0_ID_DET="PH19" CONFIG_VIDEO_VGA=y CONFIG_GMAC_TX_DELAY=1 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(12)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig index d544d50..baca3e8 100644 --- a/configs/Itead_Ibox_A20_defconfig +++ b/configs/Itead_Ibox_A20_defconfig @@ -5,8 +5,8 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 CONFIG_MMC0_CD_PIN="PH1" CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig index 58bc5a2..6fe79e2 100644 --- a/configs/Lamobo_R1_defconfig +++ b/configs/Lamobo_R1_defconfig @@ -6,8 +6,8 @@ CONFIG_DRAM_CLK=432 CONFIG_MMC0_CD_PIN="PH10" CONFIG_GMAC_TX_DELAY=4 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),SATAPWR=SUNXI_GPB(3)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig index 8cbe9c3..622d35c 100644 --- a/configs/Linksprite_pcDuino3_Nano_defconfig +++ b/configs/Linksprite_pcDuino3_Nano_defconfig @@ -7,8 +7,8 @@ CONFIG_DRAM_ZQ=122 CONFIG_USB1_VBUS_PIN="PH11" CONFIG_GMAC_TX_DELAY=3 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(2)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index 5d155b4..9d2dfa5a 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -5,8 +5,8 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 CONFIG_DRAM_ZQ=122 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPH(2)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig index b4e053a..9327955 100644 --- a/configs/MPC8610HPCD_defconfig +++ b/configs/MPC8610HPCD_defconfig @@ -6,7 +6,6 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set -CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y @@ -15,6 +14,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_SYS_NS16550=y -CONFIG_OF_LIBFDT=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y +CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig index 8ffa5e9..d1f9e10 100644 --- a/configs/MPC8641HPCN_36BIT_defconfig +++ b/configs/MPC8641HPCN_36BIT_defconfig @@ -7,7 +7,6 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set -CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y @@ -15,6 +14,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_SYS_NS16550=y -CONFIG_OF_LIBFDT=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y +CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig index 6f9bf01..0672345 100644 --- a/configs/MPC8641HPCN_defconfig +++ b/configs/MPC8641HPCN_defconfig @@ -6,7 +6,6 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 # CONFIG_CONSOLE_MUX is not set -CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y @@ -14,6 +13,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_SYS_NS16550=y -CONFIG_OF_LIBFDT=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y +CONFIG_OF_LIBFDT=y diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig index e9d5be4..8847271 100644 --- a/configs/MSI_Primo81_defconfig +++ b/configs/MSI_Primo81_defconfig @@ -25,4 +25,3 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9" CONFIG_VIDEO_LCD_SPI_SCLK="PH10" CONFIG_VIDEO_LCD_SPI_MOSI="PH11" CONFIG_VIDEO_LCD_SPI_MISO="PH12" -CONFIG_CFB_CONSOLE=y diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig index 6a88238..0d381ff 100644 --- a/configs/Marsboard_A10_defconfig +++ b/configs/Marsboard_A10_defconfig @@ -2,8 +2,8 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig index d678ffb..820d5ed 100644 --- a/configs/Mele_A1000_defconfig +++ b/configs/Mele_A1000_defconfig @@ -5,8 +5,8 @@ CONFIG_MACH_SUN4I=y CONFIG_VIDEO_VGA=y CONFIG_VIDEO_COMPOSITE=y CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,MACPWR=SUNXI_GPH(15)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig index 09addc5..e64e452 100644 --- a/configs/Mele_M5_defconfig +++ b/configs/Mele_M5_defconfig @@ -7,8 +7,8 @@ CONFIG_DRAM_ZQ=122 CONFIG_MMC0_CD_PIN="PH1" CONFIG_VIDEO_COMPOSITE=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig index 052ca83..ccece01 100644 --- a/configs/Orangepi_defconfig +++ b/configs/Orangepi_defconfig @@ -9,8 +9,8 @@ CONFIG_VIDEO_VGA=y CONFIG_VIDEO_COMPOSITE=y CONFIG_GMAC_TX_DELAY=3 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig index 63db70d..febdcd0 100644 --- a/configs/Orangepi_mini_defconfig +++ b/configs/Orangepi_mini_defconfig @@ -11,8 +11,8 @@ CONFIG_USB2_VBUS_PIN="PH22" CONFIG_VIDEO_COMPOSITE=y CONFIG_GMAC_TX_DELAY=3 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig index 0430076..3a5b844 100644 --- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig +++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PA=y # CONFIG_SYS_MALLOC_F is not set @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig index f091938..881afc5 100644 --- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PA=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig index f78a54d..ed10fcf 100644 --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PA=y # CONFIG_SYS_MALLOC_F is not set @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig index ef3cd29..8677c66 100644 --- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig +++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PA=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig index 9716b4a..9e99739 100644 --- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig +++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PA=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig index 1f03841..7826443 100644 --- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig +++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PA=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig index 5145f41..b1fc348 100644 --- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig +++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PB=y # CONFIG_SYS_MALLOC_F is not set @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig index 205df6d..53d0adc 100644 --- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PB=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig index 7b6340d..8bd846c 100644 --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PB=y # CONFIG_SYS_MALLOC_F is not set @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig index 589223d..3613049 100644 --- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig +++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PB=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig index a9494ee..fcba2f0 100644 --- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig +++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PB=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig index 1a26a5d..d14bf14 100644 --- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig +++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P1010RDB_PB=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig index 7a811ae..c751a9b 100644 --- a/configs/P2041RDB_SECURE_BOOT_defconfig +++ b/configs/P2041RDB_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P2041RDB=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/P3041DS_NAND_SECURE_BOOT_defconfig b/configs/P3041DS_NAND_SECURE_BOOT_defconfig index 38407ba..dc99ed6 100644 --- a/configs/P3041DS_NAND_SECURE_BOOT_defconfig +++ b/configs/P3041DS_NAND_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P3041DS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/P3041DS_SECURE_BOOT_defconfig b/configs/P3041DS_SECURE_BOOT_defconfig index 75c0ef3..755dfc5 100644 --- a/configs/P3041DS_SECURE_BOOT_defconfig +++ b/configs/P3041DS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P3041DS=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/P4080DS_SECURE_BOOT_defconfig b/configs/P4080DS_SECURE_BOOT_defconfig index 46b4672..7b41915 100644 --- a/configs/P4080DS_SECURE_BOOT_defconfig +++ b/configs/P4080DS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P4080DS=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/P5020DS_NAND_SECURE_BOOT_defconfig b/configs/P5020DS_NAND_SECURE_BOOT_defconfig index 592aae7..60d890d 100644 --- a/configs/P5020DS_NAND_SECURE_BOOT_defconfig +++ b/configs/P5020DS_NAND_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P5020DS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/P5020DS_SECURE_BOOT_defconfig b/configs/P5020DS_SECURE_BOOT_defconfig index 27f43ef..b6fdedd 100644 --- a/configs/P5020DS_SECURE_BOOT_defconfig +++ b/configs/P5020DS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P5020DS=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/P5040DS_NAND_SECURE_BOOT_defconfig b/configs/P5040DS_NAND_SECURE_BOOT_defconfig index 9fdf4b2..8b52375 100644 --- a/configs/P5040DS_NAND_SECURE_BOOT_defconfig +++ b/configs/P5040DS_NAND_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P5040DS=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig index b8d7d3b..512c7ad 100644 --- a/configs/P5040DS_SECURE_BOOT_defconfig +++ b/configs/P5040DS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_P5040DS=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig index 1b474d3..d35e288 100644 --- a/configs/T1023RDB_SECURE_BOOT_defconfig +++ b/configs/T1023RDB_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T1023RDB=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="T1023RDB" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig index bdc0a9d..166bee3 100644 --- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig +++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_VIDEO=y CONFIG_MPC85xx=y CONFIG_TARGET_T1024QDS=y @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig index b092068..f067c8c 100644 --- a/configs/T1024QDS_SECURE_BOOT_defconfig +++ b/configs/T1024QDS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_VIDEO=y CONFIG_MPC85xx=y CONFIG_TARGET_T1024QDS=y @@ -7,7 +8,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig index 9d082f7..f138dd5 100644 --- a/configs/T1024RDB_SECURE_BOOT_defconfig +++ b/configs/T1024RDB_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T1024RDB=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="T1024RDB" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig index 6f948a1..6c96cd0 100644 --- a/configs/T1040D4RDB_SECURE_BOOT_defconfig +++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T1040D4RDB=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig index 3f15b09..a07afc7 100644 --- a/configs/T1040QDS_SECURE_BOOT_defconfig +++ b/configs/T1040QDS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_VIDEO=y CONFIG_MPC85xx=y CONFIG_TARGET_T1040QDS=y @@ -7,7 +8,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig index a9b61a8..c0965eb 100644 --- a/configs/T1040RDB_SECURE_BOOT_defconfig +++ b/configs/T1040RDB_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T1040RDB=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig index e20d412..b07464f 100644 --- a/configs/T1042D4RDB_SECURE_BOOT_defconfig +++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_VIDEO=y CONFIG_MPC85xx=y CONFIG_TARGET_T1042D4RDB=y @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig index 26db750..14aa1fd 100644 --- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SECURE_BOOT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y @@ -14,7 +15,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=0 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig index edd1ff6..dbb9c0b 100644 --- a/configs/T1042RDB_SECURE_BOOT_defconfig +++ b/configs/T1042RDB_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T1042RDB=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig index 95f6804..bb13249 100644 --- a/configs/T2080QDS_SECURE_BOOT_defconfig +++ b/configs/T2080QDS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig index 64204e0..0e2ff06 100644 --- a/configs/T2080RDB_SECURE_BOOT_defconfig +++ b/configs/T2080RDB_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080RDB=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MEMTEST=y diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig index e637f1e..d0e4f11 100644 --- a/configs/T4160QDS_SECURE_BOOT_defconfig +++ b/configs/T4160QDS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T4160QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T4240QDS_SECURE_BOOT_defconfig b/configs/T4240QDS_SECURE_BOOT_defconfig index 61028e3..f2cf58a 100644 --- a/configs/T4240QDS_SECURE_BOOT_defconfig +++ b/configs/T4240QDS_SECURE_BOOT_defconfig @@ -1,4 +1,5 @@ CONFIG_PPC=y +CONFIG_SECURE_BOOT=y CONFIG_MPC85xx=y CONFIG_TARGET_T4240QDS=y # CONFIG_SYS_MALLOC_F is not set @@ -6,7 +7,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig index d847fc7..0735055 100644 --- a/configs/Wits_Pro_A20_DKT_defconfig +++ b/configs/Wits_Pro_A20_DKT_defconfig @@ -10,8 +10,8 @@ CONFIG_VIDEO_LCD_BL_EN="PH7" CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_PANEL_LVDS=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt" -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index e596106..00f186a 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -45,6 +45,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_MMC_OPS is not set +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y @@ -52,7 +53,6 @@ CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y CONFIG_TI_QSPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index a605d0a..60b2122 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -47,13 +47,13 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_MMC_OPS is not set +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y CONFIG_TI_QSPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 7fd418f..a582055 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -36,8 +36,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y -CONFIG_DFU_RAM=y -CONFIG_DFU_MMC=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y @@ -53,6 +51,8 @@ CONFIG_OF_CONTROL=y CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am572x-idk am571x-idk" CONFIG_DM=y # CONFIG_BLK is not set +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 2b1d695..c8b52ce 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -37,8 +37,6 @@ CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y -CONFIG_DFU_RAM=y -CONFIG_DFU_MMC=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y @@ -52,6 +50,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DM=y # CONFIG_BLK is not set +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index e0332f7..6eef60d 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -21,7 +21,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_SOUND=y CONFIG_I2S=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 6daa675..1eb6142 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -54,8 +54,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index b118907..9203f73 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -7,7 +7,6 @@ CONFIG_TARGET_CHROMEBIT_MICKEY=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x80000 -CONFIG_DM_KEYBOARD=y CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_STACK_R=y @@ -34,6 +33,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_OF_PLATDATA=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y @@ -45,8 +45,8 @@ CONFIG_ROCKCHIP_GPIO=y CONFIG_I2C_CROS_EC_TUNNEL=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_I2C_MUX=y +CONFIG_DM_KEYBOARD=y CONFIG_CROS_EC_KEYB=y -CONFIG_CMD_CROS_EC=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y @@ -58,11 +58,9 @@ CONFIG_ROCKCHIP_RK3288_PINCTRL=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_RK808=y -CONFIG_DM_REGULATOR=y CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_REGULATOR_RK808=y -CONFIG_DM_PWM=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y @@ -80,5 +78,4 @@ CONFIG_VIDEO_ROCKCHIP=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -CONFIG_SPL_OF_PLATDATA=y # CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 46df1a6..95e5f57 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_OF_PLATDATA=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y @@ -78,5 +79,4 @@ CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -CONFIG_SPL_OF_PLATDATA=y # CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 782123b..8407731 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -57,8 +57,8 @@ CONFIG_TPM_TIS_LPC=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index 6aced14..49cd640 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_OF_PLATDATA=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y @@ -78,5 +79,4 @@ CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -CONFIG_SPL_OF_PLATDATA=y # CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index 8bf94cb..f8cf92b 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -49,8 +49,8 @@ CONFIG_TPM_TIS_LPC=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 2b317b8..28f69e4 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -62,8 +62,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index e4d1e0d..2528db9 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -61,8 +61,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index 352055a..2195fc6 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -41,9 +41,9 @@ CONFIG_TPM_TIS_LPC=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_COREBOOT=y -CONFIG_USB_KEYBOARD=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 402d141..5aa7234 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -48,8 +48,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 897c48d..f657ef6 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -59,8 +59,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig index c8251ff..9dcb6ad 100644 --- a/configs/dms-ba16-1g_defconfig +++ b/configs/dms-ba16-1g_defconfig @@ -1,7 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_ADVANTECH_DMS_BA16=y -CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb" CONFIG_SYS_DDR_1G=y CONFIG_VIDEO=y CONFIG_BOOTDELAY=1 @@ -9,6 +8,7 @@ CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y # CONFIG_SYS_STDIO_DEREGISTER is not set +CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig index 56dec74..664f039 100644 --- a/configs/dms-ba16_defconfig +++ b/configs/dms-ba16_defconfig @@ -2,12 +2,12 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_ADVANTECH_DMS_BA16=y CONFIG_VIDEO=y -CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y # CONFIG_SYS_STDIO_DEREGISTER is not set +CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig index c88cd36..c5563a4 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170" CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Tegra210 (E2220-1170) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set @@ -20,15 +19,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y # CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 8db9041..e5e550c 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_EVB_RK3288=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-evb" @@ -64,4 +65,3 @@ CONFIG_SYSRESET=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 40a8295..95029d7 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -24,9 +24,9 @@ CONFIG_ROCKCHIP_DWMMC=y CONFIG_ROCKCHIP_SDHCI=y CONFIG_PINCTRL=y CONFIG_ROCKCHIP_RK3399_PINCTRL=y -CONFIG_PWM_ROCKCHIP=y CONFIG_REGULATOR_PWM=y CONFIG_DM_REGULATOR_FIXED=y +CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_BASE=0xFF1A0000 diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig index d5452004b..eff5e15 100644 --- a/configs/fennec-rk3288_defconfig +++ b/configs/fennec-rk3288_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_FENNEC_RK3288=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-fennec" @@ -63,4 +64,3 @@ CONFIG_SYSRESET=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig index b5a68e2..6550c9e 100644 --- a/configs/ge_b450v3_defconfig +++ b/configs/ge_b450v3_defconfig @@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_GE_B450V3=y -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b450v3.dtb" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b450v3.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig index 7f4ba29..7cf1899 100644 --- a/configs/ge_b650v3_defconfig +++ b/configs/ge_b650v3_defconfig @@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_GE_B650V3=y -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b650v3.dtb" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b650v3.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig index db2609f..63025bc 100644 --- a/configs/ge_b850v3_defconfig +++ b/configs/ge_b850v3_defconfig @@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_GE_B850V3=y -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b850v3.dtb" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b850v3.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index fcf4934..5d3e073 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -1,44 +1,39 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_MX6Q_ICORE=y +CONFIG_SPL_EXT_SUPPORT=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC" +CONFIG_BOOTDELAY=3 CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb" -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" -CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SPL=y -CONFIG_BOOTDELAY=3 -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_DISPLAY_CPUINFO=y CONFIG_HUSH_PARSER=y -CONFIG_AUTO_COMPLETE=y -CONFIG_SYS_MAXARGS=32 -# CONFIG_CMD_IMLS is not set -# CONFIG_BLK is not set -# CONFIG_DM_MMC_OPS is not set +CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MMC=y CONFIG_CMD_GPIO=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_MMC=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_LIBFDT=y -CONFIG_FEC_MXC=y -CONFIG_MXC_UART=y +# CONFIG_BLK is not set +# CONFIG_DM_MMC_OPS is not set CONFIG_NETDEVICES=y -CONFIG_IMX_THERMAL=y +CONFIG_FEC_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y -CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SPL_GPIO_SUPPORT=y -CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_EXT_SUPPORT=y +CONFIG_MXC_UART=y +CONFIG_IMX_THERMAL=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index 4919d44..c7843c1 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -1,39 +1,34 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_MX6Q_ICORE=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND" +CONFIG_BOOTDELAY=3 CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb" -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" -CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SPL=y -CONFIG_BOOTDELAY=3 -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_DISPLAY_CPUINFO=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y -CONFIG_AUTO_COMPLETE=y -CONFIG_SYS_MAXARGS=32 -# CONFIG_CMD_IMLS is not set +CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_NAND=y CONFIG_CMD_GPIO=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_LIBFDT=y -CONFIG_FEC_MXC=y -CONFIG_MXC_UART=y -CONFIG_NAND_MXS=y -CONFIG_NETDEVICES=y -CONFIG_IMX_THERMAL=y # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set +CONFIG_NAND_MXS=y +CONFIG_NETDEVICES=y +CONFIG_FEC_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SPL_GPIO_SUPPORT=y -CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_DMA_SUPPORT=y +CONFIG_MXC_UART=y +CONFIG_IMX_THERMAL=y diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index c2d5d47..76226e9 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -4,6 +4,7 @@ CONFIG_OMAP44XX=y CONFIG_TARGET_KC1=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="kc1 # " CONFIG_CMD_BOOTZ=y @@ -31,4 +32,3 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y -# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 631d1f5..a4281c9 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y @@ -35,8 +36,7 @@ CONFIG_ROCKCHIP_RK3036_PINCTRL=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_RAM=y CONFIG_SYSRESET=y -CONFIG_CMD_DHRYSTONE=y -CONFIG_ERRNO_STR=y -CONFIG_CMD_USB=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CMD_DHRYSTONE=y +CONFIG_ERRNO_STR=y diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig index c83b2eb..252d45a 100644 --- a/configs/ls1012afrdm_qspi_defconfig +++ b/configs/ls1012afrdm_qspi_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_LS1012AFRDM=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-frdm" # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y @@ -34,4 +35,3 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y -CONFIG_QSPI_AHB_INIT=y diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index 27bccd1..e74141f 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_LS1012AQDS=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds" # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y @@ -38,4 +39,3 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y -CONFIG_QSPI_AHB_INIT=y diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig index 459682d..d5ed70f 100644 --- a/configs/ls1012ardb_qspi_defconfig +++ b/configs/ls1012ardb_qspi_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_LS1012ARDB=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb" # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y @@ -38,4 +39,3 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y -CONFIG_QSPI_AHB_INIT=y diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig index 6c9140b..21464cb 100644 --- a/configs/ls1021aiot_qspi_defconfig +++ b/configs/ls1021aiot_qspi_defconfig @@ -1,15 +1,15 @@ -CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_ARM=y -CONFIG_DM_SPI=y -CONFIG_DM=y +CONFIG_TARGET_LS1021AIOT=y +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" +CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_OF_CONTROL=y +CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_FSL_QSPI=y -CONFIG_TARGET_LS1021AIOT=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig index a5a391d..1369fe6 100644 --- a/configs/ls1021aiot_sdcard_defconfig +++ b/configs/ls1021aiot_sdcard_defconfig @@ -1,19 +1,18 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AIOT=y +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI" CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8 -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" -CONFIG_DM_SPI=y -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI" -CONFIG_CMD_DM=y -CONFIG_DM=y CONFIG_OF_CONTROL=y +CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_FSL_DSPI=y -CONFIG_FSL_QSPI=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y +CONFIG_FSL_QSPI=y diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig index 8b869fa..f3de25f 100644 --- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AQDS=y +CONFIG_SECURE_BOOT=y CONFIG_SYS_FSL_DDR3=y CONFIG_VIDEO=y # CONFIG_SYS_MALLOC_F is not set @@ -7,7 +8,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig index 946945f..746a66a 100644 --- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig @@ -1,12 +1,12 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021ATWR=y +CONFIG_SECURE_BOOT=y CONFIG_VIDEO=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 5e74645..6f22f1a 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021ATWR=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SECURE_BOOT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y @@ -14,7 +15,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=0 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig index b892e35..ae2efeb 100644 --- a/configs/ls1043ardb_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig index 25bb5f9..83ed0e0 100644 --- a/configs/ls1046aqds_lpuart_defconfig +++ b/configs/ls1046aqds_lpuart_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046AQDS=y -CONFIG_SYS_FSL_DDR4=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-lpuart" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y @@ -23,8 +22,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DM=y -CONFIG_DM_SPI=y CONFIG_SPI_FLASH=y -CONFIG_FSL_DSPI=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig index fa17373..a973cf4 100644 --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046ARDB=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y @@ -24,4 +25,3 @@ CONFIG_SPI_FLASH=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y -CONFIG_QSPI_AHB_INIT=y diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig index 0c70f92..1ed6e05 100644 --- a/configs/ls2080aqds_SECURE_BOOT_defconfig +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig @@ -7,7 +7,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y CONFIG_CMD_MMC=y diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig index 1d20175..848abbc 100644 --- a/configs/ls2080ardb_SECURE_BOOT_defconfig +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig @@ -7,7 +7,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A" -CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y CONFIG_CMD_MMC=y diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig index 888563b..1e273a6 100644 --- a/configs/miniarm-rk3288_defconfig +++ b/configs/miniarm-rk3288_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_MINIARM_RK3288=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm" @@ -62,4 +63,3 @@ CONFIG_SYSRESET=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 0706ddf..45d8a87 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -58,8 +58,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig index c3ab7c2..87d7fab 100644 --- a/configs/mx25pdk_defconfig +++ b/configs/mx25pdk_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_TARGET_MX25PDK=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg" -CONFIG_DEFAULT_FDT_FILE="imx25-pdk.dtb" CONFIG_BOOTDELAY=1 +CONFIG_DEFAULT_FDT_FILE="imx25-pdk.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig index fe0f106..886296b 100644 --- a/configs/mx53ard_defconfig +++ b/configs/mx53ard_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_TARGET_MX53ARD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg" -CONFIG_DEFAULT_FDT_FILE="imx53-ard.dtb" CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="imx53-ard.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig index 095e48d..56d35dd 100644 --- a/configs/mx6ull_14x14_evk_plugin_defconfig +++ b/configs/mx6ull_14x14_evk_plugin_defconfig @@ -21,11 +21,11 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y +# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y -# CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig index ef93522..e8ccbd3 100644 --- a/configs/mx7dsabresd_secure_defconfig +++ b/configs/mx7dsabresd_secure_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y @@ -34,6 +35,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_EON=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y @@ -45,6 +48,3 @@ CONFIG_G_DNL_MANUFACTURER="FSL" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y -CONFIG_SPI_FLASH=y -CONFIG_CMD_SF=y -CONFIG_SPI_FLASH_EON=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 3926552..727c13a 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_DM_PMIC=y CONFIG_PMIC_S2MPS11=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index f3ddc74..e250d16 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX77686=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 7b9826a..0d91ec1 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -37,4 +37,3 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Samsung" CONFIG_G_DNL_VENDOR_NUM=0x04e8 CONFIG_G_DNL_PRODUCT_NUM=0x6601 -CONFIG_DM_I2C=y diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index 0b074ec..0ff4c13 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000" CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set @@ -21,15 +20,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y # CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index 70e43a1..4dfb02d 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180" CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set @@ -21,15 +20,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y # CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index a114ce3..e49a42f 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571" CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Tegra210 (P2571) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set @@ -21,15 +20,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y # CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig index 61bb3a1..b4daa12 100644 --- a/configs/p2771-0000-000_defconfig +++ b/configs/p2771-0000-000_defconfig @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000" CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set @@ -18,15 +17,8 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y # CONFIG_BLK is not set CONFIG_TEGRA186_BPMP_I2C=y # CONFIG_DM_MMC_OPS is not set diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig index 79f4808..02e974d 100644 --- a/configs/p2771-0000-500_defconfig +++ b/configs/p2771-0000-500_defconfig @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500" CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y -CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set @@ -18,15 +17,8 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y # CONFIG_BLK is not set CONFIG_TEGRA186_BPMP_I2C=y # CONFIG_DM_MMC_OPS is not set diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index a39cfd2..41b3bcb 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_I2C_CROS_EC_TUNNEL=y CONFIG_I2C_MUX=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 4e00f19..770ab71 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_I2C_CROS_EC_TUNNEL=y CONFIG_I2C_MUX=y diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index dba67bb..8856afb 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -2,8 +2,8 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_PICO_IMX6UL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg" -CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb" CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 1e70ae0..663724e 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_POPMETAL_RK3288=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-popmetal" @@ -62,4 +63,3 @@ CONFIG_SYSRESET=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index f593110..4566d37 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -45,8 +45,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index e65fa78..f580d45 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -42,8 +42,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index eaf0e32..975714b 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -8,6 +8,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y +# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y @@ -42,8 +43,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y @@ -52,4 +53,3 @@ CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_STUB_64BIT=y -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 1883f07..9e332bc 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -1,7 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -# CONFIG_SPL_MMC_SUPPORT is not set CONFIG_ROCKCHIP_RK3288=y CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_ROCK2=y diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 8a786f1..931defc 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -8,8 +8,6 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained" CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" @@ -34,24 +32,24 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DM=y CONFIG_SPL_DM=y -CONFIG_BLK=y CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_CLK_AT91=y CONFIG_AT91_UTMI=y CONFIG_AT91_H32MX=y CONFIG_AT91_GENERIC_CLK=y +CONFIG_DM_GPIO=y CONFIG_ATMEL_PIO4=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_AT91=y CONFIG_DM_MMC=y -CONFIG_DM_MMC_OPS=y CONFIG_ATMEL_SDHCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_ATMEL=y CONFIG_DEBUG_UART_BASE=0xf8020000 @@ -62,8 +60,8 @@ CONFIG_ATMEL_USART=y CONFIG_DM_SPI=y CONFIG_ATMEL_SPI=y CONFIG_USB=y -CONFIG_USB_STORAGE=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index 51594e7..a04f9ea 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -7,8 +7,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained" CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH" @@ -33,24 +31,24 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DM=y CONFIG_SPL_DM=y -CONFIG_BLK=y CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_CLK_AT91=y CONFIG_AT91_UTMI=y CONFIG_AT91_H32MX=y CONFIG_AT91_GENERIC_CLK=y +CONFIG_DM_GPIO=y CONFIG_ATMEL_PIO4=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_AT91=y CONFIG_DM_MMC=y -CONFIG_DM_MMC_OPS=y CONFIG_ATMEL_SDHCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_ATMEL=y CONFIG_DEBUG_UART_BASE=0xf8020000 diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 93a70eb..0d77be7 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_SOUND=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 2141270..69f8d40 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -22,7 +22,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index d529a69..6f55503 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -5,6 +5,7 @@ CONFIG_OMAP34XX=y CONFIG_TARGET_SNIPER=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="sniper # " CONFIG_CMD_BOOTZ=y @@ -32,4 +33,3 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y -# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 5385495..19e6117 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_I2C_CROS_EC_LDO=y CONFIG_I2C_MUX=y diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 3980cf5..a3ba8c1 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -56,8 +56,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index bfd3265..d78588b 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_TPM_TEST=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_I2C_CROS_EC_LDO=y CONFIG_I2C_MUX=y diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig index bb161d4..f7d3fc2 100644 --- a/configs/stm32f429-discovery_defconfig +++ b/configs/stm32f429-discovery_defconfig @@ -7,7 +7,7 @@ CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " +# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIMER=y CONFIG_OF_LIBFDT=y -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 51cdcba..135c904 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -56,8 +56,8 @@ CONFIG_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_DM_VIDEO=y CONFIG_USB_KEYBOARD=y +CONFIG_DM_VIDEO=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index 0065647..e642475 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -54,5 +54,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_VIDEO_MVEBU=y -CONFIG_CFB_CONSOLE=y # CONFIG_VIDEO_SW_CURSOR is not set diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig index 8bb4697..a063047 100644 --- a/configs/theadorable_defconfig +++ b/configs/theadorable_defconfig @@ -43,7 +43,6 @@ CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_VIDEO_MVEBU=y -CONFIG_CFB_CONSOLE=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_REGEX=y CONFIG_LIB_RAND=y diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index ff7b826..fd623e0 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -4,8 +4,8 @@ CONFIG_TARGET_TQMA6=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb" CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index e6f99b1..6dc0941 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -5,8 +5,8 @@ CONFIG_TQMA6X_SPI_BOOT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb" CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index 33436fc..7b46177 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -5,8 +5,8 @@ CONFIG_TQMA6S=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb" CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 7805638..07e0491 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -6,8 +6,8 @@ CONFIG_TQMA6X_SPI_BOOT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb" CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig index 0f5950d..e5cfcc6 100644 --- a/configs/tqma6s_wru4_mmc_defconfig +++ b/configs/tqma6s_wru4_mmc_defconfig @@ -7,12 +7,12 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="imx6s-wru4.dtb" CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop autoboot\n" CONFIG_AUTOBOOT_ENCRYPTION=y CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068" -CONFIG_DEFAULT_FDT_FILE="imx6s-wru4.dtb" CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 3304afb..98679cf 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -10,8 +10,8 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" +CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set @@ -19,7 +19,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MMC=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_DHCP=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig index b1f64f1..9410703 100644 --- a/configs/vining_2000_defconfig +++ b/configs/vining_2000_defconfig @@ -3,7 +3,6 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_SAMTEC_VINING_2000=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/samtec/vining_2000/imximage.cfg" CONFIG_BOOTDELAY=0 -CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y @@ -28,4 +27,3 @@ CONFIG_PCI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y -CONFIG_MXC_USB_OTG_HACTIVE=y
On Wed, Dec 07, 2016 at 10:10:25PM +0900, Masahiro Yamada wrote:
Generated by "tools/moveconfig -s".
This will make config moves easier.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
Applied to u-boot/master, thanks!
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 ---
Changes in v2: - Fix doubled "help" - Add "default ARM || PPC ||SANDBOX"
configs/B4420QDS_NAND_defconfig | 1 + configs/B4420QDS_SPIFLASH_defconfig | 1 + configs/B4420QDS_defconfig | 1 + configs/B4860QDS_NAND_defconfig | 1 + configs/B4860QDS_SECURE_BOOT_defconfig | 1 + configs/B4860QDS_SPIFLASH_defconfig | 1 + configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/B4860QDS_defconfig | 1 + configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_NAND_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_defconfig | 1 + configs/C29XPCIE_NAND_defconfig | 1 + configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_defconfig | 1 + configs/C29XPCIE_defconfig | 1 + configs/CPCI2DP_defconfig | 1 + configs/CPCI4052_defconfig | 1 + configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MPC8313ERDB_33_defconfig | 1 + configs/MPC8313ERDB_66_defconfig | 1 + configs/MPC8313ERDB_NAND_33_defconfig | 1 + configs/MPC8313ERDB_NAND_66_defconfig | 1 + configs/MPC8315ERDB_defconfig | 1 + configs/MPC8323ERDB_defconfig | 1 + configs/MPC832XEMDS_ATM_defconfig | 1 + configs/MPC832XEMDS_HOST_33_defconfig | 1 + configs/MPC832XEMDS_HOST_66_defconfig | 1 + configs/MPC832XEMDS_SLAVE_defconfig | 1 + configs/MPC832XEMDS_defconfig | 1 + configs/MPC8349EMDS_defconfig | 1 + configs/MPC8349ITXGP_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MPC8540ADS_defconfig | 1 + configs/MPC8541CDS_defconfig | 1 + configs/MPC8541CDS_legacy_defconfig | 1 + configs/MPC8544DS_defconfig | 1 + configs/MPC8548CDS_36BIT_defconfig | 1 + configs/MPC8548CDS_defconfig | 1 + configs/MPC8548CDS_legacy_defconfig | 1 + configs/MPC8555CDS_defconfig | 1 + configs/MPC8555CDS_legacy_defconfig | 1 + configs/MPC8560ADS_defconfig | 1 + configs/MPC8568MDS_defconfig | 1 + configs/MPC8572DS_36BIT_defconfig | 1 + configs/MPC8572DS_defconfig | 1 + configs/MPC8610HPCD_defconfig | 1 + configs/MPC8641HPCN_36BIT_defconfig | 1 + configs/MPC8641HPCN_defconfig | 1 + configs/MiniFAP_defconfig | 1 + configs/O2D300_defconfig | 1 + configs/O2DNT2_RAMBOOT_defconfig | 1 + configs/O2DNT2_defconfig | 1 + configs/O2D_defconfig | 1 + configs/O2I_defconfig | 1 + configs/O2MNT_O2M110_defconfig | 1 + configs/O2MNT_O2M112_defconfig | 1 + configs/O2MNT_O2M113_defconfig | 1 + configs/O2MNT_defconfig | 1 + configs/O3DNT_defconfig | 1 + configs/P1023RDB_defconfig | 1 + configs/PATI_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/PLU405_defconfig | 1 + configs/PMC405DE_defconfig | 1 + configs/PMC440_defconfig | 1 + configs/TQM5200S_HIGHBOOT_defconfig | 1 + configs/TQM5200S_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM834x_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/VOM405_defconfig | 1 + configs/a3m071_defconfig | 1 + configs/a4m072_defconfig | 1 + configs/a4m2k_defconfig | 1 + configs/ac14xx_defconfig | 1 + configs/acadia_defconfig | 1 + configs/adp-ag101p_defconfig | 1 + configs/arches_defconfig | 1 + configs/aria_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/aspenite_defconfig | 1 + configs/at91rm9200ek_defconfig | 1 + configs/at91rm9200ek_ram_defconfig | 1 + configs/at91sam9260ek_dataflash_cs0_defconfig | 1 + configs/at91sam9260ek_dataflash_cs1_defconfig | 1 + configs/at91sam9260ek_nandflash_defconfig | 1 + configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 + configs/at91sam9g10ek_nandflash_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 + configs/at91sam9g20ek_nandflash_defconfig | 1 + configs/at91sam9xeek_dataflash_cs0_defconfig | 1 + configs/at91sam9xeek_dataflash_cs1_defconfig | 1 + configs/at91sam9xeek_nandflash_defconfig | 1 + configs/atngw100_defconfig | 1 + configs/atngw100mkii_defconfig | 1 + configs/atstk1002_defconfig | 1 + configs/axm_defconfig | 1 + configs/axs101_defconfig | 1 + configs/axs103_defconfig | 1 + configs/bamboo_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/bcm911360_entphn-ns_defconfig | 1 + configs/bcm911360_entphn_defconfig | 1 + configs/bcm911360k_defconfig | 1 + configs/bcm958300k-ns_defconfig | 1 + configs/bcm958300k_defconfig | 1 + configs/bcm958305k_defconfig | 1 + configs/bcm958622hr_defconfig | 1 + configs/bf518f-ezbrd_defconfig | 1 + configs/bf527-ad7160-eval_defconfig | 1 + configs/bf537-stamp_defconfig | 1 + configs/bf548-ezkit_defconfig | 1 + configs/bf609-ezkit_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/blanche_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/bubinga_defconfig | 1 + configs/caddy2_defconfig | 1 + configs/calimain_defconfig | 1 + configs/cam5200_defconfig | 1 + configs/cam5200_niosflash_defconfig | 1 + configs/canmb_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/charon_defconfig | 1 + configs/cm-bf537e_defconfig | 1 + configs/cm-bf537u_defconfig | 1 + configs/cm5200_defconfig | 1 + configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/corvus_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/d2net_v2_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/db-88f6720_defconfig | 1 + configs/db-88f6820-amc_defconfig | 1 + configs/db-mv784mp-gp_defconfig | 1 + configs/devconcenter_defconfig | 1 + configs/devkit3250_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/digsy_mtc_RAMBOOT_defconfig | 1 + configs/digsy_mtc_defconfig | 1 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 + configs/digsy_mtc_rev5_defconfig | 1 + configs/dlvision-10g_defconfig | 1 + configs/dlvision_defconfig | 1 + configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/ds414_defconfig | 1 + configs/ea20_defconfig | 1 + configs/edb9315a_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/espresso7420_defconfig | 1 + configs/flea3_defconfig | 1 + configs/fo300_defconfig | 1 + configs/galileo_defconfig | 1 + configs/gdppc440etx_defconfig | 1 + configs/glacier_defconfig | 1 + configs/glacier_ramboot_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/gplugd_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/h2200_defconfig | 1 + configs/haleakala_defconfig | 1 + configs/highbank_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/icon_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/imx31_phycore_defconfig | 1 + configs/imx31_phycore_eet_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/inka4x0_defconfig | 1 + configs/integratorap_cm720t_defconfig | 1 + configs/integratorap_cm920t_defconfig | 1 + configs/integratorap_cm926ejs_defconfig | 1 + configs/integratorap_cm946es_defconfig | 1 + configs/integratorcp_cm1136_defconfig | 1 + configs/integratorcp_cm920t_defconfig | 1 + configs/integratorcp_cm926ejs_defconfig | 1 + configs/integratorcp_cm946es_defconfig | 1 + configs/intip_defconfig | 1 + configs/io64_defconfig | 1 + configs/io_defconfig | 1 + configs/iocon_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/jupiter_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/katmai_defconfig | 1 + configs/kilauea_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/kzm9g_defconfig | 1 + configs/ls1012afrdm_qspi_defconfig | 1 + configs/ls2080a_emu_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/luan_defconfig | 1 + configs/lwmon5_defconfig | 1 + configs/makalu_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mecp5123_defconfig | 1 + configs/meesc_dataflash_defconfig | 1 + configs/meesc_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/mpc8308_p1m_defconfig | 1 + configs/munices_defconfig | 1 + configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_db-88f7040_defconfig | 1 + configs/mvebu_db-88f8040_defconfig | 1 + configs/mx31ads_defconfig | 1 + configs/mx31pdk_defconfig | 1 + configs/nas220_defconfig | 1 + configs/neo_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/odroid-c2_defconfig | 1 + configs/pcm030_LOWBOOT_defconfig | 1 + configs/pcm030_defconfig | 1 + configs/pdm360ng_defconfig | 1 + configs/pic32mzdask_defconfig | 1 + configs/pm9261_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 1 + configs/qemu-ppce500_defconfig | 1 + configs/rainier_defconfig | 1 + configs/rainier_ramboot_defconfig | 1 + configs/redwood_defconfig | 1 + configs/salvator-x_defconfig | 1 + configs/sama5d2_ptc_nandflash_defconfig | 1 + configs/sama5d2_ptc_spiflash_defconfig | 1 + configs/sama5d2_xplained_mmc_defconfig | 1 + configs/sama5d2_xplained_spiflash_defconfig | 1 + configs/sandbox_defconfig | 1 - configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 - configs/sbc8349_PCI_33_defconfig | 1 + configs/sbc8349_PCI_66_defconfig | 1 + configs/sbc8349_defconfig | 1 + configs/sbc8548_PCI_33_PCIE_defconfig | 1 + configs/sbc8548_PCI_33_defconfig | 1 + configs/sbc8548_PCI_66_PCIE_defconfig | 1 + configs/sbc8548_PCI_66_defconfig | 1 + configs/sbc8548_defconfig | 1 + configs/sbc8641d_defconfig | 1 + configs/sequoia_defconfig | 1 + configs/sequoia_ramboot_defconfig | 1 + configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/smdkc100_defconfig | 1 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socrates_defconfig | 1 + configs/spear300_defconfig | 1 + configs/spear300_nand_defconfig | 1 + configs/spear300_usbtty_defconfig | 1 + configs/spear300_usbtty_nand_defconfig | 1 + configs/spear310_defconfig | 1 + configs/spear310_nand_defconfig | 1 + configs/spear310_pnor_defconfig | 1 + configs/spear310_usbtty_defconfig | 1 + configs/spear310_usbtty_nand_defconfig | 1 + configs/spear310_usbtty_pnor_defconfig | 1 + configs/spear320_defconfig | 1 + configs/spear320_nand_defconfig | 1 + configs/spear320_pnor_defconfig | 1 + configs/spear320_usbtty_defconfig | 1 + configs/spear320_usbtty_nand_defconfig | 1 + configs/spear320_usbtty_pnor_defconfig | 1 + configs/spear600_defconfig | 1 + configs/spear600_nand_defconfig | 1 + configs/spear600_usbtty_defconfig | 1 + configs/spear600_usbtty_nand_defconfig | 1 + configs/stm32f429-discovery_defconfig | 1 + configs/stm32f746-disco_defconfig | 1 + configs/stv0991_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/sycamore_defconfig | 1 + configs/t3corp_defconfig | 1 + configs/taurus_defconfig | 1 + configs/tcm-bf537_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/theadorable_defconfig | 1 + configs/thunderx_88xx_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/uniphier_ld11_defconfig | 1 + configs/uniphier_ld20_defconfig | 1 + configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_pro4_defconfig | 1 + configs/uniphier_pxs2_ld6b_defconfig | 1 + configs/uniphier_sld3_defconfig | 1 + configs/usb_a9263_dataflash_defconfig | 1 + configs/v38b_defconfig | 1 + configs/ve8313_defconfig | 1 + configs/vexpress_aemv8a_dram_defconfig | 1 + configs/vexpress_aemv8a_juno_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/vme8349_defconfig | 1 + configs/walnut_defconfig | 1 + configs/work_92105_defconfig | 1 + configs/wtk_defconfig | 1 + configs/x600_defconfig | 1 + configs/xilinx-ppc405-generic_defconfig | 1 + configs/xilinx-ppc440-generic_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xpedite1000_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + configs/yellowstone_defconfig | 1 + configs/yosemite_defconfig | 1 + configs/yucca_defconfig | 1 + configs/zmx25_defconfig | 1 + configs/zynq_zc770_xm011_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + drivers/mmc/Kconfig | 10 +++++++--- include/configs/BSC9132QDS.h | 1 - include/configs/MPC8308RDB.h | 2 -- include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC837XERDB.h | 2 -- include/configs/MPC8536DS.h | 2 -- include/configs/MPC8569MDS.h | 2 -- include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 2 -- include/configs/P3041DS.h | 1 - include/configs/P4080DS.h | 1 - include/configs/P5020DS.h | 1 - include/configs/P5040DS.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 2 -- include/configs/T104xRDB.h | 2 -- include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 2 -- include/configs/T4240RDB.h | 2 -- include/configs/UCP1020.h | 2 -- include/configs/adp-ag101p.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/alt.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/apf27.h | 1 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/axs10x.h | 1 - include/configs/bayleybay.h | 1 - include/configs/bcm23550_w1d.h | 1 - include/configs/bcm28155_ap.h | 1 - include/configs/beaver.h | 1 - include/configs/bf518f-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf537-stamp.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/bf609-ezkit.h | 1 - include/configs/brppt1.h | 1 - include/configs/brxre1.h | 1 - include/configs/cardhu.h | 1 - include/configs/cei-tk1-som.h | 1 - include/configs/clearfog.h | 1 - include/configs/cm-bf537e.h | 1 - include/configs/cm-bf537u.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/colibri_t20.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/conga-qeval20-qa3-e3845.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/crownbay.h | 1 - include/configs/cyrus.h | 1 - include/configs/da850evm.h | 1 - include/configs/dalmore.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/dfi-bt700.h | 1 - include/configs/dragonboard410c.h | 1 - include/configs/e2220-1170.h | 1 - include/configs/edb93xx.h | 1 - include/configs/ethernut5.h | 1 - include/configs/exynos-common.h | 1 - include/configs/galileo.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gose.h | 1 - include/configs/harmony.h | 1 - include/configs/hikey.h | 1 - include/configs/hrcon.h | 1 - include/configs/imx27lite-common.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/k2g_evm.h | 1 - include/configs/kc1.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h | 1 - include/configs/legoev3.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/ls2080a_simu.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/m53evk.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/mcx.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/minnowmax.h | 1 - include/configs/mx25pdk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 2 -- include/configs/mx53ard.h | 1 - include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53smd.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/mxs.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/nyan-big.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/openrd.h | 1 - include/configs/p1_p2_rdb_pc.h | 2 -- include/configs/p1_twr.h | 2 -- include/configs/p2371-0000.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/p2571.h | 1 - include/configs/p2771-0000.h | 1 - include/configs/paz00.h | 1 - include/configs/pcm052.h | 1 - include/configs/pepper.h | 1 - include/configs/pic32mzdask.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/plutux.h | 1 - include/configs/porter.h | 1 - include/configs/pxa-common.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rpi.h | 1 - include/configs/s32v234evb.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/seaboard.h | 1 - include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sheevaplug.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/silk.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/sniper.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/stout.h | 1 - include/configs/strider.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/tcm-bf537.h | 1 - include/configs/tec-ng.h | 1 - include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 3 --- include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/tricorder.h | 1 - include/configs/trimslice.h | 1 - include/configs/ts4800.h | 2 -- include/configs/usbarmory.h | 1 - include/configs/venice2.h | 1 - include/configs/ventana.h | 1 - include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 1 - include/configs/vinco.h | 1 - include/configs/whistler.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zipitz2.h | 1 - include/configs/zynq-common.h | 1 - 555 files changed, 382 insertions(+), 199 deletions(-)
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig index dc5f5e3..5ee32b8 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 fcf683d..69e47a2 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 6c3c5ab..abc6a7c 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 28ffcb6..56e7318 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 69edc00..3a77f0d 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 94a07fa..9bebdf7 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 cb3e134..d832455 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 077ffd2..fd00b60 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 e88e234..8c1ab70 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 5c4d45d..f8de2e6 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 23a74c3..940b536 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 2c5d637..481fd92 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 9398844..e2490dc 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 737467d..801c10e 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 56e7066..0639457 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 43c88ee..dc536a7 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 c2b58d1..5d7f03e 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 1df74dd..2dfd63c 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 605d85f..b5135f7 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 591fca5..76d0ef4 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 eee1811..0c358f9 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 2fdffa9..2513632 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 56538cc..9d611fc 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 c64b4e8..79a9c27 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 a97f634..aa4a1c4 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 50fa786..4e2b705 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 5e5a2d0..043ab9b 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 690357e..7d59149 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 1fbd0fb..5a53b1d 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 0adc383..9a47c62 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 838e5e6..cdd3d77 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 e27314a..af617e6 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 28945a6..3a8844e 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 f1afcf8..e85ec16 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 10299f5..56e9607 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 4a63f49..8cdcf2b 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 e3cb0d5..6291111 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 1ea8800..fc0aa99 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 ae529d1..61eed37 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 705cc70..d160f04 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 5d834e6..65e937f 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 ee400a3..6842170 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 b733461..defdfc0 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 da42112..9f9168a 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 fb14891..51d17ad 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 67063c8..5a8cc26 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 2e7dceb..c6bc814 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 1239d08..b05496a 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 13df52e..19d3d33 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 9327955..563896d 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 d1f9e10..9bd0e3d 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 0672345..43a5290 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 f07aa3e..ff79c12 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 37fc2f6..36c55b6 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 19bbc26..b374c28 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 0cb9df5..00a713b 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 fcfedd5..9bc2342 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 cf69bde..2f3276c 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 5025ef3..57c9f7b 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 5428166..3afa43b 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 19543c9..a543a3b 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 10e5c70..859ba73 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 6333d63..c4f2f69 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 80fcfe1..3001575 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 a24dcb2..ae1c1b6 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 707b6c0..229448f 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 3ff7c85..fe26fed 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 ed285d5..fe96b07 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 cd2f0d2..8c4454e 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 8afa7ce..df873ee 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 c30c717..2a59758 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 564fa18..73ff161 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 ebad386..c0d5c4b 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 ac8c9b7..5868912 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 dfe47ed..9d0e915 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 f78b7f7..0c6b2d9 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 1524013..7081ed6 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 fed4d81..496dc06 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 b56d780..8b24dfb 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 028a0b8..0f711d1 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 983a37c..7a72ce9 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 731d7e4..b034a04 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 31ed1e0..05b4518 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 045bf01..5d8a088 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 4733f4a..023751d 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 4fa6a69..628d687 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 6cebdf4..d1cf91c 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 256a7e2..e0cf770 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 64e18f5..889de7b 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 5d1a7c4..97e4330 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 6944478..aaaf31a 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 250a90f..0cfdd98 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 bf4ac25..f68b966 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 e9510ff..da7719c 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 834d2b2..6c84fc6 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 69053d5..790d8a9 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 0def407..23ca68b 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 a869d2f..88bf4df 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 0f41645..d54708e 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 7d0a592..9409b8a 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 0dbb245..b4260a1 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 291fb0d..9674a04 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 7c00ede..39c1afe 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 d11b9a6..36423b2 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 4779d66..3b28172 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 25f9258..4f88507 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 502e1ea..6b26c78 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 f51a145..293009d 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 d44ef1b..4760c4e 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 00cbeeb..02cd5fa 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 70ef4ba..453a75d 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 2ba3703..0c82978 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 6d93ff9..4d94b84 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 8f1a682..cbe0376 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 998f863..1b53332 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 4085300..4092bfa 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 1f5e34a..5ff6902 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 d00843f..fea620c 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 52dbefd..be48af1 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 bfceedb..9c1ee73 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 df57568..1a5c97d 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 3e7f77c..db988c8 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 b8d8baf..04f5ffe 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 5e44633..54fad6d 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 e47d4ec..54b8380 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 1eb6142..419a10d 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 c2d04a6..adcc152 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 2937801..e49071d 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 00f6f13..8077c4a 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 dc26bf7..26d0b0b 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 00f6f13..8077c4a 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 00f6f13..8077c4a 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 c7b6d5d..c8679ac 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 7f30237..d5b6e6e 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 ccbb148..d26bd27 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 b691702..d06ed7e 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 19ac4e9..166b21a 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 b333c02..8fc0bf9 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 6c14965..319c3e2 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 fa6735d..8dcbdd2 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 f8d5539..31cd180 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 ea629f6..8a72e44 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 c2e454a..78dc4e1 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 7eee28a..33a221a 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 960ab55..3bf1aa7 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 27f1032..602988e 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 ae8e040..f4cf5c3 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 6f89b58..fb1f9ec 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 6b02a94..67d22b6 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 db636e1..d687c43 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 f4726b0..38c6d42 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 675a143..b09f31f 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 28f69e4..9144beb 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 2528db9..8a2e311 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 c373096..e33d371 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 5aa7234..be4986b 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 eeea7e5..87686aa 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 ead9685..8120b9d 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 8ec8bdf..20539d1 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 27ec656..5543be8 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 b3e2e1d..ffd9c50 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 6c3d7b5..6ce8786 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 4c4d031..2bbea13 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 f657ef6..efe1fc7 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 71fa0b7..795c061 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 20491a4..7bc2d62 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 0db5f92..76ffceb 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 713fa3d..2f9adcd 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 1731c5a..2a5af4b 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 3376abe..f8e96ac 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 2ab31fa..3a31a66 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 e263c5b..2b13f00 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 ec9ab9b..cb15755 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 34a4673..94d3c74 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 3950782..502d6f8 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 7e1cefd..bb6d3f1 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 6e7c5d8..9e8c6bb 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 036935e..df054d6 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 22267bb..39837e9 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 c5ccbd6..1dec625 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 faeafc4..dd2f965 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 0220357..32c3237 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 3fc9261..2a5a484 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 eb57e28..0343128 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 2d55ede..31c9d0b 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 46527e5..57a4c78 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 59c9fdf..dcd309d 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 43127de..73a1213 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 a47159a..e7afd81 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 44471cc..2447cdd 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 b4f3975..b1c8afd 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 4260245..9c95b47 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 9a9544b..39ae1f3 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 5b570b7..d869628 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 3684418..fd43503 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 136b9d1..d555c8a 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 39fd439..eb56222 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 ba7f959..bbe20a1 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 fe033c6..cf21cfb 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 7ddb47d..acef437 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 d9d66f4..fe084db 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 81e5fe4..b4bfa6a 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 1b3c6f8..4ada1f5 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 29b1cd5..be08259 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 35da8c7..ef4bbb5 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 e99cd80..3641279 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 02bc0f3..8964a09 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 c833eba..c929277 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 635475e..2791557 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 e6e205a..1c9323a 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 787e760..175979d 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 f80b059..258ffe6 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 215e9fd..a4a637f 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 416f50f..1558ab1 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 ffa1c4a..835d0c9 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 8b0e00f..34defa8 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 6424ec7..75bcd9f 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 b2cfe83..703347e 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 20e4487..c57dc1b 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 a3535dd..ff3d14c 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 e7461bb..1fdf0ac 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 b2dd27b..6c03603 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 02a352a..9b3061c 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 d5d6378..82ba9c1 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 bd718f2..6e4e73e 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 e845a72..c4e20f4 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 39a85e1..6f18dbc 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 b266631..634b808 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 2a301dc..cc80834 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 29a439a..af3fbe4 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 924c1b9..400601b 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 81b98db..7708b11 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 ef93ec0..8082a22 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 898de4a..a51db85 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 cef97ce..2013350 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 ba75147..f764962 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 252d45a..9b2ca4f 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 760557a..b0508a5 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 6a8e690..b6d95e9 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 cae0deb..1da81b9 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 95cb1d7..8e01f68 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 968b391..dab49e7 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 eff9fc7..a04a934 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 93b0367..39992e8 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 903f6f2..3612416 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 b214a92..5c25eeb 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 727d193..8b42500 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 c964236..779a9c5 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 becc257..8179922 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 832ff49..8004d78 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 45d8a87..2cacf5b 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 db6ac35..d5c9317 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 34e271b..fff0e9b 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 1bd7b5c..4007351 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 a1fdcf2..a45c9b7 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 f32bbad..b47c2b3 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 b7a1645..0605174 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 f153b9c..b3f973e 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 61d58b5..0ac5efe 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 b4c2ad3..2a098ee 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 a31ad5b..bb1f121 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 3000d72..9d42a03 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 29c7fc2..2dd2f6e 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 802879b..0fb0cde 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 f42c49a..72f761a 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 3ec5e63..3eb1188 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 11e453c..16f544c 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 b8ccecd..5b5954b 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 add5e07..7233354 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 9db718c..7d0b2b1 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 ddf7dde..3e39dc0 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 d3181c8..fdb0d1b 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 b1c8f5d..52b5d6f 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 bcbb4d2..d98f299 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 da7c44e..6bc5f6f 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 786a13a..1a3de43 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 5b0fade..8561097 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 1882995..b98093e 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 acc359e..4da0cea 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 c3df65a..6413567 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 04fce58..c76b7b9 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 e4af2e9..7bb948d 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 62a7453..9fdfd7d 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 9df4867..bf8f7c7 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 04bd12b..5d977bd 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 1e8825e..29238a3 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 931defc..525e08b 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 a04f9ea..939fc8e 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 7568bdf..8ac231d 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 833caf1..a9456cc 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 e594797..f4b656c 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 8fb5a35..201c9ed 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 3deec7c..afc4d10 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 31ef79a..cafc16d 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 b7eae97..3af5c70 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 dd974e8..671b35d 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 c20021b..61b7470 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 53f6022..8c8b38d 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 3efb720..fe2a6b9 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 d55e178..24305da 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 75eb727..33261b8 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 e3f3078..000be91 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 73b1ac6..ae5e038 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 e0037a6..f8b9d86 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 a80c10c..b12c11e 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 c0fe23a..eab598e 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 6bfe26c..b69f5d4 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 7cd5f57..d66635d 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 1bd4426..416f543 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 a0f04d0..5ac6c49 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 3da85b4..078a797 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 8337dee..30a00c6 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 eb3ec56..0af3a45 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 d00b0bf..b517b1b 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 657724c..a33459a 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 2f47557..9c9a8ab 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 4f35dae..8da365e 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 27bc87c..1ff5fea 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 e9767da..1f20e45 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 5bf1070..2490ac3 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 8b79a6a..3ebae7b 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 588519c..60feb7e 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 c6230ae..0a481e4 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 3008620..b3e2725 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 678525a..a729980 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 a579e2b..858ee65 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 d3e0b6c..fea3027 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 9eb6494..acd1542 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 e4a149b..6e0a912 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 252c789..f42f1a8 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 8a2c133..b736dc8 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 f7d3fc2..c554d2d 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 6d71d0a..55b9eba 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 c728182..f808ce2 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 b9d392a..cd5e1cb 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 f2c4721..b19146b 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 9257e0b..84372a9 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 ca80bd6..793de29 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 8459390..fd2e76e 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 135c904..70dbe72 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 e642475..b97c128 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 a063047..3c2e140 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 a752b22..196bf6f 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 af70832..c2b8ba8 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 db34666..83fb28e 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 c0ac5ac..84225e0 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index 3e802d3..26a1bf8 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index b141561..f5d98d8 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index f71ef56..f45485b 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index ba3867f..f17b22f 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 3568f7a..70e3193 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_SPL_NOR_SUPPORT=y diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index c640aa7..8ec623b 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 17c1f7f..fb198b6 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 faeb15c..9d1090b 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 b545832..9fa1095 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 71b40ee..ae0a691 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 9417682..97505da 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 b23f235..4213e8a 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 f2c4721..b19146b 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 ca3b731..a705e8b 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 f98be1f..fa2eea0 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 65b7d95..4b47fc6 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 ec12dbe..f686fe9 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 464bee1..ef28222 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 f8f596f..d0b19f4 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 f023c73..ee98fc5 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 2839bc6..731466e 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 c3b91f4..8763be8 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 5ababef..e38e1da 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 b6d3c8a..e186c7e 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 5b1e4bc..c26c844 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 0d15583..c77cd22 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 935bc5c..ee04b00 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 8c46e16..5eef16a 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 2f4fc1e..247fb6d 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 d3116e1..8e80a90 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 add038c..286f0bd 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 5e84a41..9bd511c 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 5cfdbb2..6663a92 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 6335c55..753ce13 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 adc3193..f86b008 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 48e06af..d843bd1 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 d8f7961..b17a6c5 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 bd52054..bd15645 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 78e0064..4d0ae9d 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 81e8c29..169f94a 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 91e5f8b..7a3fa03 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 52ef432..e32cdde 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 65ec8f7..a6fa6a8 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 17e941e..0a8c387 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 078e60c..5933fc0 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 fda83d2..303c73b 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 054b323..e451851 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 00676dd..7779c31 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 7521dd0..41cb43c 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 b984fcd..878dbed 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 e013e72..ee27a8f 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 d90fb35..78ad86c 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 fd5dbc5..5b3c6fa 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 c194ec7..0775603 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 5cb79f1..93fa614 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 3626636..99f9ef7 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 7d6ec78..726e6d6 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 07ef9e9..ad0de2c8 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 ad56d24..3247a4a 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_t30.h b/include/configs/apalis_t30.h index f2a24c1..12a2877 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 b903ba5..e9d8232 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 e1f934c..f07366e 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 cc1695e..6806cc7 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 fd0504d..12a92c2 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 b825464..9c9e809 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 23184ce..b5aebe6 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 843f03a..6dee45a 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 a0f451b..00a8c79 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 4d9282a..d1f61b3 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 9ddfff2..3d17ae1 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 b99248e..296fbd1 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 408c0f5..8a4950f 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 eb4c497..f822f48 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 7a75fdb..9d06dad 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 ab1ab14..2e43a09 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 510cd47..43e4971 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 258115a..40ca18d 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 4f861aa..6517705 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 9376283..b79aa2b 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 4deb2d2..337bb0a 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 a5fdbbb..eb2419c 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 a6369d6..ac338c4 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 462b784..b7df2bc 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 f3bb279..6eed4bc 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 c976ec8..e3735f7 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 78841cd..32229d2 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 5785ebd..dc2eabd 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 da5a4b3..1ce27e3 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 1e2a477..bae9697 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_t20.h b/include/configs/colibri_t20.h index 6a52869..e9db97f 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 e8b3f99..4d13856 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 d58145e..ea1fa39 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -58,7 +58,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 5ef999c..cc19148 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 971549e..e0290e7 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 55aa03b..f863810 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 45caf9f..0307b14 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 18a8e26..ceb9cea 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 b0311bf..04ab48d 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 b8c5232..7333e48 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 75e1d1c..c11e581 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 1b440ea..cbc6126 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 c9e8c8e..d4aca55 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 7053795..a83c617 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 b4a0388..c78eebf 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 3b61a41..29b02a0 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -42,7 +42,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 6d25035..b87b04d 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 2560c88..0039c8c 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 23707ed..45395cd 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 3d6b5fc..cf3c493 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 7a03d0f..c725833 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 9677aab..9f07657 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 14c43b8..30168bc 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 90e282f..c1fa2c6 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 2da0d8d..e9e69a7 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 76f2b8b..7a4ba09 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 a1d96ff..c7aa7cc 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 664999c..a7894ca 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 f2f82ac..3b118bb 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 0cc1791..b5b4d7e 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 15410dd..f35fd31 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 7af4bc4..ae8ee24 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 128da8a..6f857a7 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 1458332..b48cd00 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 c1e3ec6..3e70464 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 3887faa..40e6af8 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 f0ec6c4..07be30c 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 838568f..37d5704 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 31df781..713e86b 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 7e05bfd..8ec98fd 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 91037d6..de83d6c 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 0c6b1e8..f15abd3 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 ae7ca3b..d42976b 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 3aa22d2..2922271 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 81826ea..3853c05 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 3f064fd..c0fb8d1 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 3c1d53f..b62360b 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 27e7738..d84d524 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/mx53evk.h b/include/configs/mx53evk.h index 7a896c7..aa82928 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 6cc5d9c..6cc5f0f 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 262a913..ad4964c 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 d28654b..ecce08e 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -81,7 +81,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 0645228..4348b43 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 df0cc23..04c3ce9 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 ce74322..99ce60f 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 c548ee1..ae49054 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 6388a9c..1a67584 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 7c2f414..b00ab90 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -327,7 +327,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 908a1af..c21b849 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 c20ef5e..8668495 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 5ff2e35..a9b2020 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 968b89e..cd981b9 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 9cf697f..7ff545c 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 4fa345d..7daaf8e 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 67a1603..0864e4d 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 a8bb3ff..0cefee3 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 eb1944a..4ab1a21 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -66,7 +66,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 d9c84f2..2aa63fc 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 52b7a2a..57b91e7 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 a214c4d..2bd7076 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 9051c1c..20fb036 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 635e439..8ad5af1 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 7d8a095..ccaa796 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 3fa7739..4598bd9 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 92be29e..27dfbce 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 5358372..535797a 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 aa646c6..394ec40 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 4406366..b105fc1 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 9f85fdc..c55f6b9 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 6a5425a..c1057aa 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 f48559e..b840315 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 ed91bdc..831a45c 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 5d78847..bcd5c37 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 498b32b..9009730 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 2b6509a..3ee6555 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 67ca4a6..e2af82d 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 d77b470..0859109 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 efb7ad9..05b5faa 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 748a2ea..9f22d4c 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 4564296..e4d0ad9 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 19c6297..a343cd1 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 c76c55f..a19a38b 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 e12b101..0a3d242 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 58a6550..2c40827 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 e3b9325..0d9e4aa 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 6604cec..9733299 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 ff0c60d..44201a2 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 a873e7b..03fc42c 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 c294f70..97aa046 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 0e9d98c..067e171 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 7b14299..c03dabf 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 a9990b7..5144d5a 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 6a5ed19..86ab1e0 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 5db4c60..d909f25 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 d13fc94..dbe494a 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 cfb4b30..28a80f5 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 07a92eb..1c36d07 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 cfc8451..ff00614 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 2e5f38d..9050ae4 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 b2d54d5..904b772 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 72fa973..7c7b200 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 7a38869..f5459a8 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 a8eba31..0bc4ea5 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 af5ba61..56017b9 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -65,7 +65,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 0f3fc8f..07fe616 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 0cd892e..ffd9a2c 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 50495bf..4aaeea9 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 d480990..9225e5d 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 97dfc0e..a30aefb 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 953e731..01e2fca 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
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
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
Reviewd-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
Changes in v2:
- Fix doubled "help"
- Add "default ARM || PPC ||SANDBOX"
configs/B4420QDS_NAND_defconfig | 1 + configs/B4420QDS_SPIFLASH_defconfig | 1 + configs/B4420QDS_defconfig | 1 + configs/B4860QDS_NAND_defconfig | 1 + configs/B4860QDS_SECURE_BOOT_defconfig | 1 + configs/B4860QDS_SPIFLASH_defconfig | 1 + configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/B4860QDS_defconfig | 1 + configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_NAND_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_defconfig | 1 + configs/C29XPCIE_NAND_defconfig | 1 + configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_defconfig | 1 + configs/C29XPCIE_defconfig | 1 + configs/CPCI2DP_defconfig | 1 + configs/CPCI4052_defconfig | 1 + configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MPC8313ERDB_33_defconfig | 1 + configs/MPC8313ERDB_66_defconfig | 1 + configs/MPC8313ERDB_NAND_33_defconfig | 1 + configs/MPC8313ERDB_NAND_66_defconfig | 1 + configs/MPC8315ERDB_defconfig | 1 + configs/MPC8323ERDB_defconfig | 1 + configs/MPC832XEMDS_ATM_defconfig | 1 + configs/MPC832XEMDS_HOST_33_defconfig | 1 + configs/MPC832XEMDS_HOST_66_defconfig | 1 + configs/MPC832XEMDS_SLAVE_defconfig | 1 + configs/MPC832XEMDS_defconfig | 1 + configs/MPC8349EMDS_defconfig | 1 + configs/MPC8349ITXGP_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MPC8540ADS_defconfig | 1 + configs/MPC8541CDS_defconfig | 1 + configs/MPC8541CDS_legacy_defconfig | 1 + configs/MPC8544DS_defconfig | 1 + configs/MPC8548CDS_36BIT_defconfig | 1 + configs/MPC8548CDS_defconfig | 1 + configs/MPC8548CDS_legacy_defconfig | 1 + configs/MPC8555CDS_defconfig | 1 + configs/MPC8555CDS_legacy_defconfig | 1 + configs/MPC8560ADS_defconfig | 1 + configs/MPC8568MDS_defconfig | 1 + configs/MPC8572DS_36BIT_defconfig | 1 + configs/MPC8572DS_defconfig | 1 + configs/MPC8610HPCD_defconfig | 1 + configs/MPC8641HPCN_36BIT_defconfig | 1 + configs/MPC8641HPCN_defconfig | 1 + configs/MiniFAP_defconfig | 1 + configs/O2D300_defconfig | 1 + configs/O2DNT2_RAMBOOT_defconfig | 1 + configs/O2DNT2_defconfig | 1 + configs/O2D_defconfig | 1 + configs/O2I_defconfig | 1 + configs/O2MNT_O2M110_defconfig | 1 + configs/O2MNT_O2M112_defconfig | 1 + configs/O2MNT_O2M113_defconfig | 1 + configs/O2MNT_defconfig | 1 + configs/O3DNT_defconfig | 1 + configs/P1023RDB_defconfig | 1 + configs/PATI_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/PLU405_defconfig | 1 + configs/PMC405DE_defconfig | 1 + configs/PMC440_defconfig | 1 + configs/TQM5200S_HIGHBOOT_defconfig | 1 + configs/TQM5200S_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM834x_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/VOM405_defconfig | 1 + configs/a3m071_defconfig | 1 + configs/a4m072_defconfig | 1 + configs/a4m2k_defconfig | 1 + configs/ac14xx_defconfig | 1 + configs/acadia_defconfig | 1 + configs/adp-ag101p_defconfig | 1 + configs/arches_defconfig | 1 + configs/aria_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/aspenite_defconfig | 1 + configs/at91rm9200ek_defconfig | 1 + configs/at91rm9200ek_ram_defconfig | 1 + configs/at91sam9260ek_dataflash_cs0_defconfig | 1 + configs/at91sam9260ek_dataflash_cs1_defconfig | 1 + configs/at91sam9260ek_nandflash_defconfig | 1 + configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 + configs/at91sam9g10ek_nandflash_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 + configs/at91sam9g20ek_nandflash_defconfig | 1 + configs/at91sam9xeek_dataflash_cs0_defconfig | 1 + configs/at91sam9xeek_dataflash_cs1_defconfig | 1 + configs/at91sam9xeek_nandflash_defconfig | 1 + configs/atngw100_defconfig | 1 + configs/atngw100mkii_defconfig | 1 + configs/atstk1002_defconfig | 1 + configs/axm_defconfig | 1 + configs/axs101_defconfig | 1 + configs/axs103_defconfig | 1 + configs/bamboo_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/bcm911360_entphn-ns_defconfig | 1 + configs/bcm911360_entphn_defconfig | 1 + configs/bcm911360k_defconfig | 1 + configs/bcm958300k-ns_defconfig | 1 + configs/bcm958300k_defconfig | 1 + configs/bcm958305k_defconfig | 1 + configs/bcm958622hr_defconfig | 1 + configs/bf518f-ezbrd_defconfig | 1 + configs/bf527-ad7160-eval_defconfig | 1 + configs/bf537-stamp_defconfig | 1 + configs/bf548-ezkit_defconfig | 1 + configs/bf609-ezkit_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/blanche_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/bubinga_defconfig | 1 + configs/caddy2_defconfig | 1 + configs/calimain_defconfig | 1 + configs/cam5200_defconfig | 1 + configs/cam5200_niosflash_defconfig | 1 + configs/canmb_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/charon_defconfig | 1 + configs/cm-bf537e_defconfig | 1 + configs/cm-bf537u_defconfig | 1 + configs/cm5200_defconfig | 1 + configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/corvus_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/d2net_v2_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/db-88f6720_defconfig | 1 + configs/db-88f6820-amc_defconfig | 1 + configs/db-mv784mp-gp_defconfig | 1 + configs/devconcenter_defconfig | 1 + configs/devkit3250_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/digsy_mtc_RAMBOOT_defconfig | 1 + configs/digsy_mtc_defconfig | 1 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 + configs/digsy_mtc_rev5_defconfig | 1 + configs/dlvision-10g_defconfig | 1 + configs/dlvision_defconfig | 1 + configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/ds414_defconfig | 1 + configs/ea20_defconfig | 1 + configs/edb9315a_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/espresso7420_defconfig | 1 + configs/flea3_defconfig | 1 + configs/fo300_defconfig | 1 + configs/galileo_defconfig | 1 + configs/gdppc440etx_defconfig | 1 + configs/glacier_defconfig | 1 + configs/glacier_ramboot_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/gplugd_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/h2200_defconfig | 1 + configs/haleakala_defconfig | 1 + configs/highbank_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/icon_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/imx31_phycore_defconfig | 1 + configs/imx31_phycore_eet_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/inka4x0_defconfig | 1 + configs/integratorap_cm720t_defconfig | 1 + configs/integratorap_cm920t_defconfig | 1 + configs/integratorap_cm926ejs_defconfig | 1 + configs/integratorap_cm946es_defconfig | 1 + configs/integratorcp_cm1136_defconfig | 1 + configs/integratorcp_cm920t_defconfig | 1 + configs/integratorcp_cm926ejs_defconfig | 1 + configs/integratorcp_cm946es_defconfig | 1 + configs/intip_defconfig | 1 + configs/io64_defconfig | 1 + configs/io_defconfig | 1 + configs/iocon_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/jupiter_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/katmai_defconfig | 1 + configs/kilauea_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/kzm9g_defconfig | 1 + configs/ls1012afrdm_qspi_defconfig | 1 + configs/ls2080a_emu_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/luan_defconfig | 1 + configs/lwmon5_defconfig | 1 + configs/makalu_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mecp5123_defconfig | 1 + configs/meesc_dataflash_defconfig | 1 + configs/meesc_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/mpc8308_p1m_defconfig | 1 + configs/munices_defconfig | 1 + configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_db-88f7040_defconfig | 1 + configs/mvebu_db-88f8040_defconfig | 1 + configs/mx31ads_defconfig | 1 + configs/mx31pdk_defconfig | 1 + configs/nas220_defconfig | 1 + configs/neo_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/odroid-c2_defconfig | 1 + configs/pcm030_LOWBOOT_defconfig | 1 + configs/pcm030_defconfig | 1 + configs/pdm360ng_defconfig | 1 + configs/pic32mzdask_defconfig | 1 + configs/pm9261_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 1 + configs/qemu-ppce500_defconfig | 1 + configs/rainier_defconfig | 1 + configs/rainier_ramboot_defconfig | 1 + configs/redwood_defconfig | 1 + configs/salvator-x_defconfig | 1 + configs/sama5d2_ptc_nandflash_defconfig | 1 + configs/sama5d2_ptc_spiflash_defconfig | 1 + configs/sama5d2_xplained_mmc_defconfig | 1 + configs/sama5d2_xplained_spiflash_defconfig | 1 + configs/sandbox_defconfig | 1 - configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 - configs/sbc8349_PCI_33_defconfig | 1 + configs/sbc8349_PCI_66_defconfig | 1 + configs/sbc8349_defconfig | 1 + configs/sbc8548_PCI_33_PCIE_defconfig | 1 + configs/sbc8548_PCI_33_defconfig | 1 + configs/sbc8548_PCI_66_PCIE_defconfig | 1 + configs/sbc8548_PCI_66_defconfig | 1 + configs/sbc8548_defconfig | 1 + configs/sbc8641d_defconfig | 1 + configs/sequoia_defconfig | 1 + configs/sequoia_ramboot_defconfig | 1 + configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/smdkc100_defconfig | 1 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socrates_defconfig | 1 + configs/spear300_defconfig | 1 + configs/spear300_nand_defconfig | 1 + configs/spear300_usbtty_defconfig | 1 + configs/spear300_usbtty_nand_defconfig | 1 + configs/spear310_defconfig | 1 + configs/spear310_nand_defconfig | 1 + configs/spear310_pnor_defconfig | 1 + configs/spear310_usbtty_defconfig | 1 + configs/spear310_usbtty_nand_defconfig | 1 + configs/spear310_usbtty_pnor_defconfig | 1 + configs/spear320_defconfig | 1 + configs/spear320_nand_defconfig | 1 + configs/spear320_pnor_defconfig | 1 + configs/spear320_usbtty_defconfig | 1 + configs/spear320_usbtty_nand_defconfig | 1 + configs/spear320_usbtty_pnor_defconfig | 1 + configs/spear600_defconfig | 1 + configs/spear600_nand_defconfig | 1 + configs/spear600_usbtty_defconfig | 1 + configs/spear600_usbtty_nand_defconfig | 1 + configs/stm32f429-discovery_defconfig | 1 + configs/stm32f746-disco_defconfig | 1 + configs/stv0991_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/sycamore_defconfig | 1 + configs/t3corp_defconfig | 1 + configs/taurus_defconfig | 1 + configs/tcm-bf537_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/theadorable_defconfig | 1 + configs/thunderx_88xx_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/uniphier_ld11_defconfig | 1 + configs/uniphier_ld20_defconfig | 1 + configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_pro4_defconfig | 1 + configs/uniphier_pxs2_ld6b_defconfig | 1 + configs/uniphier_sld3_defconfig | 1 + configs/usb_a9263_dataflash_defconfig | 1 + configs/v38b_defconfig | 1 + configs/ve8313_defconfig | 1 + configs/vexpress_aemv8a_dram_defconfig | 1 + configs/vexpress_aemv8a_juno_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/vme8349_defconfig | 1 + configs/walnut_defconfig | 1 + configs/work_92105_defconfig | 1 + configs/wtk_defconfig | 1 + configs/x600_defconfig | 1 + configs/xilinx-ppc405-generic_defconfig | 1 + configs/xilinx-ppc440-generic_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xpedite1000_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + configs/yellowstone_defconfig | 1 + configs/yosemite_defconfig | 1 + configs/yucca_defconfig | 1 + configs/zmx25_defconfig | 1 + configs/zynq_zc770_xm011_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + drivers/mmc/Kconfig | 10 +++++++--- include/configs/BSC9132QDS.h | 1 - include/configs/MPC8308RDB.h | 2 -- include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC837XERDB.h | 2 -- include/configs/MPC8536DS.h | 2 -- include/configs/MPC8569MDS.h | 2 -- include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 2 -- include/configs/P3041DS.h | 1 - include/configs/P4080DS.h | 1 - include/configs/P5020DS.h | 1 - include/configs/P5040DS.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 2 -- include/configs/T104xRDB.h | 2 -- include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 2 -- include/configs/T4240RDB.h | 2 -- include/configs/UCP1020.h | 2 -- include/configs/adp-ag101p.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/alt.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/apf27.h | 1 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/axs10x.h | 1 - include/configs/bayleybay.h | 1 - include/configs/bcm23550_w1d.h | 1 - include/configs/bcm28155_ap.h | 1 - include/configs/beaver.h | 1 - include/configs/bf518f-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf537-stamp.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/bf609-ezkit.h | 1 - include/configs/brppt1.h | 1 - include/configs/brxre1.h | 1 - include/configs/cardhu.h | 1 - include/configs/cei-tk1-som.h | 1 - include/configs/clearfog.h | 1 - include/configs/cm-bf537e.h | 1 - include/configs/cm-bf537u.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/colibri_t20.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/conga-qeval20-qa3-e3845.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/crownbay.h | 1 - include/configs/cyrus.h | 1 - include/configs/da850evm.h | 1 - include/configs/dalmore.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/dfi-bt700.h | 1 - include/configs/dragonboard410c.h | 1 - include/configs/e2220-1170.h | 1 - include/configs/edb93xx.h | 1 - include/configs/ethernut5.h | 1 - include/configs/exynos-common.h | 1 - include/configs/galileo.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gose.h | 1 - include/configs/harmony.h | 1 - include/configs/hikey.h | 1 - include/configs/hrcon.h | 1 - include/configs/imx27lite-common.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/k2g_evm.h | 1 - include/configs/kc1.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h | 1 - include/configs/legoev3.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/ls2080a_simu.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/m53evk.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/mcx.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/minnowmax.h | 1 - include/configs/mx25pdk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 2 -- include/configs/mx53ard.h | 1 - include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53smd.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/mxs.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/nyan-big.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/openrd.h | 1 - include/configs/p1_p2_rdb_pc.h | 2 -- include/configs/p1_twr.h | 2 -- include/configs/p2371-0000.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/p2571.h | 1 - include/configs/p2771-0000.h | 1 - include/configs/paz00.h | 1 - include/configs/pcm052.h | 1 - include/configs/pepper.h | 1 - include/configs/pic32mzdask.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/plutux.h | 1 - include/configs/porter.h | 1 - include/configs/pxa-common.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rpi.h | 1 - include/configs/s32v234evb.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/seaboard.h | 1 - include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sheevaplug.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/silk.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/sniper.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/stout.h | 1 - include/configs/strider.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/tcm-bf537.h | 1 - include/configs/tec-ng.h | 1 - include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 3 --- include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/tricorder.h | 1 - include/configs/trimslice.h | 1 - include/configs/ts4800.h | 2 -- include/configs/usbarmory.h | 1 - include/configs/venice2.h | 1 - include/configs/ventana.h | 1 - include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 1 - include/configs/vinco.h | 1 - include/configs/whistler.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zipitz2.h | 1 - include/configs/zynq-common.h | 1 - 555 files changed, 382 insertions(+), 199 deletions(-)
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig index dc5f5e3..5ee32b8 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 fcf683d..69e47a2 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 6c3c5ab..abc6a7c 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 28ffcb6..56e7318 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 69edc00..3a77f0d 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 94a07fa..9bebdf7 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 cb3e134..d832455 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 077ffd2..fd00b60 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 e88e234..8c1ab70 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 5c4d45d..f8de2e6 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 23a74c3..940b536 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 2c5d637..481fd92 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 9398844..e2490dc 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 737467d..801c10e 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 56e7066..0639457 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 43c88ee..dc536a7 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 c2b58d1..5d7f03e 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 1df74dd..2dfd63c 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 605d85f..b5135f7 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 591fca5..76d0ef4 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 eee1811..0c358f9 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 2fdffa9..2513632 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 56538cc..9d611fc 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 c64b4e8..79a9c27 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 a97f634..aa4a1c4 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 50fa786..4e2b705 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 5e5a2d0..043ab9b 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 690357e..7d59149 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 1fbd0fb..5a53b1d 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 0adc383..9a47c62 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 838e5e6..cdd3d77 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 e27314a..af617e6 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 28945a6..3a8844e 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 f1afcf8..e85ec16 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 10299f5..56e9607 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 4a63f49..8cdcf2b 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 e3cb0d5..6291111 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 1ea8800..fc0aa99 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 ae529d1..61eed37 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 705cc70..d160f04 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 5d834e6..65e937f 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 ee400a3..6842170 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 b733461..defdfc0 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 da42112..9f9168a 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 fb14891..51d17ad 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 67063c8..5a8cc26 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 2e7dceb..c6bc814 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 1239d08..b05496a 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 13df52e..19d3d33 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 9327955..563896d 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 d1f9e10..9bd0e3d 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 0672345..43a5290 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 f07aa3e..ff79c12 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 37fc2f6..36c55b6 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 19bbc26..b374c28 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 0cb9df5..00a713b 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 fcfedd5..9bc2342 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 cf69bde..2f3276c 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 5025ef3..57c9f7b 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 5428166..3afa43b 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 19543c9..a543a3b 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 10e5c70..859ba73 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 6333d63..c4f2f69 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 80fcfe1..3001575 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 a24dcb2..ae1c1b6 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 707b6c0..229448f 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 3ff7c85..fe26fed 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 ed285d5..fe96b07 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 cd2f0d2..8c4454e 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 8afa7ce..df873ee 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 c30c717..2a59758 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 564fa18..73ff161 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 ebad386..c0d5c4b 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 ac8c9b7..5868912 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 dfe47ed..9d0e915 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 f78b7f7..0c6b2d9 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 1524013..7081ed6 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 fed4d81..496dc06 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 b56d780..8b24dfb 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 028a0b8..0f711d1 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 983a37c..7a72ce9 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 731d7e4..b034a04 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 31ed1e0..05b4518 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 045bf01..5d8a088 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 4733f4a..023751d 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 4fa6a69..628d687 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 6cebdf4..d1cf91c 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 256a7e2..e0cf770 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 64e18f5..889de7b 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 5d1a7c4..97e4330 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 6944478..aaaf31a 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 250a90f..0cfdd98 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 bf4ac25..f68b966 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 e9510ff..da7719c 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 834d2b2..6c84fc6 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 69053d5..790d8a9 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 0def407..23ca68b 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 a869d2f..88bf4df 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 0f41645..d54708e 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 7d0a592..9409b8a 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 0dbb245..b4260a1 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 291fb0d..9674a04 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 7c00ede..39c1afe 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 d11b9a6..36423b2 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 4779d66..3b28172 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 25f9258..4f88507 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 502e1ea..6b26c78 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 f51a145..293009d 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 d44ef1b..4760c4e 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 00cbeeb..02cd5fa 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 70ef4ba..453a75d 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 2ba3703..0c82978 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 6d93ff9..4d94b84 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 8f1a682..cbe0376 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 998f863..1b53332 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 4085300..4092bfa 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 1f5e34a..5ff6902 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 d00843f..fea620c 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 52dbefd..be48af1 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 bfceedb..9c1ee73 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 df57568..1a5c97d 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 3e7f77c..db988c8 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 b8d8baf..04f5ffe 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 5e44633..54fad6d 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 e47d4ec..54b8380 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 1eb6142..419a10d 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 c2d04a6..adcc152 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 2937801..e49071d 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 00f6f13..8077c4a 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 dc26bf7..26d0b0b 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 00f6f13..8077c4a 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 00f6f13..8077c4a 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 c7b6d5d..c8679ac 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 7f30237..d5b6e6e 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 ccbb148..d26bd27 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 b691702..d06ed7e 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 19ac4e9..166b21a 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 b333c02..8fc0bf9 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 6c14965..319c3e2 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 fa6735d..8dcbdd2 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 f8d5539..31cd180 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 ea629f6..8a72e44 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 c2e454a..78dc4e1 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 7eee28a..33a221a 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 960ab55..3bf1aa7 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 27f1032..602988e 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 ae8e040..f4cf5c3 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 6f89b58..fb1f9ec 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 6b02a94..67d22b6 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 db636e1..d687c43 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 f4726b0..38c6d42 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 675a143..b09f31f 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 28f69e4..9144beb 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 2528db9..8a2e311 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 c373096..e33d371 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 5aa7234..be4986b 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 eeea7e5..87686aa 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 ead9685..8120b9d 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 8ec8bdf..20539d1 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 27ec656..5543be8 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 b3e2e1d..ffd9c50 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 6c3d7b5..6ce8786 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 4c4d031..2bbea13 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 f657ef6..efe1fc7 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 71fa0b7..795c061 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 20491a4..7bc2d62 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 0db5f92..76ffceb 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 713fa3d..2f9adcd 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 1731c5a..2a5af4b 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 3376abe..f8e96ac 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 2ab31fa..3a31a66 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 e263c5b..2b13f00 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 ec9ab9b..cb15755 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 34a4673..94d3c74 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 3950782..502d6f8 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 7e1cefd..bb6d3f1 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 6e7c5d8..9e8c6bb 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 036935e..df054d6 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 22267bb..39837e9 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 c5ccbd6..1dec625 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 faeafc4..dd2f965 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 0220357..32c3237 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 3fc9261..2a5a484 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 eb57e28..0343128 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 2d55ede..31c9d0b 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 46527e5..57a4c78 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 59c9fdf..dcd309d 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 43127de..73a1213 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 a47159a..e7afd81 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 44471cc..2447cdd 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 b4f3975..b1c8afd 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 4260245..9c95b47 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 9a9544b..39ae1f3 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 5b570b7..d869628 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 3684418..fd43503 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 136b9d1..d555c8a 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 39fd439..eb56222 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 ba7f959..bbe20a1 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 fe033c6..cf21cfb 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 7ddb47d..acef437 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 d9d66f4..fe084db 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 81e5fe4..b4bfa6a 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 1b3c6f8..4ada1f5 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 29b1cd5..be08259 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 35da8c7..ef4bbb5 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 e99cd80..3641279 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 02bc0f3..8964a09 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 c833eba..c929277 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 635475e..2791557 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 e6e205a..1c9323a 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 787e760..175979d 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 f80b059..258ffe6 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 215e9fd..a4a637f 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 416f50f..1558ab1 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 ffa1c4a..835d0c9 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 8b0e00f..34defa8 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 6424ec7..75bcd9f 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 b2cfe83..703347e 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 20e4487..c57dc1b 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 a3535dd..ff3d14c 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 e7461bb..1fdf0ac 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 b2dd27b..6c03603 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 02a352a..9b3061c 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 d5d6378..82ba9c1 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 bd718f2..6e4e73e 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 e845a72..c4e20f4 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 39a85e1..6f18dbc 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 b266631..634b808 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 2a301dc..cc80834 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 29a439a..af3fbe4 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 924c1b9..400601b 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 81b98db..7708b11 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 ef93ec0..8082a22 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 898de4a..a51db85 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 cef97ce..2013350 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 ba75147..f764962 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 252d45a..9b2ca4f 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 760557a..b0508a5 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 6a8e690..b6d95e9 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 cae0deb..1da81b9 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 95cb1d7..8e01f68 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 968b391..dab49e7 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 eff9fc7..a04a934 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 93b0367..39992e8 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 903f6f2..3612416 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 b214a92..5c25eeb 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 727d193..8b42500 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 c964236..779a9c5 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 becc257..8179922 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 832ff49..8004d78 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 45d8a87..2cacf5b 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 db6ac35..d5c9317 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 34e271b..fff0e9b 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 1bd7b5c..4007351 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 a1fdcf2..a45c9b7 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 f32bbad..b47c2b3 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 b7a1645..0605174 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 f153b9c..b3f973e 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 61d58b5..0ac5efe 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 b4c2ad3..2a098ee 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 a31ad5b..bb1f121 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 3000d72..9d42a03 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 29c7fc2..2dd2f6e 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 802879b..0fb0cde 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 f42c49a..72f761a 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 3ec5e63..3eb1188 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 11e453c..16f544c 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 b8ccecd..5b5954b 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 add5e07..7233354 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 9db718c..7d0b2b1 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 ddf7dde..3e39dc0 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 d3181c8..fdb0d1b 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 b1c8f5d..52b5d6f 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 bcbb4d2..d98f299 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 da7c44e..6bc5f6f 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 786a13a..1a3de43 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 5b0fade..8561097 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 1882995..b98093e 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 acc359e..4da0cea 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 c3df65a..6413567 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 04fce58..c76b7b9 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 e4af2e9..7bb948d 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 62a7453..9fdfd7d 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 9df4867..bf8f7c7 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 04bd12b..5d977bd 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 1e8825e..29238a3 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 931defc..525e08b 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 a04f9ea..939fc8e 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 7568bdf..8ac231d 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 833caf1..a9456cc 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 e594797..f4b656c 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 8fb5a35..201c9ed 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 3deec7c..afc4d10 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 31ef79a..cafc16d 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 b7eae97..3af5c70 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 dd974e8..671b35d 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 c20021b..61b7470 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 53f6022..8c8b38d 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 3efb720..fe2a6b9 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 d55e178..24305da 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 75eb727..33261b8 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 e3f3078..000be91 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 73b1ac6..ae5e038 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 e0037a6..f8b9d86 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 a80c10c..b12c11e 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 c0fe23a..eab598e 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 6bfe26c..b69f5d4 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 7cd5f57..d66635d 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 1bd4426..416f543 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 a0f04d0..5ac6c49 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 3da85b4..078a797 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 8337dee..30a00c6 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 eb3ec56..0af3a45 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 d00b0bf..b517b1b 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 657724c..a33459a 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 2f47557..9c9a8ab 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 4f35dae..8da365e 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 27bc87c..1ff5fea 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 e9767da..1f20e45 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 5bf1070..2490ac3 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 8b79a6a..3ebae7b 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 588519c..60feb7e 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 c6230ae..0a481e4 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 3008620..b3e2725 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 678525a..a729980 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 a579e2b..858ee65 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 d3e0b6c..fea3027 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 9eb6494..acd1542 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 e4a149b..6e0a912 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 252c789..f42f1a8 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 8a2c133..b736dc8 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 f7d3fc2..c554d2d 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 6d71d0a..55b9eba 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 c728182..f808ce2 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 b9d392a..cd5e1cb 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 f2c4721..b19146b 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 9257e0b..84372a9 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 ca80bd6..793de29 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 8459390..fd2e76e 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 135c904..70dbe72 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 e642475..b97c128 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 a063047..3c2e140 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 a752b22..196bf6f 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 af70832..c2b8ba8 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 db34666..83fb28e 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 c0ac5ac..84225e0 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index 3e802d3..26a1bf8 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index b141561..f5d98d8 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index f71ef56..f45485b 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index ba3867f..f17b22f 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 3568f7a..70e3193 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_SPL_NOR_SUPPORT=y diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index c640aa7..8ec623b 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 17c1f7f..fb198b6 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 faeb15c..9d1090b 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 b545832..9fa1095 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 71b40ee..ae0a691 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 9417682..97505da 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 b23f235..4213e8a 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 f2c4721..b19146b 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 ca3b731..a705e8b 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 f98be1f..fa2eea0 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 65b7d95..4b47fc6 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 ec12dbe..f686fe9 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 464bee1..ef28222 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 f8f596f..d0b19f4 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 f023c73..ee98fc5 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 2839bc6..731466e 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 c3b91f4..8763be8 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 5ababef..e38e1da 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 b6d3c8a..e186c7e 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 5b1e4bc..c26c844 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 0d15583..c77cd22 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 935bc5c..ee04b00 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 8c46e16..5eef16a 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 2f4fc1e..247fb6d 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 d3116e1..8e80a90 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 add038c..286f0bd 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 5e84a41..9bd511c 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 SecureDigital I/O support.If you want MMC/SD/SDIO support, you should say Y here andalso 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 5cfdbb2..6663a92 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 6335c55..753ce13 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 adc3193..f86b008 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 48e06af..d843bd1 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 d8f7961..b17a6c5 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 bd52054..bd15645 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 78e0064..4d0ae9d 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 81e8c29..169f94a 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 91e5f8b..7a3fa03 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 52ef432..e32cdde 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 65ec8f7..a6fa6a8 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 17e941e..0a8c387 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 078e60c..5933fc0 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 fda83d2..303c73b 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 054b323..e451851 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 00676dd..7779c31 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 7521dd0..41cb43c 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 b984fcd..878dbed 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 e013e72..ee27a8f 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 d90fb35..78ad86c 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 fd5dbc5..5b3c6fa 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 c194ec7..0775603 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 5cb79f1..93fa614 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 3626636..99f9ef7 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 7d6ec78..726e6d6 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 07ef9e9..ad0de2c8 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 ad56d24..3247a4a 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_t30.h b/include/configs/apalis_t30.h index f2a24c1..12a2877 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 b903ba5..e9d8232 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 e1f934c..f07366e 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 cc1695e..6806cc7 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 fd0504d..12a92c2 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 b825464..9c9e809 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 23184ce..b5aebe6 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 843f03a..6dee45a 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 a0f451b..00a8c79 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 4d9282a..d1f61b3 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 9ddfff2..3d17ae1 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 b99248e..296fbd1 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 408c0f5..8a4950f 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 eb4c497..f822f48 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 7a75fdb..9d06dad 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 ab1ab14..2e43a09 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 510cd47..43e4971 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 258115a..40ca18d 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 4f861aa..6517705 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 9376283..b79aa2b 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 4deb2d2..337bb0a 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 a5fdbbb..eb2419c 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 a6369d6..ac338c4 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 462b784..b7df2bc 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 f3bb279..6eed4bc 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 c976ec8..e3735f7 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 78841cd..32229d2 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 5785ebd..dc2eabd 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 da5a4b3..1ce27e3 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 1e2a477..bae9697 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_t20.h b/include/configs/colibri_t20.h index 6a52869..e9db97f 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 e8b3f99..4d13856 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 d58145e..ea1fa39 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -58,7 +58,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 5ef999c..cc19148 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 971549e..e0290e7 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 55aa03b..f863810 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 45caf9f..0307b14 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 18a8e26..ceb9cea 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 b0311bf..04ab48d 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 b8c5232..7333e48 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 75e1d1c..c11e581 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 1b440ea..cbc6126 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 c9e8c8e..d4aca55 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 7053795..a83c617 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 b4a0388..c78eebf 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 3b61a41..29b02a0 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -42,7 +42,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 6d25035..b87b04d 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 2560c88..0039c8c 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 23707ed..45395cd 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 3d6b5fc..cf3c493 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 7a03d0f..c725833 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 9677aab..9f07657 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 14c43b8..30168bc 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 90e282f..c1fa2c6 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 2da0d8d..e9e69a7 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 76f2b8b..7a4ba09 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 a1d96ff..c7aa7cc 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 664999c..a7894ca 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 f2f82ac..3b118bb 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 0cc1791..b5b4d7e 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 15410dd..f35fd31 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 7af4bc4..ae8ee24 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 128da8a..6f857a7 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 1458332..b48cd00 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 c1e3ec6..3e70464 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 3887faa..40e6af8 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 f0ec6c4..07be30c 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 838568f..37d5704 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 31df781..713e86b 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 7e05bfd..8ec98fd 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 91037d6..de83d6c 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 0c6b1e8..f15abd3 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 ae7ca3b..d42976b 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 3aa22d2..2922271 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 81826ea..3853c05 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 3f064fd..c0fb8d1 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 3c1d53f..b62360b 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 27e7738..d84d524 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/mx53evk.h b/include/configs/mx53evk.h index 7a896c7..aa82928 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 6cc5d9c..6cc5f0f 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 262a913..ad4964c 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 d28654b..ecce08e 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -81,7 +81,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 0645228..4348b43 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 df0cc23..04c3ce9 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 ce74322..99ce60f 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 c548ee1..ae49054 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 6388a9c..1a67584 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 7c2f414..b00ab90 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -327,7 +327,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 908a1af..c21b849 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 c20ef5e..8668495 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 5ff2e35..a9b2020 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 968b89e..cd981b9 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 9cf697f..7ff545c 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 4fa345d..7daaf8e 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 67a1603..0864e4d 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 a8bb3ff..0cefee3 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 eb1944a..4ab1a21 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -66,7 +66,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 d9c84f2..2aa63fc 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 52b7a2a..57b91e7 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 a214c4d..2bd7076 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 9051c1c..20fb036 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 635e439..8ad5af1 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 7d8a095..ccaa796 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 3fa7739..4598bd9 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 92be29e..27dfbce 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 5358372..535797a 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 aa646c6..394ec40 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 4406366..b105fc1 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 9f85fdc..c55f6b9 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 6a5425a..c1057aa 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 f48559e..b840315 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 ed91bdc..831a45c 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 5d78847..bcd5c37 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 498b32b..9009730 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 2b6509a..3ee6555 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 67ca4a6..e2af82d 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 d77b470..0859109 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 efb7ad9..05b5faa 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 748a2ea..9f22d4c 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 4564296..e4d0ad9 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 19c6297..a343cd1 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 c76c55f..a19a38b 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 e12b101..0a3d242 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 58a6550..2c40827 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 e3b9325..0d9e4aa 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 6604cec..9733299 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 ff0c60d..44201a2 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 a873e7b..03fc42c 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 c294f70..97aa046 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 0e9d98c..067e171 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 7b14299..c03dabf 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 a9990b7..5144d5a 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 6a5ed19..86ab1e0 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 5db4c60..d909f25 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 d13fc94..dbe494a 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 cfb4b30..28a80f5 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 07a92eb..1c36d07 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 cfc8451..ff00614 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 2e5f38d..9050ae4 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 b2d54d5..904b772 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 72fa973..7c7b200 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 7a38869..f5459a8 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 a8eba31..0bc4ea5 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 af5ba61..56017b9 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -65,7 +65,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 0f3fc8f..07fe616 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 0cd892e..ffd9a2c 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 50495bf..4aaeea9 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 d480990..9225e5d 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 97dfc0e..a30aefb 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 953e731..01e2fca 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
2016-12-09 8:29 GMT+09:00 Jaehoon Chung jh80.chung@samsung.com:
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
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
Reviewd-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
I am fixing s/Reviewd/Reviewed/ so that Patchwork will handle the tag correctly.
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
(BTW, please stop full-quoting for big patches.)
On Wed, Dec 07, 2016 at 10:10:26PM +0900, Masahiro Yamada wrote:
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
Applied to u-boot/master, thanks!
Currently, CONFIG_MMC is not related to any other options by "depends on" or "select". One of big advantages of using Kconfig is automatic dependency tracking, but the current state is lacking it. As the first step, make the existing MMC driver entries depend on MMC.
This commit was created by the following steps:
[1] Run the following script:
--------------------8<-------------------- rm -f tmp.txt
for d in $(find . -path './configs/*_defconfig') do if grep -q -e 'CONFIG_MSM_SDHCI=y' $d || grep -q -e 'CONFIG_ATMEL_SDHCI=y' $d || grep -q -e 'CONFIG_ROCKCHIP_DWMMC=y' $d || grep -q -e 'CONFIG_SH_SDHI=y' $d || grep -q -e 'CONFIG_PIC32_SDHCI=y' $d || grep -q -e 'CONFIG_ZYNQ_SDHCI=y' $d || grep -q -e 'CONFIG_ROCKCHIP_SDHCI=y' $d || grep -q -e 'CONFIG_MMC_UNIPHIER=y' $d || grep -q -e 'CONFIG_SANDBOX_MMC=y' $d then echo CONFIG_MMC=y >> $d echo ${d#./configs/} >> tmp.txt fi done
tools/moveconfig.py -y -s -d tmp.txt rm tmp.txt --------------------8<--------------------
[2] surround MMC driver entries with "if MMC" and "endif"
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v2: None
configs/sama5d2_xplained_mmc_defconfig | 1 - configs/sama5d2_xplained_spiflash_defconfig | 1 - configs/uniphier_ld20_defconfig | 1 - configs/uniphier_ld4_sld8_defconfig | 1 - configs/uniphier_pro4_defconfig | 1 - configs/uniphier_pxs2_ld6b_defconfig | 1 - configs/uniphier_sld3_defconfig | 1 - drivers/mmc/Kconfig | 4 ++++ 8 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 525e08b..931defc 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -8,7 +8,6 @@ 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 939fc8e..a04f9ea 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -7,7 +7,6 @@ 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/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index 26a1bf8..3e802d3 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -4,7 +4,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index f5d98d8..b141561 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index f45485b..f71ef56 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -5,7 +5,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index f17b22f..ba3867f 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 70e3193..3568f7a 100644 --- a/configs/uniphier_sld3_defconfig +++ b/configs/uniphier_sld3_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 9bd511c..f3e150e 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -30,6 +30,8 @@ config DM_MMC_OPS option will be removed as soon as all DM_MMC drivers use it, as it will the only supported behaviour.
+if MMC + config SPL_MMC_TINY bool "Tiny MMC framework in SPL" help @@ -114,4 +116,6 @@ config SANDBOX_MMC improves build coverage for sandbox and makes it easier to detect MMC build errors with sandbox.
+endif + endmenu
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
Currently, CONFIG_MMC is not related to any other options by "depends on" or "select". One of big advantages of using Kconfig is automatic dependency tracking, but the current state is lacking it. As the first step, make the existing MMC driver entries depend on MMC.
This commit was created by the following steps:
[1] Run the following script:
--------------------8<-------------------- rm -f tmp.txt
for d in $(find . -path './configs/*_defconfig') do if grep -q -e 'CONFIG_MSM_SDHCI=y' $d || grep -q -e 'CONFIG_ATMEL_SDHCI=y' $d || grep -q -e 'CONFIG_ROCKCHIP_DWMMC=y' $d || grep -q -e 'CONFIG_SH_SDHI=y' $d || grep -q -e 'CONFIG_PIC32_SDHCI=y' $d || grep -q -e 'CONFIG_ZYNQ_SDHCI=y' $d || grep -q -e 'CONFIG_ROCKCHIP_SDHCI=y' $d || grep -q -e 'CONFIG_MMC_UNIPHIER=y' $d || grep -q -e 'CONFIG_SANDBOX_MMC=y' $d then echo CONFIG_MMC=y >> $d echo ${d#./configs/} >> tmp.txt fi done
tools/moveconfig.py -y -s -d tmp.txt rm tmp.txt --------------------8<--------------------
[2] surround MMC driver entries with "if MMC" and "endif"
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com
Reviewd-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
Changes in v2: None
configs/sama5d2_xplained_mmc_defconfig | 1 - configs/sama5d2_xplained_spiflash_defconfig | 1 - configs/uniphier_ld20_defconfig | 1 - configs/uniphier_ld4_sld8_defconfig | 1 - configs/uniphier_pro4_defconfig | 1 - configs/uniphier_pxs2_ld6b_defconfig | 1 - configs/uniphier_sld3_defconfig | 1 - drivers/mmc/Kconfig | 4 ++++ 8 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 525e08b..931defc 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -8,7 +8,6 @@ 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 939fc8e..a04f9ea 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -7,7 +7,6 @@ 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/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index 26a1bf8..3e802d3 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -4,7 +4,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index f5d98d8..b141561 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index f45485b..f71ef56 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -5,7 +5,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index f17b22f..ba3867f 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 70e3193..3568f7a 100644 --- a/configs/uniphier_sld3_defconfig +++ b/configs/uniphier_sld3_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 9bd511c..f3e150e 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -30,6 +30,8 @@ config DM_MMC_OPS option will be removed as soon as all DM_MMC drivers use it, as it will the only supported behaviour.
+if MMC
config SPL_MMC_TINY bool "Tiny MMC framework in SPL" help @@ -114,4 +116,6 @@ config SANDBOX_MMC improves build coverage for sandbox and makes it easier to detect MMC build errors with sandbox.
+endif
endmenu
On 12/09/2016 08:30 AM, Jaehoon Chung wrote:
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
Currently, CONFIG_MMC is not related to any other options by "depends on" or "select". One of big advantages of using Kconfig is automatic dependency tracking, but the current state is lacking it. As the first step, make the existing MMC driver entries depend on MMC.
This commit was created by the following steps:
[1] Run the following script:
--------------------8<-------------------- rm -f tmp.txt
for d in $(find . -path './configs/*_defconfig') do if grep -q -e 'CONFIG_MSM_SDHCI=y' $d || grep -q -e 'CONFIG_ATMEL_SDHCI=y' $d || grep -q -e 'CONFIG_ROCKCHIP_DWMMC=y' $d || grep -q -e 'CONFIG_SH_SDHI=y' $d || grep -q -e 'CONFIG_PIC32_SDHCI=y' $d || grep -q -e 'CONFIG_ZYNQ_SDHCI=y' $d || grep -q -e 'CONFIG_ROCKCHIP_SDHCI=y' $d || grep -q -e 'CONFIG_MMC_UNIPHIER=y' $d || grep -q -e 'CONFIG_SANDBOX_MMC=y' $d then echo CONFIG_MMC=y >> $d echo ${d#./configs/} >> tmp.txt fi done
tools/moveconfig.py -y -s -d tmp.txt rm tmp.txt --------------------8<--------------------
[2] surround MMC driver entries with "if MMC" and "endif"
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com
Reviewd-by: Jaehoon Chung jh80.chung@samsung.com
s/Reviewd/Reviewed..
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
Best Regards, Jaehoon Chung
Changes in v2: None
configs/sama5d2_xplained_mmc_defconfig | 1 - configs/sama5d2_xplained_spiflash_defconfig | 1 - configs/uniphier_ld20_defconfig | 1 - configs/uniphier_ld4_sld8_defconfig | 1 - configs/uniphier_pro4_defconfig | 1 - configs/uniphier_pxs2_ld6b_defconfig | 1 - configs/uniphier_sld3_defconfig | 1 - drivers/mmc/Kconfig | 4 ++++ 8 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 525e08b..931defc 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -8,7 +8,6 @@ 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 939fc8e..a04f9ea 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -7,7 +7,6 @@ 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/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index 26a1bf8..3e802d3 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -4,7 +4,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index f5d98d8..b141561 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index f45485b..f71ef56 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -5,7 +5,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index f17b22f..ba3867f 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 70e3193..3568f7a 100644 --- a/configs/uniphier_sld3_defconfig +++ b/configs/uniphier_sld3_defconfig @@ -6,7 +6,6 @@ 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_SPL_NOR_SUPPORT=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 9bd511c..f3e150e 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -30,6 +30,8 @@ config DM_MMC_OPS option will be removed as soon as all DM_MMC drivers use it, as it will the only supported behaviour.
+if MMC
config SPL_MMC_TINY bool "Tiny MMC framework in SPL" help @@ -114,4 +116,6 @@ config SANDBOX_MMC improves build coverage for sandbox and makes it easier to detect MMC build errors with sandbox.
+endif
endmenu
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
On Wed, Dec 07, 2016 at 10:10:27PM +0900, Masahiro Yamada wrote:
Currently, CONFIG_MMC is not related to any other options by "depends on" or "select". One of big advantages of using Kconfig is automatic dependency tracking, but the current state is lacking it. As the first step, make the existing MMC driver entries depend on MMC.
This commit was created by the following steps:
[1] Run the following script:
Applied to u-boot/master, thanks!
Move CONFIG_SDHCI to Kconfig and rename it to CONFIG_MMC_SDHCI. My motivation for the rename is, ultimately, to make all the MMC options prefixed with MMC_ and SDHCI options with MMC_SDHCI_, like Linux.
This commit was created as follows:
[1] Rename the config option with the following command: find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e 's/CONFIG_SDHCI/CONFIG_MMC_SDHCI/g'
[2] create the entry for MMC_SDHCI in drivers/mmc/Kconfig
[3] run "tools/moveconfig.py -y MMC_SDHCI"
[4] add "depends on MMC_SDHCI" to existing SDHCI driver entries
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v2: None
board/samsung/common/board.c | 2 +- configs/arndale_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/bcm11130_defconfig | 1 + configs/bcm11130_nand_defconfig | 1 + configs/bcm23550_w1d_defconfig | 1 + configs/bcm28155_ap_defconfig | 1 + configs/bcm28155_w1d_defconfig | 1 + configs/clearfog_defconfig | 1 + configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/db-88f6820-gp_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/dragonboard410c_defconfig | 1 + configs/evb-rk3399_defconfig | 1 + configs/galileo_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/pic32mzdask_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/sama5d2_xplained_mmc_defconfig | 1 + configs/sama5d2_xplained_spiflash_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/smdkv310_defconfig | 1 + configs/snow_defconfig | 1 + configs/spring_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/xilinx_zynqmp_ep_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + configs/xilinx_zynqmp_zcu102_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + drivers/mmc/Kconfig | 16 ++++++++++++++++ drivers/mmc/Makefile | 2 +- include/configs/bayleybay.h | 1 - include/configs/bcm23550_w1d.h | 1 - include/configs/bcm28155_ap.h | 1 - include/configs/clearfog.h | 1 - include/configs/conga-qeval20-qa3-e3845.h | 1 - include/configs/crownbay.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/dfi-bt700.h | 1 - include/configs/dragonboard410c.h | 1 - include/configs/exynos-common.h | 1 - include/configs/galileo.h | 1 - include/configs/minnowmax.h | 1 - include/configs/pic32mzdask.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rpi.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sama5d2_xplained.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 76 files changed, 72 insertions(+), 21 deletions(-)
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 0eb066c..522e0cd 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -251,7 +251,7 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_GENERIC_MMC static int init_mmc(void) { -#ifdef CONFIG_SDHCI +#ifdef CONFIG_MMC_SDHCI return exynos_mmc_init(gd->fdt_blob); #else return 0; diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index 6eef60d..a6eac81 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_SOUND=y CONFIG_I2S=y CONFIG_I2S_SAMSUNG=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 419a10d..6be1795 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index dd37b7e..a1a9678 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index a013098..8493d1b 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index 8d6d28c..121372e 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 1ceaeda..173bfba 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index 06539fd..d5bb166 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index d06b75c..2028568 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_PCI=y CONFIG_DEBUG_UART=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 9144beb..a468e13 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -45,6 +45,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 8a2e311..515d60a 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -44,6 +44,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index be4986b..0ff8a2d 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -33,6 +33,7 @@ CONFIG_OF_CONTROL=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 3547d84..cd2149d 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index efe1fc7..84f0559 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -42,6 +42,7 @@ CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index 4df0763..b40b5ef 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -21,6 +21,7 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y CONFIG_MSM_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_PMIC=y CONFIG_PMIC_PM8916=y CONFIG_MSM_SERIAL=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 95029d7..6c27104 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -22,6 +22,7 @@ CONFIG_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_ROCKCHIP_DWMMC=y CONFIG_ROCKCHIP_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_PINCTRL=y CONFIG_ROCKCHIP_RK3399_PINCTRL=y CONFIG_REGULATOR_PWM=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 32c3237..ca08a9b 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 2cacf5b..4b4c5f2 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 727c13a..3dd0268 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -26,6 +26,7 @@ CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_DM_PMIC=y CONFIG_PMIC_S2MPS11=y CONFIG_DM_REGULATOR=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index e250d16..66391b4 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_REGULATOR=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 0d91ec1..13ba60c 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 41b3bcb..d5e11bf 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -32,6 +32,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 770ab71..d71172d 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -32,6 +32,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig index d98f299..852eb0a 100644 --- a/configs/pic32mzdask_defconfig +++ b/configs/pic32mzdask_defconfig @@ -28,6 +28,7 @@ CONFIG_CLK=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_PIC32_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_ETH=y CONFIG_PIC32_ETH=y CONFIG_PINCTRL=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index fe43122..da43b39 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index b0a8d7e..991e5de 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y +CONFIG_MMC_SDHCI=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 1618bee..a4c7f69 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y +CONFIG_MMC_SDHCI=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 30454a5..e5cd9f8 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 4cbf022..93d50d1 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index f1bbdd9..9b6f902 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 931defc..a6daef4 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_AT91=y CONFIG_DM_MMC=y CONFIG_ATMEL_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index a04f9ea..41ab772 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -43,6 +43,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_AT91=y CONFIG_DM_MMC=y CONFIG_ATMEL_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 0d77be7..3c70120 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 69f8d40..5bc793c 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index c8c182b..6347e97 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -22,5 +22,6 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 19e6117..dbb6006 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -33,6 +33,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index d78588b..27e66ec 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -33,6 +33,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 70dbe72..c28357e 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -42,6 +42,7 @@ CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index 3d6161e..e7b6c0f 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 3160f00..2141949e 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index db1ebe9..b6923bc 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index b25c1c4..352750d 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index f261e22..8590d68 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -50,6 +50,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_NAND_ARASAN=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index e3cfcee..0663e16 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -41,6 +41,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig index 0471292..7c75abb 100644 --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig @@ -35,6 +35,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_ETH=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART=y diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig index eb8da13..401c0d6 100644 --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig @@ -35,5 +35,6 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_ETH=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig index 021e0ff..a7690d1 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -40,6 +40,7 @@ CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 34062bd..9600601 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -40,6 +40,7 @@ CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 16d26c0..7ec5752 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 3ba6b66..d8c76a7 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_ZYNQ_GEM=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 117bfda..4c65231 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index ef73849..935a9c9 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index 1419efa..16a14ae 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 96f00e4..6f8f3a6 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index dfac764..6706324 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index f3e150e..778469e 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -50,6 +50,7 @@ config SPL_MMC_TINY config MSM_SDHCI bool "Qualcomm SDHCI controller" depends on DM_MMC && BLK && DM_MMC_OPS + depends on MMC_SDHCI help Enables support for SDHCI 2.0 controller present on some Qualcomm Snapdragon devices. This device is compatible with eMMC v4.5 and @@ -59,6 +60,7 @@ config MSM_SDHCI config ATMEL_SDHCI bool "Atmel SDHCI controller support" depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91 + depends on MMC_SDHCI help This enables support for the Atmel SDHCI controller, which supports the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD @@ -84,18 +86,21 @@ config SH_SDHI config PIC32_SDHCI bool "Microchip PIC32 on-chip SDHCI support" depends on DM_MMC && MACH_PIC32 + depends on MMC_SDHCI help Support for Microchip PIC32 SDHCI controller.
config ZYNQ_SDHCI bool "Arasan SDHCI controller support" depends on DM_MMC && OF_CONTROL + depends on MMC_SDHCI help Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
config ROCKCHIP_SDHCI bool "Arasan SDHCI controller for Rockchip support" depends on DM_MMC && BLK && DM_MMC_OPS + depends on MMC_SDHCI help Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
@@ -116,6 +121,17 @@ config SANDBOX_MMC improves build coverage for sandbox and makes it easier to detect MMC build errors with sandbox.
+config MMC_SDHCI + bool "Secure Digital Host Controller Interface support" + help + This selects the generic Secure Digital Host Controller Interface. + It is used by manufacturers such as Texas Instruments(R), Ricoh(R) + and Toshiba(R). Most controllers found in laptops are of this type. + + If you have a controller with this interface, say Y here. + + If unsure, say N. + endif
endmenu diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index d850758..236f305 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -48,7 +48,7 @@ ifdef CONFIG_GENERIC_MMC obj-$(CONFIG_SANDBOX) += sandbox_mmc.o endif endif -obj-$(CONFIG_SDHCI) += sdhci.o +obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 8a4950f..51d6ce0 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index f822f48..68212a8 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -31,7 +31,6 @@ #define CONFIG_KONA_GPIO
/* MMC/SD Driver */ -#define CONFIG_SDHCI #define CONFIG_MMC_SDMA #define CONFIG_KONA_SDHCI #define CONFIG_GENERIC_MMC diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 9d06dad..6fd0417 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -30,7 +30,6 @@ #define CONFIG_KONA_GPIO
/* MMC/SD Driver */ -#define CONFIG_SDHCI #define CONFIG_MMC_SDMA #define CONFIG_KONA_SDHCI #define CONFIG_GENERIC_MMC diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index e3735f7..0a5171f 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -45,7 +45,6 @@ */ #define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #define CONFIG_MV_SDHCI #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index cc19148..f50b2a4 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index f863810..8f67d14 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 7333e48..18a3f36 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -45,7 +45,6 @@ */ #define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #define CONFIG_MV_SDHCI #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index c11e581..779e834 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index cbc6126..e6bb919 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -33,7 +33,6 @@
/* This are needed to have proper mmc support */ #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI
#define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds"
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 29b02a0..440e227 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -43,7 +43,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC #define CONFIG_S5P_SDHCI -#define CONFIG_SDHCI #define CONFIG_DWMMC #define CONFIG_EXYNOS_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/galileo.h b/include/configs/galileo.h index b87b04d..6109dd7 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -30,7 +30,6 @@ #undef CONFIG_SCSI
/* SD/MMC support */ -#define CONFIG_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 2922271..cc47d5a 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 57b91e7..e6fd249 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -91,7 +91,6 @@ /*----------------------------------------------------------------------- * SDHC Configuration */ -#define CONFIG_SDHCI #define CONFIG_GENERIC_MMC
/*-------------------------------------------------- diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 394ec40..eab3f04 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -29,7 +29,6 @@ /* MMC/SD IP block */ #define CONFIG_GENERIC_MMC #define CONFIG_DWMMC -#define CONFIG_SDHCI #define CONFIG_BOUNCE_BUFFER #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index b105fc1..351e234 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -83,7 +83,6 @@
/* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #define CONFIG_MMC_SDHCI_IO_ACCESSORS #define CONFIG_BCM2835_SDHCI
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index c1057aa..a69f086 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -48,7 +48,6 @@
/* MMC */ #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #define CONFIG_S5P_SDHCI #define SDHCI_MAX_HOSTS 4
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 61e3376..4f72c83 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -46,7 +46,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #endif
/* USB device */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 9225e5d..e24e241 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -83,7 +83,6 @@ #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_GENERIC_MMC # define CONFIG_SUPPORT_EMMC_BOOT -# define CONFIG_SDHCI # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000 # endif diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 01e2fca..2fe6897 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -86,7 +86,6 @@ /* MMC */ #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_GENERIC_MMC -# define CONFIG_SDHCI # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #endif
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
Move CONFIG_SDHCI to Kconfig and rename it to CONFIG_MMC_SDHCI. My motivation for the rename is, ultimately, to make all the MMC options prefixed with MMC_ and SDHCI options with MMC_SDHCI_, like Linux.
This commit was created as follows:
[1] Rename the config option with the following command: find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e 's/CONFIG_SDHCI/CONFIG_MMC_SDHCI/g'
[2] create the entry for MMC_SDHCI in drivers/mmc/Kconfig
[3] run "tools/moveconfig.py -y MMC_SDHCI"
[4] add "depends on MMC_SDHCI" to existing SDHCI driver entries
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
Changes in v2: None
board/samsung/common/board.c | 2 +- configs/arndale_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/bcm11130_defconfig | 1 + configs/bcm11130_nand_defconfig | 1 + configs/bcm23550_w1d_defconfig | 1 + configs/bcm28155_ap_defconfig | 1 + configs/bcm28155_w1d_defconfig | 1 + configs/clearfog_defconfig | 1 + configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/db-88f6820-gp_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/dragonboard410c_defconfig | 1 + configs/evb-rk3399_defconfig | 1 + configs/galileo_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/pic32mzdask_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/sama5d2_xplained_mmc_defconfig | 1 + configs/sama5d2_xplained_spiflash_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/smdkv310_defconfig | 1 + configs/snow_defconfig | 1 + configs/spring_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/xilinx_zynqmp_ep_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + configs/xilinx_zynqmp_zcu102_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + drivers/mmc/Kconfig | 16 ++++++++++++++++ drivers/mmc/Makefile | 2 +- include/configs/bayleybay.h | 1 - include/configs/bcm23550_w1d.h | 1 - include/configs/bcm28155_ap.h | 1 - include/configs/clearfog.h | 1 - include/configs/conga-qeval20-qa3-e3845.h | 1 - include/configs/crownbay.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/dfi-bt700.h | 1 - include/configs/dragonboard410c.h | 1 - include/configs/exynos-common.h | 1 - include/configs/galileo.h | 1 - include/configs/minnowmax.h | 1 - include/configs/pic32mzdask.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rpi.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sama5d2_xplained.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 76 files changed, 72 insertions(+), 21 deletions(-)
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 0eb066c..522e0cd 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -251,7 +251,7 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_GENERIC_MMC static int init_mmc(void) { -#ifdef CONFIG_SDHCI +#ifdef CONFIG_MMC_SDHCI return exynos_mmc_init(gd->fdt_blob); #else return 0; diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index 6eef60d..a6eac81 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_SOUND=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_SOUND=y CONFIG_I2S=y CONFIG_I2S_SAMSUNG=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 419a10d..6be1795 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index dd37b7e..a1a9678 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index a013098..8493d1b 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index 8d6d28c..121372e 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 1ceaeda..173bfba 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index 06539fd..d5bb166 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_MMC_SDHCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index d06b75c..2028568 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_PCI=y CONFIG_DEBUG_UART=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 9144beb..a468e13 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -45,6 +45,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 8a2e311..515d60a 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -44,6 +44,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index be4986b..0ff8a2d 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -33,6 +33,7 @@ CONFIG_OF_CONTROL=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 3547d84..cd2149d 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index efe1fc7..84f0559 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -42,6 +42,7 @@ CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index 4df0763..b40b5ef 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -21,6 +21,7 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_DM_MMC=y CONFIG_MSM_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_PMIC=y CONFIG_PMIC_PM8916=y CONFIG_MSM_SERIAL=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 95029d7..6c27104 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -22,6 +22,7 @@ CONFIG_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_ROCKCHIP_DWMMC=y CONFIG_ROCKCHIP_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_PINCTRL=y CONFIG_ROCKCHIP_RK3399_PINCTRL=y CONFIG_REGULATOR_PWM=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 32c3237..ca08a9b 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 2cacf5b..4b4c5f2 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 727c13a..3dd0268 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -26,6 +26,7 @@ CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_DM_PMIC=y CONFIG_PMIC_S2MPS11=y CONFIG_DM_REGULATOR=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index e250d16..66391b4 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_REGULATOR=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 0d91ec1..13ba60c 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 41b3bcb..d5e11bf 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -32,6 +32,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 770ab71..d71172d 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -32,6 +32,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig index d98f299..852eb0a 100644 --- a/configs/pic32mzdask_defconfig +++ b/configs/pic32mzdask_defconfig @@ -28,6 +28,7 @@ CONFIG_CLK=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_PIC32_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_ETH=y CONFIG_PIC32_ETH=y CONFIG_PINCTRL=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index fe43122..da43b39 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index b0a8d7e..991e5de 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y +CONFIG_MMC_SDHCI=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 1618bee..a4c7f69 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y +CONFIG_MMC_SDHCI=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 30454a5..e5cd9f8 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 4cbf022..93d50d1 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index f1bbdd9..9b6f902 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 931defc..a6daef4 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_AT91=y CONFIG_DM_MMC=y CONFIG_ATMEL_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index a04f9ea..41ab772 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -43,6 +43,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_AT91=y CONFIG_DM_MMC=y CONFIG_ATMEL_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 0d77be7..3c70120 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 69f8d40..5bc793c 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index c8c182b..6347e97 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -22,5 +22,6 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 19e6117..dbb6006 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -33,6 +33,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index d78588b..27e66ec 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -33,6 +33,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 70dbe72..c28357e 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -42,6 +42,7 @@ CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index 3d6161e..e7b6c0f 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 3160f00..2141949e 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index db1ebe9..b6923bc 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index b25c1c4..352750d 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_MMC_SDHCI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index f261e22..8590d68 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -50,6 +50,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_NAND_ARASAN=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index e3cfcee..0663e16 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -41,6 +41,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig index 0471292..7c75abb 100644 --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig @@ -35,6 +35,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_ETH=y CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART=y diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig index eb8da13..401c0d6 100644 --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig @@ -35,5 +35,6 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_DM_ETH=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig index 021e0ff..a7690d1 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -40,6 +40,7 @@ CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 34062bd..9600601 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -40,6 +40,7 @@ CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 16d26c0..7ec5752 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 3ba6b66..d8c76a7 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_ZYNQ_GEM=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 117bfda..4c65231 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index ef73849..935a9c9 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index 1419efa..16a14ae 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 96f00e4..6f8f3a6 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index dfac764..6706324 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_SDHCI=y +CONFIG_MMC_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index f3e150e..778469e 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -50,6 +50,7 @@ config SPL_MMC_TINY config MSM_SDHCI bool "Qualcomm SDHCI controller" depends on DM_MMC && BLK && DM_MMC_OPS
- depends on MMC_SDHCI help Enables support for SDHCI 2.0 controller present on some Qualcomm Snapdragon devices. This device is compatible with eMMC v4.5 and
@@ -59,6 +60,7 @@ config MSM_SDHCI config ATMEL_SDHCI bool "Atmel SDHCI controller support" depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
- depends on MMC_SDHCI help This enables support for the Atmel SDHCI controller, which supports the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD
@@ -84,18 +86,21 @@ config SH_SDHI config PIC32_SDHCI bool "Microchip PIC32 on-chip SDHCI support" depends on DM_MMC && MACH_PIC32
- depends on MMC_SDHCI help Support for Microchip PIC32 SDHCI controller.
config ZYNQ_SDHCI bool "Arasan SDHCI controller support" depends on DM_MMC && OF_CONTROL
- depends on MMC_SDHCI help Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
config ROCKCHIP_SDHCI bool "Arasan SDHCI controller for Rockchip support" depends on DM_MMC && BLK && DM_MMC_OPS
- depends on MMC_SDHCI help Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
@@ -116,6 +121,17 @@ config SANDBOX_MMC improves build coverage for sandbox and makes it easier to detect MMC build errors with sandbox.
+config MMC_SDHCI
- bool "Secure Digital Host Controller Interface support"
- help
This selects the generic Secure Digital Host Controller Interface.It is used by manufacturers such as Texas Instruments(R), Ricoh(R)and Toshiba(R). Most controllers found in laptops are of this type.If you have a controller with this interface, say Y here.If unsure, say N.endif
endmenu diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index d850758..236f305 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -48,7 +48,7 @@ ifdef CONFIG_GENERIC_MMC obj-$(CONFIG_SANDBOX) += sandbox_mmc.o endif endif -obj-$(CONFIG_SDHCI) += sdhci.o +obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 8a4950f..51d6ce0 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index f822f48..68212a8 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -31,7 +31,6 @@ #define CONFIG_KONA_GPIO
/* MMC/SD Driver */ -#define CONFIG_SDHCI #define CONFIG_MMC_SDMA #define CONFIG_KONA_SDHCI #define CONFIG_GENERIC_MMC diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 9d06dad..6fd0417 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -30,7 +30,6 @@ #define CONFIG_KONA_GPIO
/* MMC/SD Driver */ -#define CONFIG_SDHCI #define CONFIG_MMC_SDMA #define CONFIG_KONA_SDHCI #define CONFIG_GENERIC_MMC diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index e3735f7..0a5171f 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -45,7 +45,6 @@ */ #define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #define CONFIG_MV_SDHCI #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index cc19148..f50b2a4 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index f863810..8f67d14 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 7333e48..18a3f36 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -45,7 +45,6 @@ */ #define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #define CONFIG_MV_SDHCI #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index c11e581..779e834 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index cbc6126..e6bb919 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -33,7 +33,6 @@
/* This are needed to have proper mmc support */ #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI
#define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds"
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 29b02a0..440e227 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -43,7 +43,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC #define CONFIG_S5P_SDHCI -#define CONFIG_SDHCI #define CONFIG_DWMMC #define CONFIG_EXYNOS_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/galileo.h b/include/configs/galileo.h index b87b04d..6109dd7 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -30,7 +30,6 @@ #undef CONFIG_SCSI
/* SD/MMC support */ -#define CONFIG_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 2922271..cc47d5a 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_SDHCI #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDMA
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 57b91e7..e6fd249 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -91,7 +91,6 @@ /*-----------------------------------------------------------------------
- SDHC Configuration
*/ -#define CONFIG_SDHCI #define CONFIG_GENERIC_MMC
/*-------------------------------------------------- diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 394ec40..eab3f04 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -29,7 +29,6 @@ /* MMC/SD IP block */ #define CONFIG_GENERIC_MMC #define CONFIG_DWMMC -#define CONFIG_SDHCI #define CONFIG_BOUNCE_BUFFER #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index b105fc1..351e234 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -83,7 +83,6 @@
/* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #define CONFIG_MMC_SDHCI_IO_ACCESSORS #define CONFIG_BCM2835_SDHCI
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index c1057aa..a69f086 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -48,7 +48,6 @@
/* MMC */ #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #define CONFIG_S5P_SDHCI #define SDHCI_MAX_HOSTS 4
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 61e3376..4f72c83 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -46,7 +46,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_SDHCI #endif
/* USB device */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 9225e5d..e24e241 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -83,7 +83,6 @@ #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_GENERIC_MMC # define CONFIG_SUPPORT_EMMC_BOOT -# define CONFIG_SDHCI # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000 # endif diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 01e2fca..2fe6897 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -86,7 +86,6 @@ /* MMC */ #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_GENERIC_MMC -# define CONFIG_SDHCI # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #endif
On Wed, Dec 07, 2016 at 10:10:28PM +0900, Masahiro Yamada wrote:
Move CONFIG_SDHCI to Kconfig and rename it to CONFIG_MMC_SDHCI. My motivation for the rename is, ultimately, to make all the MMC options prefixed with MMC_ and SDHCI options with MMC_SDHCI_, like Linux.
This commit was created as follows:
[1] Rename the config option with the following command: find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e 's/CONFIG_SDHCI/CONFIG_MMC_SDHCI/g'
[2] create the entry for MMC_SDHCI in drivers/mmc/Kconfig
[3] run "tools/moveconfig.py -y MMC_SDHCI"
[4] add "depends on MMC_SDHCI" to existing SDHCI driver entries
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Applied to u-boot/master, thanks!
While I moved the options, I also renamed them so that they are all prefixed with MMC_SDHCI_.
This commit was created in the following steps.
[1] Rename with the following command find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e ' s/CONFIG_MMC_SDMA/CONFIG_MMC_SDHCI_SDMA/g s/CONFIG_BCM2835_SDHCI/CONFIG_MMC_SDHCI_BCM2835/g s/CONFIG_KONA_SDHCI/CONFIG_MMC_SDHCI_KONA/g s/CONFIG_MV_SDHCI/CONFIG_MMC_SDHCI_MV/g s/CONFIG_S5P_SDHCI/CONFIG_MMC_SDHCI_S5P/g s/CONFIG_SPEAR_SDHCI/CONFIG_MMC_SDHCI_SPEAR/g '
[2] create the Kconfig entries in drivers/mmc/Kconfig
[3] Move the options by the following command tools/moveconfig.py -y MMC_SDHCI_SDMA MMC_SDHCI_BCM2835 \ MMC_SDHCI_KONA MMC_SDHCI_MV MMC_SDHCI_S5P MMC_SDHCI_SPEAR
[4] Sort drivers/mmc/Makefile for readability
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
Changes in v2: None
arch/arm/mach-mvebu/cpu.c | 2 +- board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 2 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 2 +- configs/arndale_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/bcm11130_defconfig | 2 + configs/bcm11130_nand_defconfig | 2 + configs/bcm23550_w1d_defconfig | 2 + configs/bcm28155_ap_defconfig | 2 + configs/bcm28155_w1d_defconfig | 2 + configs/clearfog_defconfig | 2 + ...conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/db-88f6820-gp_defconfig | 2 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/galileo_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 2 + configs/origen_defconfig | 2 + configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/s5pc210_universal_defconfig | 2 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/smdkv310_defconfig | 2 + configs/snow_defconfig | 1 + configs/spring_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/trats2_defconfig | 2 + configs/trats_defconfig | 2 + drivers/mmc/Kconfig | 64 ++++++++++++++++++++++ drivers/mmc/Makefile | 14 +++-- drivers/mmc/sdhci.c | 10 ++-- include/configs/bayleybay.h | 1 - include/configs/bcm23550_w1d.h | 2 - include/configs/bcm28155_ap.h | 2 - include/configs/clearfog.h | 2 - include/configs/conga-qeval20-qa3-e3845.h | 1 - include/configs/crownbay.h | 1 - include/configs/db-88f6820-gp.h | 2 - include/configs/dfi-bt700.h | 1 - include/configs/exynos-common.h | 1 - include/configs/exynos4-common.h | 1 - include/configs/galileo.h | 1 - include/configs/minnowmax.h | 1 - include/configs/rpi.h | 1 - include/configs/s5p_goni.h | 1 - 54 files changed, 127 insertions(+), 32 deletions(-)
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 5eb2a39..1445731 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -475,7 +475,7 @@ int arch_misc_init(void) } #endif /* CONFIG_ARCH_MISC_INIT */
-#ifdef CONFIG_MV_SDHCI +#ifdef CONFIG_MMC_SDHCI_MV int board_mmc_init(bd_t *bis) { mv_sdh_init(MVEBU_SDIO_BASE, 0, 0, diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c index 0cb059f..533e99e 100644 --- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c +++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c @@ -68,7 +68,7 @@ void dram_init_banksize(void) gd->bd->bi_dram[0].size = gd->ram_size; }
-#ifdef CONFIG_KONA_SDHCI +#ifdef CONFIG_MMC_SDHCI_KONA /* * mmc_init - Initializes mmc */ diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c index b3a4a41..b868812 100644 --- a/board/broadcom/bcm28155_ap/bcm28155_ap.c +++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c @@ -75,7 +75,7 @@ void dram_init_banksize(void) gd->bd->bi_dram[0].size = gd->ram_size; }
-#ifdef CONFIG_KONA_SDHCI +#ifdef CONFIG_MMC_SDHCI_KONA /* * mmc_init - Initializes mmc */ diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index a6eac81..cdfb739 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_SOUND=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SOUND=y CONFIG_I2S=y CONFIG_I2S_SAMSUNG=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 6be1795..63d17b1 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -42,6 +42,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index a1a9678..bf2f1f7 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -19,6 +19,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 8493d1b..7df4a52 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -19,6 +19,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index 121372e..4c7709c 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_defconfig @@ -25,6 +25,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 173bfba..3325a4d 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -26,6 +26,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index d5bb166..b161d38 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -20,6 +20,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 2028568..4587807 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -36,6 +36,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y CONFIG_PCI=y CONFIG_DEBUG_UART=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index a468e13..812f516 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -46,6 +46,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 515d60a..cff6cc2 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -45,6 +45,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 0ff8a2d..784c1b3 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -34,6 +34,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index cd2149d..bcc3128 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 84f0559..b7eb006 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -43,6 +43,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index ca08a9b..7da870f 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -38,6 +38,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 4b4c5f2..f7ac94d 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -42,6 +42,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 3dd0268..a6ec2ee 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -27,6 +27,7 @@ CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_DM_PMIC=y CONFIG_PMIC_S2MPS11=y CONFIG_DM_REGULATOR=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 66391b4..e12208c 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -37,6 +37,8 @@ CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_REGULATOR=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 13ba60c..0dcc9e8 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -30,6 +30,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index d5e11bf..ef02118 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -33,6 +33,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index d71172d..14fe00e 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -33,6 +33,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index da43b39..9d669c9 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 991e5de..d0f7bea 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index a4c7f69..ce28c31 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index e5cd9f8..4a90ca8 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 93d50d1..0271410 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 9b6f902..b6cefb1 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -30,6 +30,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 3c70120..b785efe 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 5bc793c..daa46d4 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index 6347e97..a75a1f0 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -23,5 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index dbb6006..47b498b 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -34,6 +34,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 27e66ec..4a782c8 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -34,6 +34,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index c28357e..f3c2c86 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -43,6 +43,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index b6923bc..9e88201 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 352750d..92cf3f7 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -32,6 +32,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 778469e..521c741 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -132,6 +132,70 @@ config MMC_SDHCI
If unsure, say N.
+config MMC_SDHCI_SDMA + bool "Support SDHCI SDMA" + depends on MMC_SDHCI + help + This enables support for the SDMA (Single Operation DMA) defined + in the SD Host Controller Standard Specification Version 1.00 . + +config MMC_SDHCI_BCM2835 + tristate "SDHCI support for the BCM2835 SD/MMC Controller" + depends on ARCH_BCM283X + depends on MMC_SDHCI + help + This selects the BCM2835 SD/MMC controller. + + If you have a BCM2835 platform with SD or MMC devices, + say Y here. + + If unsure, say N. + +config MMC_SDHCI_KONA + bool "SDHCI support on Broadcom KONA platform" + depends on MMC_SDHCI + help + This selects the Broadcom Kona Secure Digital Host Controller + Interface(SDHCI) support. + This is used in Broadcom mobile SoCs. + + If you have a controller with this interface, say Y here. + +config MMC_SDHCI_MV + bool "SDHCI support on Marvell platform" + depends on ARCH_MVEBU + depends on MMC_SDHCI + help + This selects the Secure Digital Host Controller Interface on + Marvell platform. + + If you have a controller with this interface, say Y here. + + If unsure, say N. + +config MMC_SDHCI_S5P + bool "SDHCI support on Samsung S5P SoC" + depends on MMC_SDHCI + help + This selects the Secure Digital Host Controller Interface (SDHCI) + on Samsung S5P SoCs. + + If you have a controller with this interface, say Y here. + + If unsure, say N. + +config MMC_SDHCI_SPEAR + bool "SDHCI support on ST SPEAr platform" + depends on MMC_SDHCI + help + This selects the Secure Digital Host Controller Interface (SDHCI) + often referrered to as the HSMMC block in some of the ST SPEAR range + of SoC + + If you have a controller with this interface, say Y here. + + If unsure, say N. + endif
endmenu diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 236f305..2b136ea 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -15,7 +15,6 @@ endif
obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o obj-$(CONFIG_ATMEL_SDHCI) += atmel_sdhci.o -obj-$(CONFIG_BCM2835_SDHCI) += bcm2835_sdhci.o obj-$(CONFIG_BFIN_SDH) += bfin_sdh.o obj-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o obj-$(CONFIG_DWMMC) += dw_mmc.o @@ -29,10 +28,8 @@ ifdef CONFIG_SUPPORT_EMMC_BOOT obj-$(CONFIG_GENERIC_MMC) += mmc_boot.o endif obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o -obj-$(CONFIG_KONA_SDHCI) += kona_sdhci.o obj-$(CONFIG_MMC_SPI) += mmc_spi.o obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o -obj-$(CONFIG_MV_SDHCI) += mv_sdhci.o obj-$(CONFIG_MVEBU_MMC) += mvebu_mmc.o obj-$(CONFIG_MXC_MMC) += mxcmmc.o obj-$(CONFIG_MXS_MMC) += mxsmmc.o @@ -42,17 +39,14 @@ obj-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o obj-$(CONFIG_ROCKCHIP_DWMMC) += rockchip_dw_mmc.o obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o obj-$(CONFIG_S3C_SDI) += s3c_sdi.o -obj-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o ifdef CONFIG_BLK ifdef CONFIG_GENERIC_MMC obj-$(CONFIG_SANDBOX) += sandbox_mmc.o endif endif -obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o -obj-$(CONFIG_SPEAR_SDHCI) += spear_sdhci.o obj-$(CONFIG_TEGRA_MMC) += tegra_mmc.o obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o @@ -66,3 +60,11 @@ obj-$(CONFIG_GENERIC_MMC) += mmc_write.o endif obj-$(CONFIG_PIC32_SDHCI) += pic32_sdhci.o obj-$(CONFIG_MSM_SDHCI) += msm_sdhci.o + +# SDHCI +obj-$(CONFIG_MMC_SDHCI) += sdhci.o +obj-$(CONFIG_MMC_SDHCI_BCM2835) += bcm2835_sdhci.o +obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o +obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o +obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o +obj-$(CONFIG_MMC_SDHCI_SPEAR) += spear_sdhci.o diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 766e9ee..cbf5f56 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -72,7 +72,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data, unsigned int start_addr) { unsigned int stat, rdy, mask, timeout, block = 0; -#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA unsigned char ctrl; ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); ctrl &= ~SDHCI_CTRL_DMA_MASK; @@ -98,7 +98,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data, if (++block >= data->blocks) break; } -#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA if (stat & SDHCI_INT_DMA_END) { sdhci_writel(host, SDHCI_INT_DMA_END, SDHCI_INT_STATUS); start_addr &= ~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1); @@ -204,7 +204,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, if (data->flags == MMC_DATA_READ) mode |= SDHCI_TRNS_READ;
-#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA if (data->flags == MMC_DATA_READ) start_addr = (unsigned long)data->dest; else @@ -241,7 +241,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, }
sdhci_writel(host, cmd->cmdarg, SDHCI_ARGUMENT); -#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA trans_bytes = ALIGN(trans_bytes, CONFIG_SYS_CACHELINE_SIZE); flush_cache(start_addr, trans_bytes); #endif @@ -540,7 +540,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
caps = sdhci_readl(host, SDHCI_CAPABILITIES);
-#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA if (!(caps & SDHCI_CAN_DO_SDMA)) { printf("%s: Your controller doesn't support SDMA!!\n", __func__); diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 51d6ce0..8926047 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -25,7 +25,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
/* Environment configuration */ #define CONFIG_ENV_SECT_SIZE 0x1000 diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 68212a8..8f062e2 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -31,8 +31,6 @@ #define CONFIG_KONA_GPIO
/* MMC/SD Driver */ -#define CONFIG_MMC_SDMA -#define CONFIG_KONA_SDHCI #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 6fd0417..0882531 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -30,8 +30,6 @@ #define CONFIG_KONA_GPIO
/* MMC/SD Driver */ -#define CONFIG_MMC_SDMA -#define CONFIG_KONA_SDHCI #define CONFIG_GENERIC_MMC
#define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 0a5171f..e520b1a 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -43,9 +43,7 @@ /* * SDIO/MMC Card Configuration */ -#define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC -#define CONFIG_MV_SDHCI #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
/* Partition support */ diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index f50b2a4..b28a1f2 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -28,7 +28,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
#undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 8f67d14..cef2fd7 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -27,7 +27,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
/* Environment configuration */ #define CONFIG_ENV_SECT_SIZE 0x1000 diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 18a3f36..519f2d3 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -43,9 +43,7 @@ /* * SDIO/MMC Card Configuration */ -#define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC -#define CONFIG_MV_SDHCI #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
/* diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 779e834..727baae 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -30,7 +30,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
#undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 440e227..8532ff5 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -42,7 +42,6 @@
/* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_S5P_SDHCI #define CONFIG_DWMMC #define CONFIG_EXYNOS_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 06fde38..ec45640 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -18,7 +18,6 @@ #define CONFIG_REVISION_TAG
/* SD/MMC configuration */ -#define CONFIG_MMC_SDMA #define CONFIG_MMC_DEFAULT_DEV 0
#undef CONFIG_CMD_ONENAND diff --git a/include/configs/galileo.h b/include/configs/galileo.h index 6109dd7..26eb127 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -31,7 +31,6 @@
/* SD/MMC support */ #define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
/* 10/100M Ethernet support */ #define CONFIG_DESIGNWARE_ETH diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index cc47d5a..5b17fd7 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -28,7 +28,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
#undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 351e234..8005ac1 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -84,7 +84,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDHCI_IO_ACCESSORS -#define CONFIG_BCM2835_SDHCI
#ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index a69f086..6a61e5c 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -48,7 +48,6 @@
/* MMC */ #define CONFIG_GENERIC_MMC -#define CONFIG_S5P_SDHCI #define SDHCI_MAX_HOSTS 4
/* PWM */
On Wed, Dec 07, 2016 at 10:10:29PM +0900, Masahiro Yamada wrote:
While I moved the options, I also renamed them so that they are all prefixed with MMC_SDHCI_.
This commit was created in the following steps.
[1] Rename with the following command find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e ' s/CONFIG_MMC_SDMA/CONFIG_MMC_SDHCI_SDMA/g s/CONFIG_BCM2835_SDHCI/CONFIG_MMC_SDHCI_BCM2835/g s/CONFIG_KONA_SDHCI/CONFIG_MMC_SDHCI_KONA/g s/CONFIG_MV_SDHCI/CONFIG_MMC_SDHCI_MV/g s/CONFIG_S5P_SDHCI/CONFIG_MMC_SDHCI_S5P/g s/CONFIG_SPEAR_SDHCI/CONFIG_MMC_SDHCI_SPEAR/g '
[2] create the Kconfig entries in drivers/mmc/Kconfig
[3] Move the options by the following command tools/moveconfig.py -y MMC_SDHCI_SDMA MMC_SDHCI_BCM2835 \ MMC_SDHCI_KONA MMC_SDHCI_MV MMC_SDHCI_S5P MMC_SDHCI_SPEAR
[4] Sort drivers/mmc/Makefile for readability
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
Reviewed-by: Tom Rini trini@konsulko.com
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
While I moved the options, I also renamed them so that they are all prefixed with MMC_SDHCI_.
This commit was created in the following steps.
[1] Rename with the following command find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e ' s/CONFIG_MMC_SDMA/CONFIG_MMC_SDHCI_SDMA/g s/CONFIG_BCM2835_SDHCI/CONFIG_MMC_SDHCI_BCM2835/g s/CONFIG_KONA_SDHCI/CONFIG_MMC_SDHCI_KONA/g s/CONFIG_MV_SDHCI/CONFIG_MMC_SDHCI_MV/g s/CONFIG_S5P_SDHCI/CONFIG_MMC_SDHCI_S5P/g s/CONFIG_SPEAR_SDHCI/CONFIG_MMC_SDHCI_SPEAR/g '
[2] create the Kconfig entries in drivers/mmc/Kconfig
[3] Move the options by the following command tools/moveconfig.py -y MMC_SDHCI_SDMA MMC_SDHCI_BCM2835 \ MMC_SDHCI_KONA MMC_SDHCI_MV MMC_SDHCI_S5P MMC_SDHCI_SPEAR
[4] Sort drivers/mmc/Makefile for readability
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
Changes in v2: None
arch/arm/mach-mvebu/cpu.c | 2 +- board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 2 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 2 +- configs/arndale_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/bcm11130_defconfig | 2 + configs/bcm11130_nand_defconfig | 2 + configs/bcm23550_w1d_defconfig | 2 + configs/bcm28155_ap_defconfig | 2 + configs/bcm28155_w1d_defconfig | 2 + configs/clearfog_defconfig | 2 + ...conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/db-88f6820-gp_defconfig | 2 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/galileo_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 2 + configs/origen_defconfig | 2 + configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/s5pc210_universal_defconfig | 2 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/smdkv310_defconfig | 2 + configs/snow_defconfig | 1 + configs/spring_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/trats2_defconfig | 2 + configs/trats_defconfig | 2 + drivers/mmc/Kconfig | 64 ++++++++++++++++++++++ drivers/mmc/Makefile | 14 +++-- drivers/mmc/sdhci.c | 10 ++-- include/configs/bayleybay.h | 1 - include/configs/bcm23550_w1d.h | 2 - include/configs/bcm28155_ap.h | 2 - include/configs/clearfog.h | 2 - include/configs/conga-qeval20-qa3-e3845.h | 1 - include/configs/crownbay.h | 1 - include/configs/db-88f6820-gp.h | 2 - include/configs/dfi-bt700.h | 1 - include/configs/exynos-common.h | 1 - include/configs/exynos4-common.h | 1 - include/configs/galileo.h | 1 - include/configs/minnowmax.h | 1 - include/configs/rpi.h | 1 - include/configs/s5p_goni.h | 1 - 54 files changed, 127 insertions(+), 32 deletions(-)
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 5eb2a39..1445731 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -475,7 +475,7 @@ int arch_misc_init(void) } #endif /* CONFIG_ARCH_MISC_INIT */
-#ifdef CONFIG_MV_SDHCI +#ifdef CONFIG_MMC_SDHCI_MV int board_mmc_init(bd_t *bis) { mv_sdh_init(MVEBU_SDIO_BASE, 0, 0, diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c index 0cb059f..533e99e 100644 --- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c +++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c @@ -68,7 +68,7 @@ void dram_init_banksize(void) gd->bd->bi_dram[0].size = gd->ram_size; }
-#ifdef CONFIG_KONA_SDHCI +#ifdef CONFIG_MMC_SDHCI_KONA /*
- mmc_init - Initializes mmc
*/ diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c index b3a4a41..b868812 100644 --- a/board/broadcom/bcm28155_ap/bcm28155_ap.c +++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c @@ -75,7 +75,7 @@ void dram_init_banksize(void) gd->bd->bi_dram[0].size = gd->ram_size; }
-#ifdef CONFIG_KONA_SDHCI +#ifdef CONFIG_MMC_SDHCI_KONA /*
- mmc_init - Initializes mmc
*/ diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index a6eac81..cdfb739 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_SOUND=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SOUND=y CONFIG_I2S=y CONFIG_I2S_SAMSUNG=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 6be1795..63d17b1 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -42,6 +42,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index a1a9678..bf2f1f7 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -19,6 +19,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 8493d1b..7df4a52 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -19,6 +19,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index 121372e..4c7709c 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_defconfig @@ -25,6 +25,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 173bfba..3325a4d 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -26,6 +26,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index d5bb166..b161d38 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -20,6 +20,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_KONA=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 2028568..4587807 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -36,6 +36,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y CONFIG_PCI=y CONFIG_DEBUG_UART=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index a468e13..812f516 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -46,6 +46,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 515d60a..cff6cc2 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -45,6 +45,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 0ff8a2d..784c1b3 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -34,6 +34,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index cd2149d..bcc3128 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 84f0559..b7eb006 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -43,6 +43,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index ca08a9b..7da870f 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -38,6 +38,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 4b4c5f2..f7ac94d 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -42,6 +42,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 3dd0268..a6ec2ee 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -27,6 +27,7 @@ CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_DM_PMIC=y CONFIG_PMIC_S2MPS11=y CONFIG_DM_REGULATOR=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 66391b4..e12208c 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -37,6 +37,8 @@ CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_REGULATOR=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 13ba60c..0dcc9e8 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -30,6 +30,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index d5e11bf..ef02118 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -33,6 +33,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index d71172d..14fe00e 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -33,6 +33,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index da43b39..9d669c9 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 991e5de..d0f7bea 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index a4c7f69..ce28c31 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index e5cd9f8..4a90ca8 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y CONFIG_OF_EMBED=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 93d50d1..0271410 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 9b6f902..b6cefb1 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -30,6 +30,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 3c70120..b785efe 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 5bc793c..daa46d4 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C_COMPAT=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index 6347e97..a75a1f0 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -23,5 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index dbb6006..47b498b 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -34,6 +34,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 27e66ec..4a782c8 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -34,6 +34,7 @@ CONFIG_CROS_EC_KEYB=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index c28357e..f3c2c86 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -43,6 +43,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index b6923bc..9e88201 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 352750d..92cf3f7 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -32,6 +32,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_S5P=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 778469e..521c741 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -132,6 +132,70 @@ config MMC_SDHCI
If unsure, say N.+config MMC_SDHCI_SDMA
- bool "Support SDHCI SDMA"
- depends on MMC_SDHCI
- help
This enables support for the SDMA (Single Operation DMA) definedin the SD Host Controller Standard Specification Version 1.00 .+config MMC_SDHCI_BCM2835
- tristate "SDHCI support for the BCM2835 SD/MMC Controller"
- depends on ARCH_BCM283X
- depends on MMC_SDHCI
- help
This selects the BCM2835 SD/MMC controller.If you have a BCM2835 platform with SD or MMC devices,say Y here.If unsure, say N.+config MMC_SDHCI_KONA
- bool "SDHCI support on Broadcom KONA platform"
- depends on MMC_SDHCI
- help
This selects the Broadcom Kona Secure Digital Host ControllerInterface(SDHCI) support.This is used in Broadcom mobile SoCs.If you have a controller with this interface, say Y here.+config MMC_SDHCI_MV
- bool "SDHCI support on Marvell platform"
- depends on ARCH_MVEBU
- depends on MMC_SDHCI
- help
This selects the Secure Digital Host Controller Interface onMarvell platform.If you have a controller with this interface, say Y here.If unsure, say N.+config MMC_SDHCI_S5P
- bool "SDHCI support on Samsung S5P SoC"
- depends on MMC_SDHCI
- help
This selects the Secure Digital Host Controller Interface (SDHCI)on Samsung S5P SoCs.If you have a controller with this interface, say Y here.If unsure, say N.+config MMC_SDHCI_SPEAR
- bool "SDHCI support on ST SPEAr platform"
- depends on MMC_SDHCI
- help
This selects the Secure Digital Host Controller Interface (SDHCI)often referrered to as the HSMMC block in some of the ST SPEAR rangeof SoCIf you have a controller with this interface, say Y here.If unsure, say N.endif
endmenu diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 236f305..2b136ea 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -15,7 +15,6 @@ endif
obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o obj-$(CONFIG_ATMEL_SDHCI) += atmel_sdhci.o -obj-$(CONFIG_BCM2835_SDHCI) += bcm2835_sdhci.o obj-$(CONFIG_BFIN_SDH) += bfin_sdh.o obj-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o obj-$(CONFIG_DWMMC) += dw_mmc.o @@ -29,10 +28,8 @@ ifdef CONFIG_SUPPORT_EMMC_BOOT obj-$(CONFIG_GENERIC_MMC) += mmc_boot.o endif obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o -obj-$(CONFIG_KONA_SDHCI) += kona_sdhci.o obj-$(CONFIG_MMC_SPI) += mmc_spi.o obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o -obj-$(CONFIG_MV_SDHCI) += mv_sdhci.o obj-$(CONFIG_MVEBU_MMC) += mvebu_mmc.o obj-$(CONFIG_MXC_MMC) += mxcmmc.o obj-$(CONFIG_MXS_MMC) += mxsmmc.o @@ -42,17 +39,14 @@ obj-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o obj-$(CONFIG_ROCKCHIP_DWMMC) += rockchip_dw_mmc.o obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o obj-$(CONFIG_S3C_SDI) += s3c_sdi.o -obj-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o ifdef CONFIG_BLK ifdef CONFIG_GENERIC_MMC obj-$(CONFIG_SANDBOX) += sandbox_mmc.o endif endif -obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o -obj-$(CONFIG_SPEAR_SDHCI) += spear_sdhci.o obj-$(CONFIG_TEGRA_MMC) += tegra_mmc.o obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o @@ -66,3 +60,11 @@ obj-$(CONFIG_GENERIC_MMC) += mmc_write.o endif obj-$(CONFIG_PIC32_SDHCI) += pic32_sdhci.o obj-$(CONFIG_MSM_SDHCI) += msm_sdhci.o
+# SDHCI +obj-$(CONFIG_MMC_SDHCI) += sdhci.o +obj-$(CONFIG_MMC_SDHCI_BCM2835) += bcm2835_sdhci.o +obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o +obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o +obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o +obj-$(CONFIG_MMC_SDHCI_SPEAR) += spear_sdhci.o diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 766e9ee..cbf5f56 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -72,7 +72,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data, unsigned int start_addr) { unsigned int stat, rdy, mask, timeout, block = 0; -#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA unsigned char ctrl; ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); ctrl &= ~SDHCI_CTRL_DMA_MASK; @@ -98,7 +98,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data, if (++block >= data->blocks) break; } -#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA if (stat & SDHCI_INT_DMA_END) { sdhci_writel(host, SDHCI_INT_DMA_END, SDHCI_INT_STATUS); start_addr &= ~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1); @@ -204,7 +204,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, if (data->flags == MMC_DATA_READ) mode |= SDHCI_TRNS_READ;
-#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA if (data->flags == MMC_DATA_READ) start_addr = (unsigned long)data->dest; else @@ -241,7 +241,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, }
sdhci_writel(host, cmd->cmdarg, SDHCI_ARGUMENT); -#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA trans_bytes = ALIGN(trans_bytes, CONFIG_SYS_CACHELINE_SIZE); flush_cache(start_addr, trans_bytes); #endif @@ -540,7 +540,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
caps = sdhci_readl(host, SDHCI_CAPABILITIES);
-#ifdef CONFIG_MMC_SDMA +#ifdef CONFIG_MMC_SDHCI_SDMA if (!(caps & SDHCI_CAN_DO_SDMA)) { printf("%s: Your controller doesn't support SDMA!!\n", __func__); diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 51d6ce0..8926047 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -25,7 +25,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
/* Environment configuration */ #define CONFIG_ENV_SECT_SIZE 0x1000 diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 68212a8..8f062e2 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -31,8 +31,6 @@ #define CONFIG_KONA_GPIO
/* MMC/SD Driver */ -#define CONFIG_MMC_SDMA -#define CONFIG_KONA_SDHCI #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 6fd0417..0882531 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -30,8 +30,6 @@ #define CONFIG_KONA_GPIO
/* MMC/SD Driver */ -#define CONFIG_MMC_SDMA -#define CONFIG_KONA_SDHCI #define CONFIG_GENERIC_MMC
#define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 0a5171f..e520b1a 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -43,9 +43,7 @@ /*
- SDIO/MMC Card Configuration
*/ -#define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC -#define CONFIG_MV_SDHCI #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
/* Partition support */ diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index f50b2a4..b28a1f2 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -28,7 +28,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
#undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 8f67d14..cef2fd7 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -27,7 +27,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
/* Environment configuration */ #define CONFIG_ENV_SECT_SIZE 0x1000 diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 18a3f36..519f2d3 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -43,9 +43,7 @@ /*
- SDIO/MMC Card Configuration
*/ -#define CONFIG_MMC_SDMA #define CONFIG_GENERIC_MMC -#define CONFIG_MV_SDHCI #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
/* diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 779e834..727baae 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -30,7 +30,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
#undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 440e227..8532ff5 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -42,7 +42,6 @@
/* SD/MMC configuration */ #define CONFIG_GENERIC_MMC -#define CONFIG_S5P_SDHCI #define CONFIG_DWMMC #define CONFIG_EXYNOS_DWMMC #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 06fde38..ec45640 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -18,7 +18,6 @@ #define CONFIG_REVISION_TAG
/* SD/MMC configuration */ -#define CONFIG_MMC_SDMA #define CONFIG_MMC_DEFAULT_DEV 0
#undef CONFIG_CMD_ONENAND diff --git a/include/configs/galileo.h b/include/configs/galileo.h index 6109dd7..26eb127 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -31,7 +31,6 @@
/* SD/MMC support */ #define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
/* 10/100M Ethernet support */ #define CONFIG_DESIGNWARE_ETH diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index cc47d5a..5b17fd7 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -28,7 +28,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
#define CONFIG_GENERIC_MMC -#define CONFIG_MMC_SDMA
#undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 351e234..8005ac1 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -84,7 +84,6 @@ /* SD/MMC configuration */ #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SDHCI_IO_ACCESSORS -#define CONFIG_BCM2835_SDHCI
#ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index a69f086..6a61e5c 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -48,7 +48,6 @@
/* MMC */ #define CONFIG_GENERIC_MMC -#define CONFIG_S5P_SDHCI #define SDHCI_MAX_HOSTS 4
/* PWM */
On Wed, Dec 07, 2016 at 10:10:29PM +0900, Masahiro Yamada wrote:
While I moved the options, I also renamed them so that they are all prefixed with MMC_SDHCI_.
This commit was created in the following steps.
[1] Rename with the following command find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \ -type f -print | xargs sed -i -e ' s/CONFIG_MMC_SDMA/CONFIG_MMC_SDHCI_SDMA/g s/CONFIG_BCM2835_SDHCI/CONFIG_MMC_SDHCI_BCM2835/g s/CONFIG_KONA_SDHCI/CONFIG_MMC_SDHCI_KONA/g s/CONFIG_MV_SDHCI/CONFIG_MMC_SDHCI_MV/g s/CONFIG_S5P_SDHCI/CONFIG_MMC_SDHCI_S5P/g s/CONFIG_SPEAR_SDHCI/CONFIG_MMC_SDHCI_SPEAR/g '
[2] create the Kconfig entries in drivers/mmc/Kconfig
[3] Move the options by the following command tools/moveconfig.py -y MMC_SDHCI_SDMA MMC_SDHCI_BCM2835 \ MMC_SDHCI_KONA MMC_SDHCI_MV MMC_SDHCI_S5P MMC_SDHCI_SPEAR
[4] Sort drivers/mmc/Makefile for readability
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Applied to u-boot/master, thanks!
This is a user-unconfigurable option that is selected by the drivers that need to overwrite SDHCI IO memory accessors. (BCM2835 SDHCI seems the only driver that needs to do so.)
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v2: None
drivers/mmc/Kconfig | 8 ++++++++ include/configs/rpi.h | 1 - 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 521c741..12df3cf 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -132,6 +132,13 @@ config MMC_SDHCI
If unsure, say N.
+config MMC_SDHCI_IO_ACCESSORS + bool + depends on MMC_SDHCI + help + This is silent Kconfig symbol that is selected by the drivers that + need to overwrite SDHCI IO memory accessors. + config MMC_SDHCI_SDMA bool "Support SDHCI SDMA" depends on MMC_SDHCI @@ -143,6 +150,7 @@ config MMC_SDHCI_BCM2835 tristate "SDHCI support for the BCM2835 SD/MMC Controller" depends on ARCH_BCM283X depends on MMC_SDHCI + select MMC_SDHCI_IO_ACCESSORS help This selects the BCM2835 SD/MMC controller.
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 8005ac1..45d8824 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_SDHCI_IO_ACCESSORS
#ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
This is a user-unconfigurable option that is selected by the drivers that need to overwrite SDHCI IO memory accessors. (BCM2835 SDHCI seems the only driver that needs to do so.)
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
Changes in v2: None
drivers/mmc/Kconfig | 8 ++++++++ include/configs/rpi.h | 1 - 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 521c741..12df3cf 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -132,6 +132,13 @@ config MMC_SDHCI
If unsure, say N.+config MMC_SDHCI_IO_ACCESSORS
- bool
- depends on MMC_SDHCI
- help
This is silent Kconfig symbol that is selected by the drivers thatneed to overwrite SDHCI IO memory accessors.config MMC_SDHCI_SDMA bool "Support SDHCI SDMA" depends on MMC_SDHCI @@ -143,6 +150,7 @@ config MMC_SDHCI_BCM2835 tristate "SDHCI support for the BCM2835 SD/MMC Controller" depends on ARCH_BCM283X depends on MMC_SDHCI
- select MMC_SDHCI_IO_ACCESSORS help This selects the BCM2835 SD/MMC controller.
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 8005ac1..45d8824 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_SDHCI_IO_ACCESSORS
#ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2
On Wed, Dec 07, 2016 at 10:10:30PM +0900, Masahiro Yamada wrote:
This is a user-unconfigurable option that is selected by the drivers that need to overwrite SDHCI IO memory accessors. (BCM2835 SDHCI seems the only driver that needs to do so.)
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Applied to u-boot/master, thanks!
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
I wrote a new SDHCI driver for my new SoCs, but before posting it, I just want to make a clean base for my driver entry.
Of course, I could enable some needed options in my header file (for options in the "white-list"), but I just thought it is a good habit to contribute to Kconfig moves in the area I am working on now.
Some people are actively working on such moves, so this kind of work is really conflict-prone.
I described how to generate each commit in its git-log in case this series becomes out of date.
I created this series based on v2017.01-rc1, but if some other pull requests go in first, I hope Tom will easily reproduce it by following each instruction in the log.
Changes in v2:
- Regenerate based on v2017.01-rc1
- Fix doubled "help"
- Add "default ARM || PPC ||SANDBOX"
Masahiro Yamada (6): Sync defconfig files by savedefconfig mmc: complete unfinished move of CONFIG_MMC mmc: make MMC driver entries dependent on MMC mmc: move CONFIG_SDHCI to Kconfig, renaming to CONFIG_MMC_SDHCI mmc: move some SDHCI related options to Kconfig mmc: move MMC_SDHCI_IO_ACCESSORS to Kconfig
This patch set is delegated to Tom, so i leaves..Thanks!
Best Regards, Jaehoon Chung
arch/arm/mach-mvebu/cpu.c | 2 +- board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 2 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 2 +- board/samsung/common/board.c | 2 +- configs/A10-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino-Lime2_defconfig | 2 +- configs/A20-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino_MICRO_defconfig | 2 +- configs/A20-Olimex-SOM-EVB_defconfig | 2 +- configs/B4420QDS_NAND_defconfig | 1 + configs/B4420QDS_SPIFLASH_defconfig | 1 + configs/B4420QDS_defconfig | 1 + configs/B4860QDS_NAND_defconfig | 1 + configs/B4860QDS_SECURE_BOOT_defconfig | 3 +- configs/B4860QDS_SPIFLASH_defconfig | 1 + configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/B4860QDS_defconfig | 1 + configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_NAND_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 1 + configs/BSC9131RDB_SPIFLASH_defconfig | 1 + configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 2 +- configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 2 +- .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 2 +- .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 2 +- .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 2 +- .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 2 +- configs/Bananapi_defconfig | 2 +- configs/Bananapro_defconfig | 2 +- configs/C29XPCIE_NAND_defconfig | 1 + configs/C29XPCIE_NOR_SECBOOT_defconfig | 3 +- configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 3 +- configs/C29XPCIE_SPIFLASH_defconfig | 1 + configs/C29XPCIE_defconfig | 1 + configs/CPCI2DP_defconfig | 1 + configs/CPCI4052_defconfig | 1 + configs/Chuwi_V7_CW0825_defconfig | 1 - configs/Cubieboard2_defconfig | 2 +- configs/Cubieboard_defconfig | 2 +- configs/Cubietruck_defconfig | 2 +- configs/Itead_Ibox_A20_defconfig | 2 +- configs/Lamobo_R1_defconfig | 2 +- configs/Linksprite_pcDuino3_Nano_defconfig | 2 +- configs/Linksprite_pcDuino3_defconfig | 2 +- configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MPC8313ERDB_33_defconfig | 1 + configs/MPC8313ERDB_66_defconfig | 1 + configs/MPC8313ERDB_NAND_33_defconfig | 1 + configs/MPC8313ERDB_NAND_66_defconfig | 1 + configs/MPC8315ERDB_defconfig | 1 + configs/MPC8323ERDB_defconfig | 1 + configs/MPC832XEMDS_ATM_defconfig | 1 + configs/MPC832XEMDS_HOST_33_defconfig | 1 + configs/MPC832XEMDS_HOST_66_defconfig | 1 + configs/MPC832XEMDS_SLAVE_defconfig | 1 + configs/MPC832XEMDS_defconfig | 1 + configs/MPC8349EMDS_defconfig | 1 + configs/MPC8349ITXGP_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MPC8540ADS_defconfig | 1 + configs/MPC8541CDS_defconfig | 1 + configs/MPC8541CDS_legacy_defconfig | 1 + configs/MPC8544DS_defconfig | 1 + configs/MPC8548CDS_36BIT_defconfig | 1 + configs/MPC8548CDS_defconfig | 1 + configs/MPC8548CDS_legacy_defconfig | 1 + configs/MPC8555CDS_defconfig | 1 + configs/MPC8555CDS_legacy_defconfig | 1 + configs/MPC8560ADS_defconfig | 1 + configs/MPC8568MDS_defconfig | 1 + configs/MPC8572DS_36BIT_defconfig | 1 + configs/MPC8572DS_defconfig | 1 + configs/MPC8610HPCD_defconfig | 4 +- configs/MPC8641HPCN_36BIT_defconfig | 4 +- configs/MPC8641HPCN_defconfig | 4 +- configs/MSI_Primo81_defconfig | 1 - configs/Marsboard_A10_defconfig | 2 +- configs/Mele_A1000_defconfig | 2 +- configs/Mele_M5_defconfig | 2 +- configs/MiniFAP_defconfig | 1 + configs/O2D300_defconfig | 1 + configs/O2DNT2_RAMBOOT_defconfig | 1 + configs/O2DNT2_defconfig | 1 + configs/O2D_defconfig | 1 + configs/O2I_defconfig | 1 + configs/O2MNT_O2M110_defconfig | 1 + configs/O2MNT_O2M112_defconfig | 1 + configs/O2MNT_O2M113_defconfig | 1 + configs/O2MNT_defconfig | 1 + configs/O3DNT_defconfig | 1 + configs/Orangepi_defconfig | 2 +- configs/Orangepi_mini_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 2 +- .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 2 +- .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 2 +- configs/P1023RDB_defconfig | 1 + configs/P2041RDB_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_SECURE_BOOT_defconfig | 2 +- configs/P4080DS_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_NAND_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_SECURE_BOOT_defconfig | 2 +- configs/PATI_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/PLU405_defconfig | 1 + configs/PMC405DE_defconfig | 1 + configs/PMC440_defconfig | 1 + configs/T1023RDB_SECURE_BOOT_defconfig | 2 +- configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 2 +- configs/T1024QDS_SECURE_BOOT_defconfig | 2 +- configs/T1024RDB_SECURE_BOOT_defconfig | 2 +- configs/T1040D4RDB_SECURE_BOOT_defconfig | 2 +- configs/T1040QDS_SECURE_BOOT_defconfig | 2 +- configs/T1040RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042D4RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 2 +- configs/T1042RDB_SECURE_BOOT_defconfig | 2 +- configs/T2080QDS_SECURE_BOOT_defconfig | 2 +- configs/T2080RDB_SECURE_BOOT_defconfig | 2 +- configs/T4160QDS_SECURE_BOOT_defconfig | 2 +- configs/T4240QDS_SECURE_BOOT_defconfig | 2 +- configs/TQM5200S_HIGHBOOT_defconfig | 1 + configs/TQM5200S_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM834x_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/VOM405_defconfig | 1 + configs/Wits_Pro_A20_DKT_defconfig | 2 +- configs/a3m071_defconfig | 1 + configs/a4m072_defconfig | 1 + configs/a4m2k_defconfig | 1 + configs/ac14xx_defconfig | 1 + configs/acadia_defconfig | 1 + configs/adp-ag101p_defconfig | 1 + configs/am43xx_evm_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/am57xx_evm_defconfig | 4 +- configs/am57xx_hs_evm_defconfig | 4 +- configs/arches_defconfig | 1 + configs/aria_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/arndale_defconfig | 3 +- configs/aspenite_defconfig | 1 + configs/at91rm9200ek_defconfig | 1 + configs/at91rm9200ek_ram_defconfig | 1 + configs/at91sam9260ek_dataflash_cs0_defconfig | 1 + configs/at91sam9260ek_dataflash_cs1_defconfig | 1 + configs/at91sam9260ek_nandflash_defconfig | 1 + configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 + configs/at91sam9g10ek_nandflash_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 + configs/at91sam9g20ek_nandflash_defconfig | 1 + configs/at91sam9xeek_dataflash_cs0_defconfig | 1 + configs/at91sam9xeek_dataflash_cs1_defconfig | 1 + configs/at91sam9xeek_nandflash_defconfig | 1 + configs/atngw100_defconfig | 1 + configs/atngw100mkii_defconfig | 1 + configs/atstk1002_defconfig | 1 + configs/axm_defconfig | 1 + configs/axs101_defconfig | 1 + configs/axs103_defconfig | 1 + configs/bamboo_defconfig | 1 + configs/bayleybay_defconfig | 5 +- configs/bcm11130_defconfig | 3 + configs/bcm11130_nand_defconfig | 3 + configs/bcm23550_w1d_defconfig | 3 + configs/bcm28155_ap_defconfig | 3 + configs/bcm28155_w1d_defconfig | 3 + configs/bcm911360_entphn-ns_defconfig | 1 + configs/bcm911360_entphn_defconfig | 1 + configs/bcm911360k_defconfig | 1 + configs/bcm958300k-ns_defconfig | 1 + configs/bcm958300k_defconfig | 1 + configs/bcm958305k_defconfig | 1 + configs/bcm958622hr_defconfig | 1 + configs/bf518f-ezbrd_defconfig | 1 + configs/bf527-ad7160-eval_defconfig | 1 + configs/bf537-stamp_defconfig | 1 + configs/bf548-ezkit_defconfig | 1 + configs/bf609-ezkit_defconfig | 1 + configs/bg0900_defconfig | 1 + configs/blanche_defconfig | 1 + configs/brppt1_nand_defconfig | 1 + configs/bubinga_defconfig | 1 + configs/caddy2_defconfig | 1 + configs/calimain_defconfig | 1 + configs/cam5200_defconfig | 1 + configs/cam5200_niosflash_defconfig | 1 + configs/canmb_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/charon_defconfig | 1 + configs/chromebit_mickey_defconfig | 7 +- configs/chromebook_jerry_defconfig | 2 +- configs/chromebook_link_defconfig | 2 +- configs/chromebook_minnie_defconfig | 2 +- configs/chromebox_panther_defconfig | 2 +- configs/clearfog_defconfig | 3 + configs/cm-bf537e_defconfig | 1 + configs/cm-bf537u_defconfig | 1 + configs/cm5200_defconfig | 1 + ...conga-qeval20-qa3-e3845-internal-uart_defconfig | 5 +- configs/conga-qeval20-qa3-e3845_defconfig | 5 +- configs/coreboot-x86_defconfig | 2 +- configs/corvus_defconfig | 1 + configs/crownbay_defconfig | 5 +- configs/d2net_v2_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/db-88f6720_defconfig | 1 + configs/db-88f6820-amc_defconfig | 1 + configs/db-88f6820-gp_defconfig | 3 + configs/db-mv784mp-gp_defconfig | 1 + configs/devconcenter_defconfig | 1 + configs/devkit3250_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 5 +- configs/digsy_mtc_RAMBOOT_defconfig | 1 + configs/digsy_mtc_defconfig | 1 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 + configs/digsy_mtc_rev5_defconfig | 1 + configs/dlvision-10g_defconfig | 1 + configs/dlvision_defconfig | 1 + configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/dragonboard410c_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/ds414_defconfig | 1 + configs/e2220-1170_defconfig | 8 -- configs/ea20_defconfig | 1 + configs/edb9315a_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/espresso7420_defconfig | 1 + configs/evb-rk3288_defconfig | 2 +- configs/evb-rk3399_defconfig | 3 +- configs/fennec-rk3288_defconfig | 2 +- configs/flea3_defconfig | 1 + configs/fo300_defconfig | 1 + configs/galileo_defconfig | 3 + configs/gdppc440etx_defconfig | 1 + configs/ge_b450v3_defconfig | 2 +- configs/ge_b650v3_defconfig | 2 +- configs/ge_b850v3_defconfig | 2 +- configs/glacier_defconfig | 1 + configs/glacier_ramboot_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/gplugd_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/h2200_defconfig | 1 + configs/haleakala_defconfig | 1 + configs/highbank_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/icon_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/imx31_phycore_defconfig | 1 + configs/imx31_phycore_eet_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 43 ++++----- configs/imx6qdl_icore_nand_defconfig | 41 ++++----- configs/inetspace_v2_defconfig | 1 + configs/inka4x0_defconfig | 1 + configs/integratorap_cm720t_defconfig | 1 + configs/integratorap_cm920t_defconfig | 1 + configs/integratorap_cm926ejs_defconfig | 1 + configs/integratorap_cm946es_defconfig | 1 + configs/integratorcp_cm1136_defconfig | 1 + configs/integratorcp_cm920t_defconfig | 1 + configs/integratorcp_cm926ejs_defconfig | 1 + configs/integratorcp_cm946es_defconfig | 1 + configs/intip_defconfig | 1 + configs/io64_defconfig | 1 + configs/io_defconfig | 1 + configs/iocon_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/jupiter_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/katmai_defconfig | 1 + configs/kc1_defconfig | 2 +- configs/kilauea_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/kylin-rk3036_defconfig | 6 +- configs/kzm9g_defconfig | 1 + configs/ls1012afrdm_qspi_defconfig | 3 +- configs/ls1012aqds_qspi_defconfig | 2 +- configs/ls1012ardb_qspi_defconfig | 2 +- configs/ls1021aiot_qspi_defconfig | 10 +- configs/ls1021aiot_sdcard_defconfig | 13 ++- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 +- .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 1 - configs/ls1046aqds_lpuart_defconfig | 5 +- configs/ls1046ardb_qspi_defconfig | 2 +- configs/ls2080a_emu_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 - configs/ls2080ardb_SECURE_BOOT_defconfig | 1 - configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/luan_defconfig | 1 + configs/lwmon5_defconfig | 1 + configs/makalu_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mecp5123_defconfig | 1 + configs/meesc_dataflash_defconfig | 1 + configs/meesc_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/miniarm-rk3288_defconfig | 2 +- configs/minnowmax_defconfig | 5 +- configs/motionpro_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/mpc8308_p1m_defconfig | 1 + configs/munices_defconfig | 1 + configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_db-88f7040_defconfig | 1 + configs/mvebu_db-88f8040_defconfig | 1 + configs/mx25pdk_defconfig | 2 +- configs/mx31ads_defconfig | 1 + configs/mx31pdk_defconfig | 1 + configs/mx53ard_defconfig | 2 +- configs/mx6ull_14x14_evk_plugin_defconfig | 2 +- configs/mx7dsabresd_secure_defconfig | 6 +- configs/nas220_defconfig | 1 + configs/neo_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/odroid-c2_defconfig | 1 + configs/odroid-xu3_defconfig | 3 +- configs/odroid_defconfig | 4 +- configs/origen_defconfig | 4 +- configs/p2371-0000_defconfig | 8 -- configs/p2371-2180_defconfig | 8 -- configs/p2571_defconfig | 8 -- configs/p2771-0000-000_defconfig | 8 -- configs/p2771-0000-500_defconfig | 8 -- configs/pcm030_LOWBOOT_defconfig | 1 + configs/pcm030_defconfig | 1 + configs/pdm360ng_defconfig | 1 + configs/peach-pi_defconfig | 3 +- configs/peach-pit_defconfig | 3 +- configs/pic32mzdask_defconfig | 2 + configs/pico-imx6ul_defconfig | 2 +- configs/pm9261_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/popmetal-rk3288_defconfig | 2 +- configs/portl2_defconfig | 1 + configs/qemu-ppce500_defconfig | 1 + configs/qemu-x86_defconfig | 2 +- configs/qemu-x86_efi_payload32_defconfig | 2 +- configs/qemu-x86_efi_payload64_defconfig | 4 +- configs/rainier_defconfig | 1 + configs/rainier_ramboot_defconfig | 1 + configs/redwood_defconfig | 1 + configs/rock2_defconfig | 1 - configs/rpi_2_defconfig | 2 + configs/rpi_3_32b_defconfig | 2 + configs/rpi_3_defconfig | 2 + configs/rpi_defconfig | 2 + configs/s5p_goni_defconfig | 2 + configs/s5pc210_universal_defconfig | 3 + configs/salvator-x_defconfig | 1 + configs/sama5d2_ptc_nandflash_defconfig | 1 + configs/sama5d2_ptc_spiflash_defconfig | 1 + configs/sama5d2_xplained_mmc_defconfig | 9 +- configs/sama5d2_xplained_spiflash_defconfig | 7 +- configs/sandbox_defconfig | 1 - configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 - configs/sbc8349_PCI_33_defconfig | 1 + configs/sbc8349_PCI_66_defconfig | 1 + configs/sbc8349_defconfig | 1 + configs/sbc8548_PCI_33_PCIE_defconfig | 1 + configs/sbc8548_PCI_33_defconfig | 1 + configs/sbc8548_PCI_66_PCIE_defconfig | 1 + configs/sbc8548_PCI_66_defconfig | 1 + configs/sbc8548_defconfig | 1 + configs/sbc8641d_defconfig | 1 + configs/sequoia_defconfig | 1 + configs/sequoia_ramboot_defconfig | 1 + configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/smdk5250_defconfig | 3 +- configs/smdk5420_defconfig | 3 +- configs/smdkc100_defconfig | 1 + configs/smdkv310_defconfig | 3 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/sniper_defconfig | 2 +- configs/snow_defconfig | 3 +- configs/socfpga_is1_defconfig | 1 + configs/socrates_defconfig | 1 + configs/som-db5800-som-6867_defconfig | 2 +- configs/spear300_defconfig | 1 + configs/spear300_nand_defconfig | 1 + configs/spear300_usbtty_defconfig | 1 + configs/spear300_usbtty_nand_defconfig | 1 + configs/spear310_defconfig | 1 + configs/spear310_nand_defconfig | 1 + configs/spear310_pnor_defconfig | 1 + configs/spear310_usbtty_defconfig | 1 + configs/spear310_usbtty_nand_defconfig | 1 + configs/spear310_usbtty_pnor_defconfig | 1 + configs/spear320_defconfig | 1 + configs/spear320_nand_defconfig | 1 + configs/spear320_pnor_defconfig | 1 + configs/spear320_usbtty_defconfig | 1 + configs/spear320_usbtty_nand_defconfig | 1 + configs/spear320_usbtty_pnor_defconfig | 1 + configs/spear600_defconfig | 1 + configs/spear600_nand_defconfig | 1 + configs/spear600_usbtty_defconfig | 1 + configs/spear600_usbtty_nand_defconfig | 1 + configs/spring_defconfig | 3 +- configs/stm32f429-discovery_defconfig | 3 +- configs/stm32f746-disco_defconfig | 1 + configs/stv0991_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/sycamore_defconfig | 1 + configs/t3corp_defconfig | 1 + configs/taurus_defconfig | 1 + configs/tcm-bf537_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 5 +- configs/theadorable_debug_defconfig | 2 +- configs/theadorable_defconfig | 2 +- configs/thunderx_88xx_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- configs/tqma6s_wru4_mmc_defconfig | 2 +- configs/trats2_defconfig | 3 + configs/trats_defconfig | 3 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/udoo_neo_defconfig | 3 +- configs/uniphier_ld11_defconfig | 1 + configs/usb_a9263_dataflash_defconfig | 1 + configs/v38b_defconfig | 1 + configs/ve8313_defconfig | 1 + configs/vexpress_aemv8a_dram_defconfig | 1 + configs/vexpress_aemv8a_juno_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/vining_2000_defconfig | 2 - configs/vme8349_defconfig | 1 + configs/walnut_defconfig | 1 + configs/work_92105_defconfig | 1 + configs/wtk_defconfig | 1 + configs/x600_defconfig | 1 + configs/xilinx-ppc405-generic_defconfig | 1 + configs/xilinx-ppc440-generic_defconfig | 1 + configs/xilinx_zynqmp_ep_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + configs/xilinx_zynqmp_zcu102_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/xpedite1000_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + configs/yellowstone_defconfig | 1 + configs/yosemite_defconfig | 1 + configs/yucca_defconfig | 1 + configs/zmx25_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm011_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + drivers/mmc/Kconfig | 102 ++++++++++++++++++++- drivers/mmc/Makefile | 14 +-- drivers/mmc/sdhci.c | 10 +- include/configs/BSC9132QDS.h | 1 - include/configs/MPC8308RDB.h | 2 - include/configs/MPC837XEMDS.h | 2 - include/configs/MPC837XERDB.h | 2 - include/configs/MPC8536DS.h | 2 - include/configs/MPC8569MDS.h | 2 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 2 - include/configs/P3041DS.h | 1 - include/configs/P4080DS.h | 1 - include/configs/P5020DS.h | 1 - include/configs/P5040DS.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 2 - include/configs/T104xRDB.h | 2 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 2 - include/configs/T4240RDB.h | 2 - include/configs/UCP1020.h | 2 - include/configs/adp-ag101p.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/alt.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/apf27.h | 1 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/axs10x.h | 1 - include/configs/bayleybay.h | 3 - include/configs/bcm23550_w1d.h | 4 - include/configs/bcm28155_ap.h | 4 - include/configs/beaver.h | 1 - include/configs/bf518f-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf537-stamp.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/bf609-ezkit.h | 1 - include/configs/brppt1.h | 1 - include/configs/brxre1.h | 1 - include/configs/cardhu.h | 1 - include/configs/cei-tk1-som.h | 1 - include/configs/clearfog.h | 4 - include/configs/cm-bf537e.h | 1 - include/configs/cm-bf537u.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/colibri_t20.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/conga-qeval20-qa3-e3845.h | 3 - include/configs/controlcenterd.h | 1 - include/configs/crownbay.h | 3 - include/configs/cyrus.h | 1 - include/configs/da850evm.h | 1 - include/configs/dalmore.h | 1 - include/configs/db-88f6820-gp.h | 4 - include/configs/dfi-bt700.h | 3 - include/configs/dragonboard410c.h | 2 - include/configs/e2220-1170.h | 1 - include/configs/edb93xx.h | 1 - include/configs/ethernut5.h | 1 - include/configs/exynos-common.h | 3 - include/configs/exynos4-common.h | 1 - include/configs/galileo.h | 3 - include/configs/ge_bx50v3.h | 1 - include/configs/gose.h | 1 - include/configs/harmony.h | 1 - include/configs/hikey.h | 1 - include/configs/hrcon.h | 1 - include/configs/imx27lite-common.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/k2g_evm.h | 1 - include/configs/kc1.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h | 1 - include/configs/legoev3.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/ls2080a_simu.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/m53evk.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/mcx.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/minnowmax.h | 3 - include/configs/mx25pdk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 2 - include/configs/mx53ard.h | 1 - include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53smd.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/mxs.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/nyan-big.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/openrd.h | 1 - include/configs/p1_p2_rdb_pc.h | 2 - include/configs/p1_twr.h | 2 - include/configs/p2371-0000.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/p2571.h | 1 - include/configs/p2771-0000.h | 1 - include/configs/paz00.h | 1 - include/configs/pcm052.h | 1 - include/configs/pepper.h | 1 - include/configs/pic32mzdask.h | 2 - include/configs/pico-imx6ul.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/plutux.h | 1 - include/configs/porter.h | 1 - include/configs/pxa-common.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3399_common.h | 2 - include/configs/rpi.h | 4 - include/configs/s32v234evb.h | 1 - include/configs/s5p_goni.h | 3 - include/configs/sama5d2_xplained.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h | 1 - include/configs/seaboard.h | 1 - include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sheevaplug.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/silk.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/sniper.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/stout.h | 1 - include/configs/strider.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/tcm-bf537.h | 1 - include/configs/tec-ng.h | 1 - include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 3 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/tricorder.h | 1 - include/configs/trimslice.h | 1 - include/configs/ts4800.h | 2 - include/configs/usbarmory.h | 1 - include/configs/venice2.h | 1 - include/configs/ventana.h | 1 - include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 1 - include/configs/vinco.h | 1 - include/configs/whistler.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/xilinx_zynqmp.h | 2 - include/configs/zipitz2.h | 1 - include/configs/zynq-common.h | 2 - 724 files changed, 769 insertions(+), 527 deletions(-)
Hi Jaehoon,
2016-12-09 8:34 GMT+09:00 Jaehoon Chung jh80.chung@samsung.com:
On 12/07/2016 10:10 PM, Masahiro Yamada wrote:
I wrote a new SDHCI driver for my new SoCs, but before posting it, I just want to make a clean base for my driver entry.
Of course, I could enable some needed options in my header file (for options in the "white-list"), but I just thought it is a good habit to contribute to Kconfig moves in the area I am working on now.
Some people are actively working on such moves, so this kind of work is really conflict-prone.
I described how to generate each commit in its git-log in case this series becomes out of date.
I created this series based on v2017.01-rc1, but if some other pull requests go in first, I hope Tom will easily reproduce it by following each instruction in the log.
Changes in v2:
- Regenerate based on v2017.01-rc1
- Fix doubled "help"
- Add "default ARM || PPC ||SANDBOX"
Masahiro Yamada (6): Sync defconfig files by savedefconfig mmc: complete unfinished move of CONFIG_MMC mmc: make MMC driver entries dependent on MMC mmc: move CONFIG_SDHCI to Kconfig, renaming to CONFIG_MMC_SDHCI mmc: move some SDHCI related options to Kconfig mmc: move MMC_SDHCI_IO_ACCESSORS to Kconfig
This patch set is delegated to Tom, so i leaves..Thanks!
Best Regards, Jaehoon Chung
Right. I delegated it to Tom because this series is touching configs/*_defconfig and include/configs/*.h globally.
Tom is taking pull requests from subsystem maintainers all the time. I hope Tom can arrange this series in case he found conflicts.
Still, your review is very appreciated. Thanks!
Hi Tom.
2016-12-07 22:10 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
I wrote a new SDHCI driver for my new SoCs, but before posting it, I just want to make a clean base for my driver entry.
Of course, I could enable some needed options in my header file (for options in the "white-list"), but I just thought it is a good habit to contribute to Kconfig moves in the area I am working on now.
Some people are actively working on such moves, so this kind of work is really conflict-prone.
I described how to generate each commit in its git-log in case this series becomes out of date.
I created this series based on v2017.01-rc1, but if some other pull requests go in first, I hope Tom will easily reproduce it by following each instruction in the log.
This series got Reviewed-by from you and Jaehoon. But it has been left for a while, and it is already staled.
I described how to generate each patch, and if you are planning to manage it by yourself, that's OK.
But, if there is something I can do to get this series in, please let me know. My work is being blocked by this series.
Hi Tom,
2016-12-20 15:17 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
Hi Tom.
2016-12-07 22:10 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
I wrote a new SDHCI driver for my new SoCs, but before posting it, I just want to make a clean base for my driver entry.
Of course, I could enable some needed options in my header file (for options in the "white-list"), but I just thought it is a good habit to contribute to Kconfig moves in the area I am working on now.
Some people are actively working on such moves, so this kind of work is really conflict-prone.
I described how to generate each commit in its git-log in case this series becomes out of date.
I created this series based on v2017.01-rc1, but if some other pull requests go in first, I hope Tom will easily reproduce it by following each instruction in the log.
This series got Reviewed-by from you and Jaehoon. But it has been left for a while, and it is already staled.
I described how to generate each patch, and if you are planning to manage it by yourself, that's OK.
But, if there is something I can do to get this series in, please let me know. My work is being blocked by this series.
I've noticed you are not even responding.
If requested, I can regenerate the series based on the current tree.
If you continue to be silent, I will enable CONFIG in my header in a legacy way to finish my work.
On Mon, Dec 26, 2016 at 08:53:53PM +0900, Masahiro Yamada wrote:
Hi Tom,
2016-12-20 15:17 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
Hi Tom.
2016-12-07 22:10 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
I wrote a new SDHCI driver for my new SoCs, but before posting it, I just want to make a clean base for my driver entry.
Of course, I could enable some needed options in my header file (for options in the "white-list"), but I just thought it is a good habit to contribute to Kconfig moves in the area I am working on now.
Some people are actively working on such moves, so this kind of work is really conflict-prone.
I described how to generate each commit in its git-log in case this series becomes out of date.
I created this series based on v2017.01-rc1, but if some other pull requests go in first, I hope Tom will easily reproduce it by following each instruction in the log.
This series got Reviewed-by from you and Jaehoon. But it has been left for a while, and it is already staled.
I described how to generate each patch, and if you are planning to manage it by yourself, that's OK.
But, if there is something I can do to get this series in, please let me know. My work is being blocked by this series.
I've noticed you are not even responding.
If requested, I can regenerate the series based on the current tree.
If you continue to be silent, I will enable CONFIG in my header in a legacy way to finish my work.
Sorry, I'll be taking a look at applying various patches soon, thanks!
participants (3)
-
Jaehoon Chung -
Masahiro Yamada -
Tom Rini