mmc: move CONFIG_SDHCI to Kconfig, renaming to CONFIG_MMC_SDHCI

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>

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 0eb066ce4782a5c281556c572a155d62428d8104..522e0cd67a3a2100985fedfe5b10147e2c2d6f4e 100644 (file)
--- 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 6eef60d1e6f50b4f4e375c8b389e9ab2cb3fad7b..a6eac81d091d1cdfd1980870a06a0ae06f478e10 100644 (file)
--- 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 419a10dec72e58b226e9d49042409f3adb30e73f..6be1795702ef581023c0c9100f3af1b8c942674d 100644 (file)
--- 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 dd37b7e2ef3a45e0b4217c9a97b1171c3db5209b..a1a96781da54447371b22522209fa0fbf4cc2af5 100644 (file)
--- 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 a0130982eb13133cba171792191faf4db36c16ea..8493d1b8758d3ff75b7c839284e872cc19e935c0 100644 (file)
--- 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 8d6d28cd46b86e50dc595c47e3960fdedbd650de..121372e39ec4bd8950e1fe9392faae14032b8c7b 100644 (file)
--- 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 1ceaedaa72db977c525ddd35920d30c51b5dffba..173bfba7bf57a085f7352560fcac1264c115d945 100644 (file)
--- 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 06539fdd47f9012e63e13ddc1970ce79bab3c450..d5bb16607ae341564d26792dc9e9b320476500f5 100644 (file)
--- 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 d06b75c027cbc9b78645156681e7db66b5c39bce..2028568e19da59849e52ad7dbcdca295ecb57906 100644 (file)
--- 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 9144beb7c99127a18a412be1022635ea5103074b..a468e1355403daf25b759663b8d5242a13a36378 100644 (file)
--- 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 8a2e31112779b482fa435fe50c14989c4153e260..515d60ae1c4da14019e7d89e9c2b24ab9d8133e4 100644 (file)
--- 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 be4986bd2f94d114dc3d90e0e016961259e360c1..0ff8a2d32e1d5b9ec768a2e8a804d8bfe80d2ec8 100644 (file)
--- 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 3547d8433f1b88c43efde7f8a99f0262f186013c..cd2149d2f7c91c65751e1e3a17869566a183a585 100644 (file)
--- 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 efe1fc7e68e03d73bbf91d99d442be33ce44eb3b..84f05594b71279f9db5accf37df7eaed2b79de06 100644 (file)
--- 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 4df07639833d60331775324099ac298bf6e7c8c6..b40b5ef825d3f051689e51d8713737d6714b1c86 100644 (file)
--- 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 95029d75f38ea04f7d2a06e9136da1e6deb696ab..6c271047e89dc4e99e1cca27eb29eecad5ef2e06 100644 (file)
--- 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 32c3237c3aec83e6043c966acbd788bb8fc26949..ca08a9b057fe4e0816c042af0f0be0603298c84f 100644 (file)
--- 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 2cacf5bfd7ca613fc4bb075926113906befa5d5d..4b4c5f2754fe88b92491b1acda6ab9d10d9a22cd 100644 (file)
--- 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 727c13af1aa8bedd750637b5415d7029daa7c818..3dd0268dd2dfbc27b3d6f7363f2924ce55fac6f2 100644 (file)
--- 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 e250d16bf03f6369d8152d965c56b4db33a8e5e7..66391b49caf7c3adc2f603bfddd436b80e8896b8 100644 (file)
--- 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 0d91ec1c4d31e9f319591a53c535509d48664ec1..13ba60c9fb180282a68006b81f76d3c271cbf5e6 100644 (file)
--- 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 41b3bcb1c8807f15fb291bad7edcc99141633c42..d5e11bf0412f1fb23a799c538d6d9a110f7cf175 100644 (file)
--- 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 770ab71f4f65a4d826bb377f7353a83d8c09583c..d71172dfed8a99a970bb395f2c64e8397737d634 100644 (file)
--- 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 d98f2992305d12ecb1b1a38fca2064373054d4e6..852eb0a8e78991617ed5ef25d7c9d59b261b1299 100644 (file)
--- 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 fe43122b3653e203e855a51dff7f8a7b68488b3c..da43b392d0f5ad427182da7072965c266d3b6524 100644 (file)
--- 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 b0a8d7e37f251246c73fe17f69b7eeeced04fdf6..991e5debffaa4a621f400fef8a877aba5e311fdd 100644 (file)
--- 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 1618bee1b06d8d10f67ee35bdf5d39325a086960..a4c7f69477ef4ebefa9d6d74cb98b55c34010ddf 100644 (file)
--- 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 30454a5d90190c46a098d6acf0e467301c08b9b1..e5cd9f8b4e1b2dc5b9708eed6d643215264df8ce 100644 (file)
--- 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 2df77677510ca596dd59b183fa2db784711c5d58..1b39f89a87344f35cf03d922d692983505b4efcb 100644 (file)
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -25,6 +25,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_I2C_GPIO=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX8998=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 f1bbdd9da8ad76368436978a71b9f2de003f7ae2..9b6f902ff5b2617b7e59a16b43318bdd2774923a 100644 (file)
--- 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 931defcd980d74789d2a0215b2aee7f3ad969977..a6daef40b1ed2f94e299b144f7101305711562d7 100644 (file)
--- 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 a04f9ea90039c78ff9eb6eb7e4293b9986301a13..41ab772fe634891c104e9b21fc871ab23c1f2f08 100644 (file)
--- 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 0d77be767863611a11a8ca91f7eaf8e4ff0de338..3c701202aae57880e5100b3d30974e1604f6b414 100644 (file)
--- 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 69f8d40b1afb70830c28ba95975b0ed7ef7f0ff4..5bc793ce9a7e28b929e43ae7a1e02727493db627 100644 (file)
--- 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 c8c182b2d5ec2863edd57ba38263c1edc4440d8e..6347e973492ac0335491c4b91cfdc41f958df6c1 100644 (file)
--- 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 19e6117f73ba9f59ded41824aadb1b4e964c5f41..dbb6006e5bcb87fbdf49dcf1362ba56e7c597192 100644 (file)
--- 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 d78588b9f2bc4ffd1ddc6de2b66dc3e6cfabc0ec..27e66ec4a4525d0281b1a6fc861c679614cc45be 100644 (file)
--- 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 70dbe728cdbe168cf90819504020ee980ced72f7..c28357e657e20e0a4fad53869b6e5520036c7b30 100644 (file)
--- 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 3d6161e9f9bcaa719ea19fbdb658fd614d598c6d..e7b6c0fd855436e9e5bdc059d885b12076fd1933 100644 (file)
--- 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 3160f00ba61a2c58e1ed86adcc24113fa7db34bf..2141949ef7e93e98606a310dea6d3705c22a0875 100644 (file)
--- 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 db1ebe9ed0e8f2b3afcf0752433abc4f961ab230..b6923bc9eed4b8c7e59e51206e7ed706c86c7dc5 100644 (file)
--- 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 b25c1c4e027a7177a56d03635257e87dc819e742..352750d295d94c011be978031c64ed99d84f67e8 100644 (file)
--- 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 b223e110c86a67d4df386dfebc2c607df2dd5911..ef7bf8b4d6a121a16407f24cf4a6e76dad99daf1 100644 (file)
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -52,6 +52,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 e3cfcee05971b788c18daf91cc5db8d3dee17111..0663e161ef180bed29a27985d9f4dbe533c3c836 100644 (file)
--- 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 04712923cd9f140deb0f41488db5c872b3e32494..7c75abbe9713ba99608b5eadc46b36769e4aef62 100644 (file)
--- 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 eb8da13a40e7dba2bf275ab230caabd5df7c0c4e..401c0d676f6b0bda4ca876788dff66fdd5ee288d 100644 (file)
--- 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 9f2df491ec543c5668b287dae571677990f9dd6d..71ada10ada500878461a27e2289b84efd7e9ee3e 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_defconfig
@@ -42,6 +42,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 b2b1720a03d1b2b87f98e2271cbc39e6ffdf1b94..64aa32f7e6a3e0ec094954f3ffa3184d9f2cc80f 100644 (file)
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -42,6 +42,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 16d26c0e10ba9dad418764abb410010a4267efb2..7ec5752aac888190ea63afaea0388a2791873c95 100644 (file)
--- 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 3ba6b6686682294c91546d4e325af8aa3ec8a097..d8c76a7146246e6adf64bfe1b7ef6a7ab9b2ae40 100644 (file)
--- 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 117bfda68d7465cdd749c889ae64cf44fc04c1c4..4c652318ce59aaf874f89543f9b5edf94f24c469 100644 (file)
--- 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 ef73849ea1d2ae2f8478e06b295a8165e1310f4f..935a9c920ae52b284c132df622eaa04c4f48167e 100644 (file)
--- 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 1419efa2b8c7cd5d9acd482aed55b6f93eb0d0cd..16a14ae89812d6313bfe7ccca8faa1591568090d 100644 (file)
--- 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 96f00e41380c6b7f0fd61f7232f90e8890675aeb..6f8f3a63bcd65e2ade75b9cb8d132da6bda2f3f9 100644 (file)
--- 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 dfac76458fb789e70a598754c90a3b60c598b6e3..67063245ee572213bfa91fb2fcf3ab9aab39a56a 100644 (file)
--- 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 b151b9cae31f4289cd2d7fc2931c2cb471b4d8b0..7d7ef370d4e2b166e5e0938162156c4bb6514a55 100644 (file)
--- 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 && BLK && DM_MMC_OPS
+       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 94da954be0be62c0135ecff21e1e4890cca13e8e..dd88f7c77f94405ad2c1ae531402bf756f157c5f 100644 (file)
--- 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 8a4950f2d771e36b50c9252bb87951a5702cb2c6..51d6ce0777d2a1f9ea092e6daf232f9ccfd1abba 100644 (file)
--- 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 f822f48a50cc22560f5b562e3564409af8f35684..68212a8983ea3c9d5d4f8aafea2a4567c85e83b3 100644 (file)
--- 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 9d06dad56122f22159c3929928f854af7db4930f..6fd0417c6dc0338fb493cd5ee46a80b67acc4bfc 100644 (file)
--- 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 e3735f7d1ddc39cbe2522df7bedd240476e86932..0a5171f669ec7740ca8445fdd3ebfbf020f6c130 100644 (file)
--- 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 cc191480a9c3965cda4980a82fd6e62d98ddc3c9..f50b2a4c2030bbf0d9a409b8d6e43a178a51d8d2 100644 (file)
--- 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 f863810984c5547c5b2bab3aea17c1380dc4d8cb..8f67d146751cc701449cba5b7cbf3cd15f60ecf6 100644 (file)
--- 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 7333e481f3d3159538ff6f7d3ef4bac6f7d0b8a7..18a3f3688843b464572f0d47253d9b3be6f0f189 100644 (file)
--- 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 c11e581010d2e60f2c25da964e3472ce96d6829f..779e834d9582012171b91c30b5942fb8abc56138 100644 (file)
--- 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 cbc612636136b6f300ada225410ffddb359f559c..e6bb9190c29f73954a31bafbf64e65a00bdd1da9 100644 (file)
--- 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 2a051a98ec24c3a4c7c10c4e188349eec69390b5..8f68f21ff84ea3f88f3d52af5e09402572c7a65f 100644 (file)
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -40,7 +40,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 b87b04df70d1e5944b0fdcc1500d8d928a5f8cbc..6109dd7acbbb2d5c708ce3884d315929a8e7b935 100644 (file)
--- 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 292227114af48f2e0545433e64ac4a6194ebf042..cc47d5a6d47b462983a72c9c9404d45e85886fbe 100644 (file)
--- 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 57b91e797bde3e9e57e89e942f5c3d978de395e5..e6fd2494045c6645b658e4c4d12423a5e8cf19a7 100644 (file)
--- 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 394ec40ca4c28c4b853068da24f98681d0776cb2..eab3f045ac292d9138dbf7983af7c192242592a1 100644 (file)
--- 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 b105fc18d5f75ff37c154a6549d8482050b2092e..351e234a1567c6d130b155d5e0eb2e2f8cb768c7 100644 (file)
--- 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 c1057aa1cbcbcc55ec3b16ffd3ddde1e02c98907..a69f086de5857c1ccbfcd79d91b26d1bbd72f60c 100644 (file)
--- 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 61e337617cfdf4fcf62a66c7af99c157f6bfe76d..4f72c83d6b10bf935b4e9b673944cb5931d72d5e 100644 (file)
--- 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 97de13704f48c96f5b1efe7546bb48141e037d2b..74cbfcf8f39da06dc82eab60f3afcbdb3f80e6d7 100644 (file)
--- 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 01e2fca0209c5835abeec9b68ddb989eb64c3627..2fe6897e31a5bb2ac7836e7074847fc5485e0056 100644 (file)
--- 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