diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-30 19:46:50 +0900 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2017-01-31 21:50:47 +0900 |
| commit | a5995a5d7b793f74c7c893b752b51cc635a621db (patch) | |
| tree | 2137bc8fca209b176a03115e8c41ec0b2f333874 | |
| parent | 54925327fa11779112bfc947a0c0a0f30623bbc6 (diff) | |
mmc: sandbox: rename CONFIG, fix dependency, and use it in Makefile
[1] Rename CONFIG_SANDBOX_MMC to CONFIG_MMC_SANDBOX for consistency
I want all MMC driver options prefixed with CONFIG_MMC_.
[2] Fix dependency
Add necessary depends on to avoid compile error.
Instead "depends on MMC" is unneeded because this config entry
resides inside of "if MMC".
[3] Currently, this config symbol is not referenced at all.
Use it to enable/disable the driver in Makefile.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | configs/sandbox_defconfig | 2 | ||||
| -rw-r--r-- | configs/sandbox_spl_defconfig | 2 | ||||
| -rw-r--r-- | drivers/mmc/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/mmc/Makefile | 6 |
4 files changed, 6 insertions, 9 deletions
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 877aa94909..01f6f5d5c6 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -94,7 +94,7 @@ CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y CONFIG_SPL_PWRSEQ=y CONFIG_I2C_EEPROM=y -CONFIG_SANDBOX_MMC=y +CONFIG_MMC_SANDBOX=y CONFIG_SPI_FLASH_SANDBOX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 0569647d06..896b15d608 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -104,7 +104,7 @@ CONFIG_CROS_EC_SANDBOX=y CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y CONFIG_SPL_PWRSEQ=y -CONFIG_SANDBOX_MMC=y +CONFIG_MMC_SANDBOX=y CONFIG_SPI_FLASH_SANDBOX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index df4913ba7c..97d245e4dc 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -187,9 +187,10 @@ config MMC_UNIPHIER help This selects support for the SD/MMC Host Controller on UniPhier SoCs. -config SANDBOX_MMC +config MMC_SANDBOX bool "Sandbox MMC support" - depends on MMC && SANDBOX + depends on SANDBOX + depends on BLK && DM_MMC_OPS && OF_CONTROL help This select a dummy sandbox MMC driver. At present this does nothing other than allow sandbox to be build with MMC support. This diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 6af7f79ff8..2747deb488 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -40,11 +40,7 @@ obj-$(CONFIG_X86) += pci_mmc.o obj-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o obj-$(CONFIG_S3C_SDI) += s3c_sdi.o -ifdef CONFIG_BLK -ifdef CONFIG_GENERIC_MMC -obj-$(CONFIG_SANDBOX) += sandbox_mmc.o -endif -endif +obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o |