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)
- 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>
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 735c9ef08ab3b9a6de2d9270bd96417a491de4f3,772fc60c9c3e17422202d8ec98b2622cbe7be0fc..f8978037f2ba9ba8cf7b74891958c4227bcea3a2
@@@ -23,6 -23,6 +23,7 @@@
   * DM support in SPL
   */
  #undef CONFIG_DM_MMC
++#undef CONFIG_DM_MMC_OPS
  #undef OMAP_HSMMC_USE_GPIO
  
  /* select serial console configuration for SPL */