uboot-sunxi: bump to 2020.01

[openwrt/staging/mkresin.git] / package / boot / uboot-sunxi / patches / 063-fix-lime2-revK-add-micrel-PHY.patch

diff --git a/package/boot/uboot-sunxi/patches/063-fix-lime2-revK-add-micrel-PHY.patch b/package/boot/uboot-sunxi/patches/063-fix-lime2-revK-add-micrel-PHY.patch
index 9ea0642537b7dfe3fb1827aad0bd45481d23739f..d5536345564f69664fb66cfc3f916b3c346e65e6 100644 (file)
--- a/package/boot/uboot-sunxi/patches/063-fix-lime2-revK-add-micrel-PHY.patch
+++ b/package/boot/uboot-sunxi/patches/063-fix-lime2-revK-add-micrel-PHY.patch
@@ -1,17 +1,17 @@
 --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
 +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
-@@ -8,6 +8,8 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+@@ -9,6 +9,8 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
  CONFIG_USB0_VBUS_PIN="PC17"
  CONFIG_USB0_VBUS_DET="PH5"
  CONFIG_I2C1_ENABLE=y
 +CONFIG_PHY_MICREL=y
 +CONFIG_PHY_MICREL_KSZ90X1=y
  CONFIG_SATAPWR="PC3"
+ CONFIG_SPL_SPI_SUNXI=y
  CONFIG_AHCI=y
- CONFIG_NR_DRAM_BANKS=1
 --- a/configs/A20-OLinuXino-Lime2_defconfig
 +++ b/configs/A20-OLinuXino-Lime2_defconfig
-@@ -7,6 +7,8 @@ CONFIG_MMC0_CD_PIN="PH1"
+@@ -8,6 +8,8 @@ CONFIG_MMC0_CD_PIN="PH1"
  CONFIG_USB0_VBUS_PIN="PC17"
  CONFIG_USB0_VBUS_DET="PH5"
  CONFIG_I2C1_ENABLE=y
@@ -19,10 +19,10 @@
 +CONFIG_PHY_MICREL_KSZ90X1=y
  CONFIG_SATAPWR="PC3"
  CONFIG_AHCI=y
- CONFIG_NR_DRAM_BANKS=1
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 --- a/drivers/net/phy/micrel_ksz90x1.c
 +++ b/drivers/net/phy/micrel_ksz90x1.c
-@@ -13,6 +13,8 @@
+@@ -14,6 +14,8 @@
  #include <errno.h>
  #include <micrel.h>
  #include <phy.h>
@@ -31,7 +31,7 @@
  
  /*
   * KSZ9021 - KSZ9031 common
-@@ -329,6 +331,10 @@ static int ksz9031_phy_extwrite(struct p
+@@ -344,6 +346,10 @@ static int ksz9031_phy_extwrite(struct p
  static int ksz9031_config(struct phy_device *phydev)
  {
        int ret;