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>

diff --cc configs/da850evm_nand_defconfig
index d13d832e812b4a98dec0c7c5aeab92c912063f4e,d13d832e812b4a98dec0c7c5aeab92c912063f4e..20f8e0ae31476b38ee198bfdbcbe47ef09c32ab6
--- 1/configs/da850evm_nand_defconfig
--- 2/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