uboot-imx6: bump to 2020.01 and refresh patches

[openwrt/staging/wigyori.git] / package / boot / uboot-imx6 / patches / 110-mx6cuboxi-mmc-fallback.patch

diff --git a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch
index 2b2fde5ec9a6980719ed528658974f9939bd9b38..111e1b980918f103c1073dd23f623ffbd38140a4 100644 (file)
--- a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch
+++ b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch
@@ -1,6 +1,6 @@
 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
 +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
 +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c

-@@ -290,6 +290,12 @@ static void setup_iomux_enet(void)
+@@ -292,6 +292,12 @@ static void setup_iomux_enet(void)

        udelay(100);
  }
  
        udelay(100);
  }
  


@@ -13,14 +13,3 @@
  int board_phy_config(struct phy_device *phydev)
  {
        if (phydev->drv->config)
  int board_phy_config(struct phy_device *phydev)
  {
        if (phydev->drv->config)

---- a/arch/arm/mach-imx/spl.c
-+++ b/arch/arm/mach-imx/spl.c
-@@ -176,7 +176,7 @@ int g_dnl_bind_fixup(struct usb_device_d
- /* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */
- u32 spl_boot_mode(const u32 boot_device)
- {
--      switch (spl_boot_device()) {
-+      switch (boot_device) {
-       /* for MMC return either RAW or FAT mode */
-       case BOOT_DEVICE_MMC1:
-       case BOOT_DEVICE_MMC2: