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

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc configs/A20-OLinuXino-Lime2-eMMC_defconfig
Simple merge

diff --cc configs/A20-OLinuXino-Lime2_defconfig
Simple merge

diff --cc configs/A20-OLinuXino_MICRO-eMMC_defconfig
index 586e6abab07ddac2136c37ea66a3037d7a6a721e,43bcea92a5550946ade85306db7ea0df1c0a8dbc..7e7f17b51551d55cb144ce082c4efaf8830fdf37
--- 1/configs/A20-OLinuXino_MICRO-eMMC_defconfig
--- 2/configs/A20-OLinuXino_MICRO-eMMC_defconfig
+++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig
@@@ -17,9 -17,9 +17,10 @@@ CONFIG_SPL_I2C_SUPPORT=
  # CONFIG_SPL_DOS_PARTITION is not set
  # CONFIG_SPL_ISO_PARTITION is not set
  # CONFIG_SPL_EFI_PARTITION is not set
 +CONFIG_SCSI_AHCI=y
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_SUN7I_GMAC=y
+ CONFIG_SUN7I_GMAC_FORCE_TXERR=y
  CONFIG_AXP_ALDO3_VOLT=2800
  CONFIG_AXP_ALDO4_VOLT=2800
  CONFIG_SCSI=y

diff --cc configs/A20-OLinuXino_MICRO_defconfig
index 4abac45de504c4d92c875eec2ba2612e390de77c,22eacb370ed82bc08b76dea004718794e493251b..11e75221f7c4a238a38273d49556e4aaa8bd280b
--- 1/configs/A20-OLinuXino_MICRO_defconfig
--- 2/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@@ -18,9 -18,9 +18,10 @@@ CONFIG_SPL_I2C_SUPPORT=
  # CONFIG_SPL_DOS_PARTITION is not set
  # CONFIG_SPL_ISO_PARTITION is not set
  # CONFIG_SPL_EFI_PARTITION is not set
 +CONFIG_SCSI_AHCI=y
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_SUN7I_GMAC=y
+ CONFIG_SUN7I_GMAC_FORCE_TXERR=y
  CONFIG_AXP_ALDO3_VOLT=2800
  CONFIG_AXP_ALDO4_VOLT=2800
  CONFIG_SCSI=y

diff --cc configs/Cubietruck_defconfig
Simple merge

diff --cc include/configs/sunxi-common.h
Simple merge