Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Tue, 16 May 2017 00:17:56 +0000 (20:17 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 16 May 2017 12:10:50 +0000 (08:10 -0400)
commit4125bbcef6a998ce8580a1f5c53c8c93a56a125b
tree291b37802625be36bced91db4f86b158e41c2e13
parentd09ec7f81650425140776995fc9752189ddf7956
parentb3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b
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>
board/compulab/cm_t54/cm_t54.c
board/gumstix/duovero/duovero.c
board/overo/overo.c
board/quipos/cairo/cairo.c
board/technexion/tao3530/tao3530.c
board/ti/beagle/beagle.c
board/ti/omap5_uevm/evm.c
board/ti/panda/panda.c
common/board_r.c
common/spl/Kconfig
include/configs/omap3_logic.h