From: Tom Rini <trini@konsulko.com>
Date: Fri, 12 Oct 2018 15:54:30 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-sunxi
X-Git-Tag: v2018.11-rc2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19ca29f3ff5811e058360aa275208d219b3078c2;p=oweals%2Fu-boot.git

Merge git://git.denx.de/u-boot-sunxi

[trini: Convert da850evm_nand defconfig now to to SPL_DM]
Signed-off-by: Tom Rini <trini@konsulko.com>
---

19ca29f3ff5811e058360aa275208d219b3078c2
diff --cc configs/da850evm_nand_defconfig
index d13d832e81,d13d832e81..20f8e0ae31
--- a/configs/da850evm_nand_defconfig
+++ b/configs/da850evm_nand_defconfig
@@@ -7,9 -7,9 +7,12 @@@ CONFIG_SPL_LIBCOMMON_SUPPORT=
  CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL=y
++CONFIG_SPL_DM=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
++CONFIG_SPL_OF_CONTROL=y
++CONFIG_SPL_OF_PLATDATA=y
  CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
  CONFIG_BOOTDELAY=3
  CONFIG_VERSION_VARIABLE=y