diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-15 20:17:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-16 08:10:50 -0400 |
| commit | 4125bbcef6a998ce8580a1f5c53c8c93a56a125b (patch) | |
| tree | 291b37802625be36bced91db4f86b158e41c2e13 /common | |
| parent | d09ec7f81650425140776995fc9752189ddf7956 (diff) | |
| parent | b3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff) | |
| download | u-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.tar.gz u-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.tar.bz2 u-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
- Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to
match other TI platforms in the same situation.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 4 | ||||
| -rw-r--r-- | common/spl/Kconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/board_r.c b/common/board_r.c index dba2102b18..28f32c3885 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: "); @@ -798,7 +798,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 e324e24b4f..5ed3f19ac3 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 @@ -743,7 +743,7 @@ config TPL_MPC8XXX_INIT_DDR_SUPPORT config TPL_MMC_SUPPORT bool "Support MMC" - depends on TPL + depends on TPL && MMC help Enable support for MMC within TPL. See SPL_MMC_SUPPORT for details. |