From: Tom Rini <trini@konsulko.com>
Date: Tue, 19 Dec 2017 12:57:33 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-sunxi
X-Git-Tag: v2018.01-rc3~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=76cc372879e2f2f0467e8a3875f097d189647793;p=u-boot

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

76cc372879e2f2f0467e8a3875f097d189647793
diff --cc configs/A20-OLinuXino_MICRO-eMMC_defconfig
index 586e6abab0,43bcea92a5..7e7f17b515
--- a/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 4abac45de5,22eacb370e..11e75221f7
--- a/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