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

diff --cc configs/A20-OLinuXino_MICRO-eMMC_defconfig
index d4442c2a74f87907e54d21ac5b6d8a8280d61054,a03c752aa6b7dd7744e2ab6d35cd234cc4838816..95ba3250a2841cbd5ca2f0ddfba99555d0ae4466
--- 1/configs/A20-OLinuXino_MICRO-eMMC_defconfig
--- 2/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

diff --cc configs/Bananapi_M2_Ultra_defconfig
Simple merge

diff --cc configs/amarula_a64_relic_defconfig
Simple merge

diff --cc configs/bananapi_m2_berry_defconfig
Simple merge

diff --cc configs/sopine_baseboard_defconfig
Simple merge