From patchwork Sun Dec 4 13:23:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 86455 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1055035qgi; Sun, 4 Dec 2016 05:24:50 -0800 (PST) X-Received: by 10.28.174.194 with SMTP id x185mr5069427wme.4.1480857890283; Sun, 04 Dec 2016 05:24:50 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id kk10si11736070wjc.3.2016.12.04.05.24.50; Sun, 04 Dec 2016 05:24:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E8E56B384A; Sun, 4 Dec 2016 14:24:33 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4swlkeXfZD3e; Sun, 4 Dec 2016 14:24:33 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0A564B384D; Sun, 4 Dec 2016 14:24:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65C0FA7593 for ; Sun, 4 Dec 2016 14:24:06 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ze-vtxQMVWha for ; Sun, 4 Dec 2016 14:24:06 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by theia.denx.de (Postfix) with ESMTPS id 0A4334BA16 for ; Sun, 4 Dec 2016 14:24:01 +0100 (CET) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-11.nifty.com with ESMTP id uB4DNQ6k032395; Sun, 4 Dec 2016 22:23:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com uB4DNQ6k032395 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1480857812; bh=BS++MHeaTa2NAtsi3ASpdZP2TQuooWe1x2bx6Pkm5BA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XEkvVa961ox3jXTo5E4HyQjw6f4VgxA7sXyBv0LfftcMRlGbPly7ZkD//VTwV+Pyb nb6FjBqlp0/OSpHtRV4IjmiIYLvE3XZJI+uEcTaThIu4ugDtwK+djffhvu3rbT2HTN IY4h4/NMEFFFlo41XOfUWHXSLLNcOV4sAqxYJbAJKqvsXgxvlCMLGS46cSgNb+iqVD eAVBO2/NREmD6AwRSWkdxquUMsOuzMGrEjiSa7+NFqAkJuw+sWlEqOXcTNAihrTAzN AfymMsJLWQo2RvHP8uV3+l6+iC+0Z5Sp3jXhN132jKbaTcztTxtIJuLysoIOJYvLYi kdRjtvox2SjXQ== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 4 Dec 2016 22:23:12 +0900 Message-Id: <1480857794-27145-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480857794-27145-1-git-send-email-yamada.masahiro@socionext.com> References: <1480857794-27145-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 4/6] mmc: move CONFIG_SDHCI to Kconfig, renaming to CONFIG_MMC_SDHCI X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 MMC_SDHCI" [4] add "depends on MMC_SDHCI" to existing SDHCI driver entries Signed-off-by: Masahiro Yamada --- 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(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot Reviewed-by: Tom Rini 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 43dbed1..f25bca7 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_SOUND=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C=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 49a0414..6d98fae 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_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/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 9b6e4a7..b1d29f8 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_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/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index d850f5f..63dcd1a 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_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_ap_defconfig b/configs/bcm28155_ap_defconfig index 0ae8a55..8a28066 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -26,6 +26,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 9161513..155833b 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -20,6 +20,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 d434ad8..2bca21e 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -36,6 +36,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 9c99310..4135b54 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -33,6 +33,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 d4efbb1..15a8e66 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -22,6 +22,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 f073966..e65ac26 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -23,6 +23,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 3f21cde..9b19005 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -28,6 +28,7 @@ CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y CONFIG_DM_I2C=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 292225b..ba0998f 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -38,6 +38,7 @@ CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C=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 0a79493..89df218 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -30,6 +30,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 ba89c22..5844b91 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -34,6 +34,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 5b758ec..99ef909 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -34,6 +34,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 a53a476..ee29f0b 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_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_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 5a91f04..ae5231a 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -16,6 +16,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 abf3089..9da1e7b 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -16,6 +16,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 0256d00..48e7d55 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_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_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index d440369..786fd43 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -23,6 +23,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 48b8348..b19a7de 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -30,6 +30,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 a9de0ce..4dbd0e2 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -45,6 +45,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 23ea49a..1a042a4 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_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/smdk5250_defconfig b/configs/smdk5250_defconfig index 915aa39..6b0c51f 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C=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 268702e..4adef2a 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DM_I2C=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 0ee09d2..58244aa 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -23,5 +23,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 33c1a35..4c41d83 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -35,6 +35,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 d1771dd..8807ac8 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -35,6 +35,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 e86598f..1828817 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -27,6 +27,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 b01122a..5fff35e 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -27,6 +27,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 51cdf28..903cdd3 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -33,6 +33,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 f4a43aa..1f3338b 100644 --- a/configs/trats_defconfig +++ b/configs/trats_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/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 8c6cab5..af5c8ba 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -51,6 +51,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 775bdeb..232900b 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -42,6 +42,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 1fb0e76..6c5ec93 100644 --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig @@ -36,6 +36,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 cacfd90..71f5f46 100644 --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig @@ -36,5 +36,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 8ae73f4..0440cd8 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -41,6 +41,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 096b471..d7c2828 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -41,6 +41,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 9845ff5..40890ac 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -34,6 +34,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 b2c8237..55cec3e 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -30,6 +30,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 5163e27..6c76ed1 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -36,6 +36,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 c02f92e..57bb6df 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -36,6 +36,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 67bb502..59394ed 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -31,6 +31,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 0fa9838..9ecdc3d 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -34,6 +34,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 c65a190..8d77fbd 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -36,6 +36,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 0456204..8e9fa2d 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 f2d66ea..053b1c6 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