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 /common | |
| parent | 67e09e248fd3ffaa36e0481d78a31be4736d68c0 (diff) | |
| download | u-boot-4aa2ba3a34e3e4413c2cc63fc54f3176881b1a56.tar.gz | |
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 'common')
| -rw-r--r-- | common/board_r.c | 4 | ||||
| -rw-r--r-- | common/spl/Kconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c index d69a33c4a3..9f34b85a74 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -432,7 +432,7 @@ static int initr_onenand(void) } #endif -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC static int initr_mmc(void) { puts("MMC: "); @@ -815,7 +815,7 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CMD_ONENAND initr_onenand, #endif -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC initr_mmc, #endif #ifdef CONFIG_HAS_DATAFLASH diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f51ae2c484..0d56f10d9f 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -374,7 +374,7 @@ config SPL_LIBGENERIC_SUPPORT config SPL_MMC_SUPPORT bool "Support MMC" - depends on SPL && GENERIC_MMC + depends on SPL && MMC help Enable support for MMC (Multimedia Card) within SPL. This enables the MMC protocol implementation and allows any enabled drivers to |