diff options
author | Andre Heider <a.heider@gmail.com> | 2021-01-17 08:35:32 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-01-30 14:46:32 +0100 |
commit | a9c20d56f1f4e310f154b793df9d4163c34b5b23 (patch) | |
tree | 2cafb6c2fcdcb8fd9218a38eef2407fb7e5c80f7 /package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch | |
parent | 00bf2c0cbe1c6c9625dbb7a6a58042a08539f073 (diff) | |
download | upstream-a9c20d56f1f4e310f154b793df9d4163c34b5b23.tar.gz upstream-a9c20d56f1f4e310f154b793df9d4163c34b5b23.tar.bz2 upstream-a9c20d56f1f4e310f154b793df9d4163c34b5b23.zip |
uboot-mvebu: update to v2021.01
u-boot now detects emmc variants at runtime, we don't need to build
seperate binaries anymore.
Signed-off-by: Andre Heider <a.heider@gmail.com>
Diffstat (limited to 'package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch')
-rw-r--r-- | package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch | 64 |
1 files changed, 0 insertions, 64 deletions
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 deleted file mode 100644 index 85c61098f8..0000000000 --- a/package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch +++ /dev/null @@ -1,64 +0,0 @@ -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 | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- a/arch/arm/dts/armada-3720-espressobin.dts -+++ b/arch/arm/dts/armada-3720-espressobin.dts -@@ -50,8 +50,8 @@ - #include "armada-372x.dtsi" - - / { -- model = "Marvell Armada 3720 Community Board ESPRESSOBin"; -- compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710"; -+ model = "Globalscale Marvell ESPRESSOBin Board"; -+ compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710"; - - chosen { - stdout-path = "serial0:115200n8"; ---- a/board/Marvell/mvebu_armada-37xx/board.c -+++ b/board/Marvell/mvebu_armada-37xx/board.c -@@ -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) - { -- if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) -+ if (!of_machine_is_compatible("globalscale,espressobin")) - return 0; - - /* -@@ -300,7 +300,7 @@ int ft_board_setup(void *blob, struct bd - int part_off; - - /* Fill SPI MTD partitions for Linux kernel on Espressobin */ -- if (!of_machine_is_compatible("marvell,armada-3720-espressobin")) -+ if (!of_machine_is_compatible("globalscale,espressobin")) - return 0; - - spi_off = fdt_node_offset_by_compatible(blob, -1, "jedec,spi-nor"); |