diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-05-09 20:31:39 +0900 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2017-05-15 18:28:23 +0900 |
| commit | 4aa2ba3a34e3e4413c2cc63fc54f3176881b1a56 (patch) | |
| tree | cbbf5270c25df39b4b806727ff18b7c7483320b8 /drivers | |
| parent | 67e09e248fd3ffaa36e0481d78a31be4736d68c0 (diff) | |
| download | u-boot-4aa2ba3a34e3e4413c2cc63fc54f3176881b1a56.zip u-boot-4aa2ba3a34e3e4413c2cc63fc54f3176881b1a56.tar.gz u-boot-4aa2ba3a34e3e4413c2cc63fc54f3176881b1a56.tar.bz2 | |
mmc: replace CONFIG_GENERIC_MMC with CONFIG_MMC
Now CONFIG_GENERIC_MMC and CONFIG_MMC match for all defconfig.
We do not need two options for the same feature. Deprecate the
former.
This commit was generated with the sed script 's/GENERIC_MMC/MMC/'
and manual fixup of drivers/mmc/Kconfig.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/mmc/Makefile | 10 | ||||
| -rw-r--r-- | drivers/mmc/davinci_mmc.c | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index ac57867..0dd4443 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -10,10 +10,6 @@ config MMC If you want MMC/SD/SDIO support, you should say Y here and also to your specific host controller driver. -config GENERIC_MMC - bool "Generic MMC driver framework" - default MMC - config DM_MMC bool "Enable MMC controllers using Driver Model" depends on DM diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index de91f14..75a7cd3 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -6,11 +6,11 @@ # ifdef CONFIG_DM_MMC -obj-$(CONFIG_GENERIC_MMC) += mmc-uclass.o +obj-$(CONFIG_MMC) += mmc-uclass.o endif ifndef CONFIG_BLK -obj-$(CONFIG_GENERIC_MMC) += mmc_legacy.o +obj-$(CONFIG_MMC) += mmc_legacy.o endif obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o @@ -23,9 +23,9 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) += rockchip_dw_mmc.o obj-$(CONFIG_MMC_DW_SOCFPGA) += socfpga_dw_mmc.o obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o -obj-$(CONFIG_GENERIC_MMC) += mmc.o +obj-$(CONFIG_MMC) += mmc.o ifdef CONFIG_SUPPORT_EMMC_BOOT -obj-$(CONFIG_GENERIC_MMC) += mmc_boot.o +obj-$(CONFIG_MMC) += mmc_boot.o endif obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o @@ -46,7 +46,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o else -obj-$(CONFIG_GENERIC_MMC) += mmc_write.o +obj-$(CONFIG_MMC) += mmc_write.o endif # SDHCI diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 9edb668..dd78429 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -347,7 +347,7 @@ static int dmmc_init(struct mmc *mmc) return 0; } -/* Set buswidth or clock as indicated by the GENERIC_MMC framework */ +/* Set buswidth or clock as indicated by the MMC framework */ static int dmmc_set_ios(struct mmc *mmc) { struct davinci_mmc *host = mmc->priv; |