From: Tom Rini <trini@konsulko.com>
Date: Thu, 9 Feb 2017 16:56:19 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mmc
X-Git-Tag: v2017.03-rc2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f57b19857b514f6e94e423c9bbe2d4b8973a0db;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-mmc
---

6f57b19857b514f6e94e423c9bbe2d4b8973a0db
diff --combined configs/omap3_logic_defconfig
index 7479c52,37ee267..fe762c0
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@@ -5,7 -5,6 +5,7 @@@ CONFIG_SYS_EXTRA_OPTIONS="NAND
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  CONFIG_VERSION_VARIABLE=y
  CONFIG_SPL=y
 +CONFIG_SPL_SYS_MALLOC_SIMPLE=y
  CONFIG_SPL_MTD_SUPPORT=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_HUSH_PARSER=y
@@@ -34,6 -33,7 +34,7 @@@ CONFIG_CMD_UBI=
  CONFIG_ISO_PARTITION=y
  CONFIG_EFI_PARTITION=y
  CONFIG_MMC_OMAP_HS=y
+ CONFIG_MMC_OMAP36XX_PINS=y
  CONFIG_SYS_NS16550=y
  CONFIG_USB=y
  CONFIG_USB_MUSB_GADGET=y