summaryrefslogtreecommitdiff
path: root/arch
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 /arch
parentd09ec7f81650425140776995fc9752189ddf7956 (diff)
parentb3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff)
downloadu-boot-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 'arch')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b2d6e80..a17ba2c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -654,7 +654,7 @@ config ARCH_SUNXI
imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBDISK_SUPPORT
imply SPL_LIBGENERIC_SUPPORT
- imply SPL_MMC_SUPPORT if GENERIC_MMC
+ imply SPL_MMC_SUPPORT if MMC
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT