uboot-mvebu: update to v2020.10

[openwrt/staging/dedeckeh.git] / package / boot / uboot-mvebu / patches / 131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch

diff --git a/package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch b/package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch
index 1aef9db900f46ef781b22fefbc0218c625ccb51d..85c61098f8d290555fa2534a210c18e172ba355a 100644 (file)
--- a/package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch
+++ b/package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch
@@ -1,14 +1,16 @@
-From 753947e2c374820dcbc9c86626812aeb7d460653 Mon Sep 17 00:00:00 2001
+From cdcfd9211c805624a702b6ff81b9bd9515344749 Mon Sep 17 00:00:00 2001
 From: Andre Heider <a.heider@gmail.com>
 Date: Fri, 4 Sep 2020 16:34:22 +0200
 Subject: [PATCH] arm64: dts: armada-3720-espressobin: use Linux
  model/compatible strings
 
 Fix the actual board vendor and ease synching dts files from Linux.
+
+Signed-off-by: Andre Heider <a.heider@gmail.com>
 ---
  arch/arm/dts/armada-3720-espressobin.dts | 4 ++--
- board/Marvell/mvebu_armada-37xx/board.c  | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ board/Marvell/mvebu_armada-37xx/board.c  | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 --- a/arch/arm/dts/armada-3720-espressobin.dts
 +++ b/arch/arm/dts/armada-3720-espressobin.dts
@@ -25,7 +27,24 @@ Fix the actual board vendor and ease synching dts files from Linux.
                stdout-path = "serial0:115200n8";
 --- a/board/Marvell/mvebu_armada-37xx/board.c
 +++ b/board/Marvell/mvebu_armada-37xx/board.c
-@@ -201,7 +201,7 @@ static int mii_multi_chip_mode_write(str
+@@ -88,14 +88,14 @@ int board_late_init(void)
+       if (env_get("fdtfile"))
+               return 0;
+ 
+-      if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
++      if (!of_machine_is_compatible("globalscale,espressobin"))
+               return 0;
+ 
+       /* If the memory controller has been configured for DDR4, we're running on v7 */
+       ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
+               & A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
+ 
+-      emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");
++      emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+ 
+       if (ddr4 && emmc)
+               env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
+@@ -248,7 +248,7 @@ static int mii_multi_chip_mode_write(str
  /* Bring-up board-specific network stuff */
  int board_network_enable(struct mii_dev *bus)
  {
@@ -34,7 +53,7 @@ Fix the actual board vendor and ease synching dts files from Linux.
                return 0;
  
        /*
-@@ -253,7 +253,7 @@ int ft_board_setup(void *blob, struct bd
+@@ -300,7 +300,7 @@ int ft_board_setup(void *blob, struct bd
        int part_off;
  
        /* Fill SPI MTD partitions for Linux kernel on Espressobin */