From: Tom Rini <trini@konsulko.com>
Date: Mon, 20 Aug 2018 17:41:56 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-sunxi
X-Git-Tag: v2018.09-rc3~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b71d9e8b3805305ea4116733f515061710ad7081;p=oweals%2Fu-boot.git

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

b71d9e8b3805305ea4116733f515061710ad7081
diff --cc configs/A20-OLinuXino_MICRO-eMMC_defconfig
index d4442c2a74,a03c752aa6..95ba3250a2
--- a/configs/A20-OLinuXino_MICRO-eMMC_defconfig
+++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig
@@@ -8,9 -8,8 +8,9 @@@ CONFIG_MMC_SUNXI_SLOT_EXTRA=
  CONFIG_I2C1_ENABLE=y
  CONFIG_VIDEO_VGA=y
  CONFIG_SATAPWR="PB8"
- CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
+ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro-emmc"
  CONFIG_AHCI=y
 +CONFIG_NR_DRAM_BANKS=1
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SPL_I2C_SUPPORT=y
  # CONFIG_CMD_FLASH is not set