| Message ID | 1485773215-8797-6-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 1b8587706036122a99734a512946b7e038a4851d |
| Headers | show |
| Series | [1/7] mmc: move CONFIG_GENERIC_MMC to Kconfig | expand |
On 01/30/2017 07:46 PM, Masahiro Yamada wrote: > Make the naming scheme consistent; all SDHCI-base drivers prefixed > with CONFIG_MMC_SDHCI_. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied on u-boot-mmc. Thanks! Best Regards, Jaehoon Chung > --- > > Changes in v2: None > > configs/pic32mzdask_defconfig | 2 +- > drivers/mmc/Kconfig | 14 +++++++------- > drivers/mmc/Makefile | 2 +- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig > index 90a0d32..85c0d2a 100644 > --- a/configs/pic32mzdask_defconfig > +++ b/configs/pic32mzdask_defconfig > @@ -29,7 +29,7 @@ CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_CLK=y > CONFIG_DM_GPIO=y > CONFIG_DM_MMC=y > -CONFIG_PIC32_SDHCI=y > +CONFIG_MMC_SDHCI_PIC32=y > CONFIG_MMC_SDHCI=y > CONFIG_DM_ETH=y > CONFIG_PIC32_ETH=y > diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig > index c9a4ca9..520e7ea 100644 > --- a/drivers/mmc/Kconfig > +++ b/drivers/mmc/Kconfig > @@ -148,13 +148,6 @@ config SH_SDHI > help > Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform > > -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 MMC_UNIPHIER > bool "UniPhier SD/MMC Host Controller support" > depends on ARCH_UNIPHIER > @@ -255,6 +248,13 @@ config MMC_SDHCI_MV > > If unsure, say N. > > +config MMC_SDHCI_PIC32 > + 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 MMC_SDHCI_ROCKCHIP > bool "Arasan SDHCI controller for Rockchip support" > depends on ARCH_ROCKCHIP > diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile > index 7693644..e63f439 100644 > --- a/drivers/mmc/Makefile > +++ b/drivers/mmc/Makefile > @@ -50,7 +50,6 @@ obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o > else > obj-$(CONFIG_GENERIC_MMC) += mmc_write.o > endif > -obj-$(CONFIG_PIC32_SDHCI) += pic32_sdhci.o > > # SDHCI > obj-$(CONFIG_MMC_SDHCI) += sdhci.o > @@ -59,6 +58,7 @@ obj-$(CONFIG_MMC_SDHCI_CADENCE) += sdhci-cadence.o > obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o > obj-$(CONFIG_MMC_SDHCI_MSM) += msm_sdhci.o > obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o > +obj-$(CONFIG_MMC_SDHCI_PIC32) += pic32_sdhci.o > obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.o > obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o > obj-$(CONFIG_MMC_SDHCI_SPEAR) += spear_sdhci.o > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig index 90a0d32..85c0d2a 100644 --- a/configs/pic32mzdask_defconfig +++ b/configs/pic32mzdask_defconfig @@ -29,7 +29,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_CLK=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y -CONFIG_PIC32_SDHCI=y +CONFIG_MMC_SDHCI_PIC32=y CONFIG_MMC_SDHCI=y CONFIG_DM_ETH=y CONFIG_PIC32_ETH=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index c9a4ca9..520e7ea 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -148,13 +148,6 @@ config SH_SDHI help Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform -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 MMC_UNIPHIER bool "UniPhier SD/MMC Host Controller support" depends on ARCH_UNIPHIER @@ -255,6 +248,13 @@ config MMC_SDHCI_MV If unsure, say N. +config MMC_SDHCI_PIC32 + 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 MMC_SDHCI_ROCKCHIP bool "Arasan SDHCI controller for Rockchip support" depends on ARCH_ROCKCHIP diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 7693644..e63f439 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -50,7 +50,6 @@ obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o else obj-$(CONFIG_GENERIC_MMC) += mmc_write.o endif -obj-$(CONFIG_PIC32_SDHCI) += pic32_sdhci.o # SDHCI obj-$(CONFIG_MMC_SDHCI) += sdhci.o @@ -59,6 +58,7 @@ obj-$(CONFIG_MMC_SDHCI_CADENCE) += sdhci-cadence.o obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o obj-$(CONFIG_MMC_SDHCI_MSM) += msm_sdhci.o obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o +obj-$(CONFIG_MMC_SDHCI_PIC32) += pic32_sdhci.o obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.o obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += spear_sdhci.o
Make the naming scheme consistent; all SDHCI-base drivers prefixed with CONFIG_MMC_SDHCI_. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: None configs/pic32mzdask_defconfig | 2 +- drivers/mmc/Kconfig | 14 +++++++------- drivers/mmc/Makefile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot