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.masah...@socionext.com>
> Reviewed-by: Tom Rini <tr...@konsulko.com>
Reviewed-by: Jaehoon Chung <jh80.ch...@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
>
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
