summaryrefslogtreecommitdiff
path: root/common/spl
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-16 00:17:56 (GMT)
committerTom Rini <trini@konsulko.com>2017-05-16 12:10:50 (GMT)
commit4125bbcef6a998ce8580a1f5c53c8c93a56a125b (patch)
tree291b37802625be36bced91db4f86b158e41c2e13 /common/spl
parentd09ec7f81650425140776995fc9752189ddf7956 (diff)
parentb3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff)
downloadu-boot-fsl-qoriq-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.tar.xz
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/spl')
-rw-r--r--common/spl/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index e324e24..5ed3f19 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.