Home Explore Help
Sign In
coolsoul
/
u-boot
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Masahiro Yamada 8 years ago
parent
e298c46ac3
commit
e1ce61fbba
76 changed files with 72 additions and 21 deletions
Unified View Show Diff Stats
  1. 1 1
      board/samsung/common/board.c
  2. 1 0
      configs/arndale_defconfig
  3. 1 0
      configs/bayleybay_defconfig
  4. 1 0
      configs/bcm11130_defconfig
  5. 1 0
      configs/bcm11130_nand_defconfig
  6. 1 0
      configs/bcm23550_w1d_defconfig
  7. 1 0
      configs/bcm28155_ap_defconfig
  8. 1 0
      configs/bcm28155_w1d_defconfig
  9. 1 0
      configs/clearfog_defconfig
  10. 1 0
      configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
  11. 1 0
      configs/conga-qeval20-qa3-e3845_defconfig
  12. 1 0
      configs/crownbay_defconfig
  13. 1 0
      configs/db-88f6820-gp_defconfig
  14. 1 0
      configs/dfi-bt700-q7x-151_defconfig
  15. 1 0
      configs/dragonboard410c_defconfig
  16. 1 0
      configs/evb-rk3399_defconfig
  17. 1 0
      configs/galileo_defconfig
  18. 1 0
      configs/minnowmax_defconfig
  19. 1 0
      configs/odroid-xu3_defconfig
  20. 1 0
      configs/odroid_defconfig
  21. 1 0
      configs/origen_defconfig
  22. 1 0
      configs/peach-pi_defconfig
  23. 1 0
      configs/peach-pit_defconfig
  24. 1 0
      configs/pic32mzdask_defconfig
  25. 1 0
      configs/rpi_2_defconfig
  26. 1 0
      configs/rpi_3_32b_defconfig
  27. 1 0
      configs/rpi_3_defconfig
  28. 1 0
      configs/rpi_defconfig
  29. 1 0
      configs/s5p_goni_defconfig
  30. 1 0
      configs/s5pc210_universal_defconfig
  31. 1 0
      configs/sama5d2_xplained_mmc_defconfig
  32. 1 0
      configs/sama5d2_xplained_spiflash_defconfig
  33. 1 0
      configs/smdk5250_defconfig
  34. 1 0
      configs/smdk5420_defconfig
  35. 1 0
      configs/smdkv310_defconfig
  36. 1 0
      configs/snow_defconfig
  37. 1 0
      configs/spring_defconfig
  38. 1 0
      configs/theadorable-x86-dfi-bt700_defconfig
  39. 1 0
      configs/topic_miami_defconfig
  40. 1 0
      configs/topic_miamiplus_defconfig
  41. 1 0
      configs/trats2_defconfig
  42. 1 0
      configs/trats_defconfig
  43. 1 0
      configs/xilinx_zynqmp_ep_defconfig
  44. 1 0
      configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
  45. 1 0
      configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
  46. 1 0
      configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
  47. 1 0
      configs/xilinx_zynqmp_zcu102_defconfig
  48. 1 0
      configs/xilinx_zynqmp_zcu102_revB_defconfig
  49. 1 0
      configs/zynq_microzed_defconfig
  50. 1 0
      configs/zynq_picozed_defconfig
  51. 1 0
      configs/zynq_zc702_defconfig
  52. 1 0
      configs/zynq_zc706_defconfig
  53. 1 0
      configs/zynq_zc770_xm010_defconfig
  54. 1 0
      configs/zynq_zed_defconfig
  55. 1 0
      configs/zynq_zybo_defconfig
  56. 16 0
      drivers/mmc/Kconfig
  57. 1 1
      drivers/mmc/Makefile
  58. 0 1
      include/configs/bayleybay.h
  59. 0 1
      include/configs/bcm23550_w1d.h
  60. 0 1
      include/configs/bcm28155_ap.h
  61. 0 1
      include/configs/clearfog.h
  62. 0 1
      include/configs/conga-qeval20-qa3-e3845.h
  63. 0 1
      include/configs/crownbay.h
  64. 0 1
      include/configs/db-88f6820-gp.h
  65. 0 1
      include/configs/dfi-bt700.h
  66. 0 1
      include/configs/dragonboard410c.h
  67. 0 1
      include/configs/exynos-common.h
  68. 0 1
      include/configs/galileo.h
  69. 0 1
      include/configs/minnowmax.h
  70. 0 1
      include/configs/pic32mzdask.h
  71. 0 1
      include/configs/rk3399_common.h
  72. 0 1
      include/configs/rpi.h
  73. 0 1
      include/configs/s5p_goni.h
  74. 0 1
      include/configs/sama5d2_xplained.h
  75. 0 1
      include/configs/xilinx_zynqmp.h
  76. 0 1
      include/configs/zynq-common.h

+ 1 - 1
board/samsung/common/board.c
View File 

@@ -251,7 +251,7 @@ int board_eth_init(bd_t *bis)
 
 #ifdef CONFIG_GENERIC_MMC
 
 #ifdef CONFIG_GENERIC_MMC
 
 static int init_mmc(void)
 
 static int init_mmc(void)
 
 {
 
 {
 
-#ifdef CONFIG_SDHCI
 
+#ifdef CONFIG_MMC_SDHCI
 
 	return exynos_mmc_init(gd->fdt_blob);
 
 	return exynos_mmc_init(gd->fdt_blob);
 
 #else
 
 #else
 
 	return 0;
 
 	return 0;

+ 1 - 0
configs/arndale_defconfig
View File 

@@ -22,6 +22,7 @@ CONFIG_CMD_TIME=y
 
 CONFIG_CMD_SOUND=y
 
 CONFIG_CMD_SOUND=y
 
 CONFIG_CMD_EXT4_WRITE=y
 
 CONFIG_CMD_EXT4_WRITE=y
 
 CONFIG_DM_I2C_COMPAT=y
 
 CONFIG_DM_I2C_COMPAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SOUND=y
 
 CONFIG_SOUND=y
 
 CONFIG_I2S=y
 
 CONFIG_I2S=y
 
 CONFIG_I2S_SAMSUNG=y
 
 CONFIG_I2S_SAMSUNG=y

+ 1 - 0
configs/bayleybay_defconfig
View File 

@@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y
 
 CONFIG_REGMAP=y
 
 CONFIG_REGMAP=y
 
 CONFIG_SYSCON=y
 
 CONFIG_SYSCON=y
 
 CONFIG_CPU=y
 
 CONFIG_CPU=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y

+ 1 - 0
configs/bcm11130_defconfig
View File 

@@ -18,6 +18,7 @@ CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_NFS is not set
 
 # CONFIG_CMD_NFS is not set
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/bcm11130_nand_defconfig
View File 

@@ -18,6 +18,7 @@ CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_NFS is not set
 
 # CONFIG_CMD_NFS is not set
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/bcm23550_w1d_defconfig
View File 

@@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_NFS is not set
 
 # CONFIG_CMD_NFS is not set
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/bcm28155_ap_defconfig
View File 

@@ -25,6 +25,7 @@ CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_NFS is not set
 
 # CONFIG_CMD_NFS is not set
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/bcm28155_w1d_defconfig
View File 

@@ -19,6 +19,7 @@ CONFIG_CMD_GPIO=y
 
 # CONFIG_CMD_NFS is not set
 
 # CONFIG_CMD_NFS is not set
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_SYS_NS16550=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/clearfog_defconfig
View File 

@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_SPL_OF_TRANSLATE=y
 
 CONFIG_SPL_OF_TRANSLATE=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_PCI=y
 
 CONFIG_PCI=y
 
 CONFIG_DEBUG_UART=y
 
 CONFIG_DEBUG_UART=y

+ 1 - 0
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
View File 

@@ -45,6 +45,7 @@ CONFIG_CPU=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_SYS_I2C_INTEL=y
 
 CONFIG_SYS_I2C_INTEL=y
 
 CONFIG_WINBOND_W83627=y
 
 CONFIG_WINBOND_W83627=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y

+ 1 - 0
configs/conga-qeval20-qa3-e3845_defconfig
View File 

@@ -44,6 +44,7 @@ CONFIG_CPU=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_SYS_I2C_INTEL=y
 
 CONFIG_SYS_I2C_INTEL=y
 
 CONFIG_WINBOND_W83627=y
 
 CONFIG_WINBOND_W83627=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y

+ 1 - 0
configs/crownbay_defconfig
View File 

@@ -33,6 +33,7 @@ CONFIG_OF_CONTROL=y
 
 CONFIG_REGMAP=y
 
 CONFIG_REGMAP=y
 
 CONFIG_SYSCON=y
 
 CONFIG_SYSCON=y
 
 CONFIG_CPU=y
 
 CONFIG_CPU=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y

+ 1 - 0
configs/db-88f6820-gp_defconfig
View File 

@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_SPL_OF_TRANSLATE=y
 
 CONFIG_SPL_OF_TRANSLATE=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 1 - 0
configs/dfi-bt700-q7x-151_defconfig
View File 

@@ -42,6 +42,7 @@ CONFIG_SYSCON=y
 
 CONFIG_CPU=y
 
 CONFIG_CPU=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_NUVOTON_NCT6102D=y
 
 CONFIG_NUVOTON_NCT6102D=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y

+ 1 - 0
configs/dragonboard410c_defconfig
View File 

@@ -21,6 +21,7 @@ CONFIG_LED=y
 
 CONFIG_LED_GPIO=y
 
 CONFIG_LED_GPIO=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_MSM_SDHCI=y
 
 CONFIG_MSM_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_DM_PMIC=y
 
 CONFIG_DM_PMIC=y
 
 CONFIG_PMIC_PM8916=y
 
 CONFIG_PMIC_PM8916=y
 
 CONFIG_MSM_SERIAL=y
 
 CONFIG_MSM_SERIAL=y

+ 1 - 0
configs/evb-rk3399_defconfig
View File 

@@ -22,6 +22,7 @@ CONFIG_CLK=y
 
 CONFIG_ROCKCHIP_GPIO=y
 
 CONFIG_ROCKCHIP_GPIO=y
 
 CONFIG_ROCKCHIP_DWMMC=y
 
 CONFIG_ROCKCHIP_DWMMC=y
 
 CONFIG_ROCKCHIP_SDHCI=y
 
 CONFIG_ROCKCHIP_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_PINCTRL=y
 
 CONFIG_PINCTRL=y
 
 CONFIG_ROCKCHIP_RK3399_PINCTRL=y
 
 CONFIG_ROCKCHIP_RK3399_PINCTRL=y
 
 CONFIG_REGULATOR_PWM=y
 
 CONFIG_REGULATOR_PWM=y

+ 1 - 0
configs/galileo_defconfig
View File 

@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_REGMAP=y
 
 CONFIG_REGMAP=y
 
 CONFIG_SYSCON=y
 
 CONFIG_SYSCON=y
 
 CONFIG_CPU=y
 
 CONFIG_CPU=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y

+ 1 - 0
configs/minnowmax_defconfig
View File 

@@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y
 
 CONFIG_REGMAP=y
 
 CONFIG_REGMAP=y
 
 CONFIG_SYSCON=y
 
 CONFIG_SYSCON=y
 
 CONFIG_CPU=y
 
 CONFIG_CPU=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y

+ 1 - 0
configs/odroid-xu3_defconfig
View File 

@@ -26,6 +26,7 @@ CONFIG_ADC=y
 
 CONFIG_ADC_EXYNOS=y
 
 CONFIG_ADC_EXYNOS=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DM_I2C_COMPAT=y
 
 CONFIG_DM_I2C_COMPAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_DM_PMIC=y
 
 CONFIG_DM_PMIC=y
 
 CONFIG_PMIC_S2MPS11=y
 
 CONFIG_PMIC_S2MPS11=y
 
 CONFIG_DM_REGULATOR=y
 
 CONFIG_DM_REGULATOR=y

+ 1 - 0
configs/odroid_defconfig
View File 

@@ -36,6 +36,7 @@ CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DM_I2C_COMPAT=y
 
 CONFIG_DM_I2C_COMPAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_DM_PMIC=y
 
 CONFIG_DM_PMIC=y
 
 CONFIG_DM_PMIC_MAX77686=y
 
 CONFIG_DM_PMIC_MAX77686=y
 
 CONFIG_DM_REGULATOR=y
 
 CONFIG_DM_REGULATOR=y

+ 1 - 0
configs/origen_defconfig
View File 

@@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/peach-pi_defconfig
View File 

@@ -32,6 +32,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 
 CONFIG_CROS_EC_KEYB=y
 
 CONFIG_CROS_EC_KEYB=y
 
 CONFIG_CROS_EC=y
 
 CONFIG_CROS_EC=y
 
 CONFIG_CROS_EC_SPI=y
 
 CONFIG_CROS_EC_SPI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SPI_FLASH_WINBOND=y

+ 1 - 0
configs/peach-pit_defconfig
View File 

@@ -32,6 +32,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 
 CONFIG_CROS_EC_KEYB=y
 
 CONFIG_CROS_EC_KEYB=y
 
 CONFIG_CROS_EC=y
 
 CONFIG_CROS_EC=y
 
 CONFIG_CROS_EC_SPI=y
 
 CONFIG_CROS_EC_SPI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SPI_FLASH_WINBOND=y

+ 1 - 0
configs/pic32mzdask_defconfig
View File 

@@ -28,6 +28,7 @@ CONFIG_CLK=y
 
 CONFIG_DM_GPIO=y
 
 CONFIG_DM_GPIO=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_PIC32_SDHCI=y
 
 CONFIG_PIC32_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_DM_ETH=y
 
 CONFIG_DM_ETH=y
 
 CONFIG_PIC32_ETH=y
 
 CONFIG_PIC32_ETH=y
 
 CONFIG_PINCTRL=y
 
 CONFIG_PINCTRL=y

+ 1 - 0
configs/rpi_2_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 
 # CONFIG_CMD_FPGA is not set
 
 # CONFIG_CMD_FPGA is not set
 
 CONFIG_CMD_GPIO=y
 
 CONFIG_CMD_GPIO=y
 
 CONFIG_OF_EMBED=y
 
 CONFIG_OF_EMBED=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_STORAGE=y
 
 CONFIG_USB_STORAGE=y
 
 CONFIG_USB_KEYBOARD=y
 
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/rpi_3_32b_defconfig
View File 

@@ -15,6 +15,7 @@ CONFIG_CMD_USB=y
 
 # CONFIG_CMD_FPGA is not set
 
 # CONFIG_CMD_FPGA is not set
 
 CONFIG_CMD_GPIO=y
 
 CONFIG_CMD_GPIO=y
 
 CONFIG_OF_EMBED=y
 
 CONFIG_OF_EMBED=y
 
+CONFIG_MMC_SDHCI=y
 
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_STORAGE=y
 
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/rpi_3_defconfig
View File 

@@ -15,6 +15,7 @@ CONFIG_CMD_USB=y
 
 # CONFIG_CMD_FPGA is not set
 
 # CONFIG_CMD_FPGA is not set
 
 CONFIG_CMD_GPIO=y
 
 CONFIG_CMD_GPIO=y
 
 CONFIG_OF_EMBED=y
 
 CONFIG_OF_EMBED=y
 
+CONFIG_MMC_SDHCI=y
 
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_STORAGE=y
 
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/rpi_defconfig
View File 

@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 
 # CONFIG_CMD_FPGA is not set
 
 # CONFIG_CMD_FPGA is not set
 
 CONFIG_CMD_GPIO=y
 
 CONFIG_CMD_GPIO=y
 
 CONFIG_OF_EMBED=y
 
 CONFIG_OF_EMBED=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_STORAGE=y
 
 CONFIG_USB_STORAGE=y
 
 CONFIG_USB_KEYBOARD=y
 
 CONFIG_USB_KEYBOARD=y

+ 1 - 0
configs/s5p_goni_defconfig
View File 

@@ -25,6 +25,7 @@ CONFIG_DFU_MMC=y
 
 CONFIG_DM_I2C_GPIO=y
 
 CONFIG_DM_I2C_GPIO=y
 
 CONFIG_DM_PMIC=y
 
 CONFIG_DM_PMIC=y
 
 CONFIG_DM_PMIC_MAX8998=y
 
 CONFIG_DM_PMIC_MAX8998=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET_DWC2_OTG=y
 
 CONFIG_USB_GADGET_DWC2_OTG=y

+ 1 - 0
configs/s5pc210_universal_defconfig
View File 

@@ -29,6 +29,7 @@ CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/sama5d2_xplained_mmc_defconfig
View File 

@@ -44,6 +44,7 @@ CONFIG_DM_I2C=y
 
 CONFIG_SYS_I2C_AT91=y
 
 CONFIG_SYS_I2C_AT91=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_ATMEL_SDHCI=y
 
 CONFIG_ATMEL_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_ATMEL=y
 
 CONFIG_SPI_FLASH_ATMEL=y

+ 1 - 0
configs/sama5d2_xplained_spiflash_defconfig
View File 

@@ -43,6 +43,7 @@ CONFIG_DM_I2C=y
 
 CONFIG_SYS_I2C_AT91=y
 
 CONFIG_SYS_I2C_AT91=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_ATMEL_SDHCI=y
 
 CONFIG_ATMEL_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_DM_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_ATMEL=y
 
 CONFIG_SPI_FLASH_ATMEL=y

+ 1 - 0
configs/smdk5250_defconfig
View File 

@@ -26,6 +26,7 @@ CONFIG_CMD_PMIC=y
 
 CONFIG_CMD_REGULATOR=y
 
 CONFIG_CMD_REGULATOR=y
 
 CONFIG_CMD_EXT4_WRITE=y
 
 CONFIG_CMD_EXT4_WRITE=y
 
 CONFIG_DM_I2C_COMPAT=y
 
 CONFIG_DM_I2C_COMPAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SPI_FLASH_WINBOND=y

+ 1 - 0
configs/smdk5420_defconfig
View File 

@@ -23,6 +23,7 @@ CONFIG_CMD_CACHE=y
 
 CONFIG_CMD_TIME=y
 
 CONFIG_CMD_TIME=y
 
 CONFIG_CMD_EXT4_WRITE=y
 
 CONFIG_CMD_EXT4_WRITE=y
 
 CONFIG_DM_I2C_COMPAT=y
 
 CONFIG_DM_I2C_COMPAT=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SPI_FLASH_WINBOND=y

+ 1 - 0
configs/smdkv310_defconfig
View File 

@@ -22,5 +22,6 @@ CONFIG_CMD_EXT4=y
 
 CONFIG_CMD_EXT4_WRITE=y
 
 CONFIG_CMD_EXT4_WRITE=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_CMD_FS_GENERIC=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_DM_USB=y

+ 1 - 0
configs/snow_defconfig
View File 

@@ -33,6 +33,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 
 CONFIG_CROS_EC_KEYB=y
 
 CONFIG_CROS_EC_KEYB=y
 
 CONFIG_CROS_EC=y
 
 CONFIG_CROS_EC=y
 
 CONFIG_CROS_EC_I2C=y
 
 CONFIG_CROS_EC_I2C=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SPI_FLASH_WINBOND=y

+ 1 - 0
configs/spring_defconfig
View File 

@@ -33,6 +33,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 
 CONFIG_CROS_EC_KEYB=y
 
 CONFIG_CROS_EC_KEYB=y
 
 CONFIG_CROS_EC=y
 
 CONFIG_CROS_EC=y
 
 CONFIG_CROS_EC_I2C=y
 
 CONFIG_CROS_EC_I2C=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_SPI_FLASH_WINBOND=y

+ 1 - 0
configs/theadorable-x86-dfi-bt700_defconfig
View File 

@@ -42,6 +42,7 @@ CONFIG_SYSCON=y
 
 CONFIG_CPU=y
 
 CONFIG_CPU=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_DM_I2C=y
 
 CONFIG_NUVOTON_NCT6102D=y
 
 CONFIG_NUVOTON_NCT6102D=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_GIGADEVICE=y
 
 CONFIG_SPI_FLASH_MACRONIX=y
 
 CONFIG_SPI_FLASH_MACRONIX=y

+ 1 - 0
configs/topic_miami_defconfig
View File 

@@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_OF_EMBED=y
 
 CONFIG_OF_EMBED=y
 
 CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 1 - 0
configs/topic_miamiplus_defconfig
View File 

@@ -26,6 +26,7 @@ CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_OF_EMBED=y
 
 CONFIG_OF_EMBED=y
 
 CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_STMICRO=y

+ 1 - 0
configs/trats2_defconfig
View File 

@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/trats_defconfig
View File 

@@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_OF_CONTROL=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_DM_USB=y
 
 CONFIG_USB_GADGET=y
 
 CONFIG_USB_GADGET=y

+ 1 - 0
configs/xilinx_zynqmp_ep_defconfig
View File 

@@ -52,6 +52,7 @@ CONFIG_DM_I2C=y
 
 CONFIG_SYS_I2C_CADENCE=y
 
 CONFIG_SYS_I2C_CADENCE=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_NAND_ARASAN=y
 
 CONFIG_NAND_ARASAN=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y

+ 1 - 0
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
View File 

@@ -41,6 +41,7 @@ CONFIG_DM_I2C=y
 
 CONFIG_SYS_I2C_CADENCE=y
 
 CONFIG_SYS_I2C_CADENCE=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 1 - 0
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
View File 

@@ -35,6 +35,7 @@ CONFIG_DM_I2C=y
 
 CONFIG_SYS_I2C_CADENCE=y
 
 CONFIG_SYS_I2C_CADENCE=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_DM_ETH=y
 
 CONFIG_DM_ETH=y
 
 CONFIG_ZYNQ_GEM=y
 
 CONFIG_ZYNQ_GEM=y
 
 CONFIG_DEBUG_UART=y
 
 CONFIG_DEBUG_UART=y

+ 1 - 0
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
View File 

@@ -35,5 +35,6 @@ CONFIG_DM_I2C=y
 
 CONFIG_SYS_I2C_CADENCE=y
 
 CONFIG_SYS_I2C_CADENCE=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_DM_ETH=y
 
 CONFIG_DM_ETH=y
 
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

+ 1 - 0
configs/xilinx_zynqmp_zcu102_defconfig
View File 

@@ -42,6 +42,7 @@ CONFIG_FPGA_ZYNQMPPL=y
 
 CONFIG_DM_GPIO=y
 
 CONFIG_DM_GPIO=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 1 - 0
configs/xilinx_zynqmp_zcu102_revB_defconfig
View File 

@@ -42,6 +42,7 @@ CONFIG_FPGA_ZYNQMPPL=y
 
 CONFIG_DM_GPIO=y
 
 CONFIG_DM_GPIO=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_DM_MMC=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 1 - 0
configs/zynq_microzed_defconfig
View File 

@@ -33,6 +33,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 1 - 0
configs/zynq_picozed_defconfig
View File 

@@ -29,6 +29,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_ZYNQ_GEM=y
 
 CONFIG_ZYNQ_GEM=y
 
 CONFIG_USB=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/zynq_zc702_defconfig
View File 

@@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 1 - 0
configs/zynq_zc706_defconfig
View File 

@@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 1 - 0
configs/zynq_zc770_xm010_defconfig
View File 

@@ -30,6 +30,7 @@ CONFIG_CMD_FS_GENERIC=y
 
 CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_NET_RANDOM_ETHADDR=y
 
 CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 1 - 0
configs/zynq_zed_defconfig
View File 

@@ -33,6 +33,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 1 - 0
configs/zynq_zybo_defconfig
View File 

@@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_MMC=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_DFU_RAM=y
 
 CONFIG_ZYNQ_SDHCI=y
 
 CONFIG_ZYNQ_SDHCI=y
 
+CONFIG_MMC_SDHCI=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_BAR=y
 
 CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_SPANSION=y

+ 16 - 0
drivers/mmc/Kconfig
View File 

@@ -50,6 +50,7 @@ config SPL_MMC_TINY
 
 config MSM_SDHCI
 
 config MSM_SDHCI
 
 	bool "Qualcomm SDHCI controller"
 
 	bool "Qualcomm SDHCI controller"
 
 	depends on DM_MMC && BLK && DM_MMC_OPS
 
 	depends on DM_MMC && BLK && DM_MMC_OPS
 
+	depends on MMC_SDHCI
 
 	help
 
 	help
 
 	  Enables support for SDHCI 2.0 controller present on some Qualcomm
 
 	  Enables support for SDHCI 2.0 controller present on some Qualcomm
 
           Snapdragon devices. This device is compatible with eMMC v4.5 and
 
           Snapdragon devices. This device is compatible with eMMC v4.5 and
 
@@ -59,6 +60,7 @@ config MSM_SDHCI
 
 config ATMEL_SDHCI
 
 config ATMEL_SDHCI
 
 	bool "Atmel SDHCI controller support"
 
 	bool "Atmel SDHCI controller support"
 
 	depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
 
 	depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
 
+	depends on MMC_SDHCI
 
 	help
 
 	help
 
 	  This enables support for the Atmel SDHCI controller, which supports
 
 	  This enables support for the Atmel SDHCI controller, which supports
 
 	  the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD
 
 	  the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD
 
@@ -84,18 +86,21 @@ config SH_SDHI
 
 config PIC32_SDHCI
 
 config PIC32_SDHCI
 
 	bool "Microchip PIC32 on-chip SDHCI support"
 
 	bool "Microchip PIC32 on-chip SDHCI support"
 
 	depends on DM_MMC && MACH_PIC32
 
 	depends on DM_MMC && MACH_PIC32
 
+	depends on MMC_SDHCI
 
 	help
 
 	help
 
 	  Support for Microchip PIC32 SDHCI controller.
 
 	  Support for Microchip PIC32 SDHCI controller.
 
 
 
 config ZYNQ_SDHCI
 
 config ZYNQ_SDHCI
 
 	bool "Arasan SDHCI controller support"
 
 	bool "Arasan SDHCI controller support"
 
 	depends on DM_MMC && OF_CONTROL && BLK && DM_MMC_OPS
 
 	depends on DM_MMC && OF_CONTROL && BLK && DM_MMC_OPS
 
+	depends on MMC_SDHCI
 
 	help
 
 	help
 
 	  Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
 
 	  Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
 
 
 
 config ROCKCHIP_SDHCI
 
 config ROCKCHIP_SDHCI
 
 	bool "Arasan SDHCI controller for Rockchip support"
 
 	bool "Arasan SDHCI controller for Rockchip support"
 
 	depends on DM_MMC && BLK && DM_MMC_OPS
 
 	depends on DM_MMC && BLK && DM_MMC_OPS
 
+	depends on MMC_SDHCI
 
 	help
 
 	help
 
 	  Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
 
 	  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
 
 	  improves build coverage for sandbox and makes it easier to detect
 
 	  MMC build errors with sandbox.
 
 	  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
 
 endif
 
 
 
 endmenu
 
 endmenu

+ 1 - 1
drivers/mmc/Makefile
View File 

@@ -48,7 +48,7 @@ ifdef CONFIG_GENERIC_MMC
 
 obj-$(CONFIG_SANDBOX) += sandbox_mmc.o
 
 obj-$(CONFIG_SANDBOX) += sandbox_mmc.o
 
 endif
 
 endif
 
 endif
 
 endif
 
-obj-$(CONFIG_SDHCI) += sdhci.o
 
+obj-$(CONFIG_MMC_SDHCI) += sdhci.o
 
 obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o
 
 obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o
 
 obj-$(CONFIG_SH_SDHI) += sh_sdhi.o
 
 obj-$(CONFIG_SH_SDHI) += sh_sdhi.o
 
 obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o
 
 obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o

+ 0 - 1
include/configs/bayleybay.h
View File 

@@ -24,7 +24,6 @@
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
 
 
-#define CONFIG_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA

+ 0 - 1
include/configs/bcm23550_w1d.h
View File 

@@ -31,7 +31,6 @@
 
 #define CONFIG_KONA_GPIO
 
 #define CONFIG_KONA_GPIO
 
 
 
 /* MMC/SD Driver */
 
 /* MMC/SD Driver */
 
-#define CONFIG_SDHCI
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_KONA_SDHCI
 
 #define CONFIG_KONA_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC

+ 0 - 1
include/configs/bcm28155_ap.h
View File 

@@ -30,7 +30,6 @@
 
 #define CONFIG_KONA_GPIO
 
 #define CONFIG_KONA_GPIO
 
 
 
 /* MMC/SD Driver */
 
 /* MMC/SD Driver */
 
-#define CONFIG_SDHCI
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_KONA_SDHCI
 
 #define CONFIG_KONA_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC

+ 0 - 1
include/configs/clearfog.h
View File 

@@ -45,7 +45,6 @@
 
  */
 
  */
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
-#define CONFIG_SDHCI
 
 #define CONFIG_MV_SDHCI
 
 #define CONFIG_MV_SDHCI
 
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE
 
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE

+ 0 - 1
include/configs/conga-qeval20-qa3-e3845.h
View File 

@@ -27,7 +27,6 @@
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
 
 
-#define CONFIG_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA

+ 0 - 1
include/configs/crownbay.h
View File 

@@ -26,7 +26,6 @@
 
 #define CONFIG_SCSI_DEV_LIST		\
 
 #define CONFIG_SCSI_DEV_LIST		\
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA}
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA}
 
 
 
-#define CONFIG_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA

+ 0 - 1
include/configs/db-88f6820-gp.h
View File 

@@ -45,7 +45,6 @@
 
  */
 
  */
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
-#define CONFIG_SDHCI
 
 #define CONFIG_MV_SDHCI
 
 #define CONFIG_MV_SDHCI
 
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE
 
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE

+ 0 - 1
include/configs/dfi-bt700.h
View File 

@@ -29,7 +29,6 @@
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
 
 
-#define CONFIG_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA

+ 0 - 1
include/configs/dragonboard410c.h
View File 

@@ -33,7 +33,6 @@
 
 
 
 /* This are needed to have proper mmc support */
 
 /* This are needed to have proper mmc support */
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
-#define CONFIG_SDHCI
 
 
 
 #define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds"
 
 #define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds"

+ 0 - 1
include/configs/exynos-common.h
View File 

@@ -40,7 +40,6 @@
 
 /* SD/MMC configuration */
 
 /* SD/MMC configuration */
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_S5P_SDHCI
 
 #define CONFIG_S5P_SDHCI
 
-#define CONFIG_SDHCI
 
 #define CONFIG_DWMMC
 
 #define CONFIG_DWMMC
 
 #define CONFIG_EXYNOS_DWMMC
 
 #define CONFIG_EXYNOS_DWMMC
 
 #define CONFIG_BOUNCE_BUFFER
 
 #define CONFIG_BOUNCE_BUFFER

+ 0 - 1
include/configs/galileo.h
View File 

@@ -30,7 +30,6 @@
 
 #undef CONFIG_SCSI
 
 #undef CONFIG_SCSI
 
 
 
 /* SD/MMC support */
 
 /* SD/MMC support */
 
-#define CONFIG_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA

+ 0 - 1
include/configs/minnowmax.h
View File 

@@ -27,7 +27,6 @@
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
 
 
-#define CONFIG_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_MMC_SDMA
 
 #define CONFIG_MMC_SDMA

+ 0 - 1
include/configs/pic32mzdask.h
View File 

@@ -91,7 +91,6 @@
 
 /*-----------------------------------------------------------------------
 
 /*-----------------------------------------------------------------------
 
  * SDHC Configuration
 
  * SDHC Configuration
 
  */
 
  */
 
-#define CONFIG_SDHCI
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 
 
 /*--------------------------------------------------
 
 /*--------------------------------------------------

+ 0 - 1
include/configs/rk3399_common.h
View File 

@@ -29,7 +29,6 @@
 
 /* MMC/SD IP block */
 
 /* MMC/SD IP block */
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_DWMMC
 
 #define CONFIG_DWMMC
 
-#define CONFIG_SDHCI
 
 #define CONFIG_BOUNCE_BUFFER
 
 #define CONFIG_BOUNCE_BUFFER
 
 #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ	200000000
 
 #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ	200000000

+ 0 - 1
include/configs/rpi.h
View File 

@@ -83,7 +83,6 @@
 
 
 
 /* SD/MMC configuration */
 
 /* SD/MMC configuration */
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
-#define CONFIG_SDHCI
 
 #define CONFIG_MMC_SDHCI_IO_ACCESSORS
 
 #define CONFIG_MMC_SDHCI_IO_ACCESSORS
 
 #define CONFIG_BCM2835_SDHCI
 
 #define CONFIG_BCM2835_SDHCI

+ 0 - 1
include/configs/s5p_goni.h
View File 

@@ -48,7 +48,6 @@
 
 
 
 /* MMC */
 
 /* MMC */
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
-#define CONFIG_SDHCI
 
 #define CONFIG_S5P_SDHCI
 
 #define CONFIG_S5P_SDHCI
 
 #define SDHCI_MAX_HOSTS		4
 
 #define SDHCI_MAX_HOSTS		4

+ 0 - 1
include/configs/sama5d2_xplained.h
View File 

@@ -46,7 +46,6 @@
 
 /* MMC */
 
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
 
 #ifdef CONFIG_CMD_MMC
 
 #define CONFIG_GENERIC_MMC
 
 #define CONFIG_GENERIC_MMC
 
-#define CONFIG_SDHCI
 
 #endif
 
 #endif
 
 
 
 /* USB device */
 
 /* USB device */

+ 0 - 1
include/configs/xilinx_zynqmp.h
View File 

@@ -83,7 +83,6 @@
 
 #if defined(CONFIG_ZYNQ_SDHCI)
 
 #if defined(CONFIG_ZYNQ_SDHCI)
 
 # define CONFIG_GENERIC_MMC
 
 # define CONFIG_GENERIC_MMC
 
 # define CONFIG_SUPPORT_EMMC_BOOT
 
 # define CONFIG_SUPPORT_EMMC_BOOT
 
-# define CONFIG_SDHCI
 
 # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ
 
 # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ
 
 #  define CONFIG_ZYNQ_SDHCI_MAX_FREQ	200000000
 
 #  define CONFIG_ZYNQ_SDHCI_MAX_FREQ	200000000
 
 # endif
 
 # endif

+ 0 - 1
include/configs/zynq-common.h
View File 

@@ -86,7 +86,6 @@
 
 /* MMC */
 
 /* MMC */
 
 #if defined(CONFIG_ZYNQ_SDHCI)
 
 #if defined(CONFIG_ZYNQ_SDHCI)
 
 # define CONFIG_GENERIC_MMC
 
 # define CONFIG_GENERIC_MMC
 
-# define CONFIG_SDHCI
 
 # define CONFIG_ZYNQ_SDHCI_MAX_FREQ	52000000
 
 # define CONFIG_ZYNQ_SDHCI_MAX_FREQ	52000000
 
 #endif
 
 #endif