From 1d8551459f909b00e0156959a40ac3cbc9773ef5 Mon Sep 17 00:00:00 2001 From: Patrick Vogelaar Date: Mon, 19 Jun 2023 14:30:38 +0200 Subject: [PATCH] fix(u-boot): revert to u-boot 2019.10 because of several issues with 2023.04 --- .../meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf | 2 -- layers/meta-belden-marvell-bsp/conf/machine/include/cn913x.inc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/layers/meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf b/layers/meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf index 7723ac5..4069321 100644 --- a/layers/meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf +++ b/layers/meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf @@ -5,8 +5,6 @@ require conf/machine/include/cn913x.inc -PREFERRED_VERSION_u-boot = "2019.10-solidrun" - ### Device specific settings # Needed for phy firmware MACHINE_EXTRA_RDEPENDS += "linux-firmware-microchip" diff --git a/layers/meta-belden-marvell-bsp/conf/machine/include/cn913x.inc b/layers/meta-belden-marvell-bsp/conf/machine/include/cn913x.inc index d090783..43d3903 100644 --- a/layers/meta-belden-marvell-bsp/conf/machine/include/cn913x.inc +++ b/layers/meta-belden-marvell-bsp/conf/machine/include/cn913x.inc @@ -11,7 +11,7 @@ require conf/machine/include/soc-family.inc # ***************************************************************************** PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -PREFERRED_VERSION_u-boot ?= "2023.04-marvell" +PREFERRED_VERSION_u-boot ?= "2019.10-solidrun" # All cn913x use the same defconfig for u-boot, but another devicetree by # settings UBOOT_BUILDENV_DEVICE_TREE in the machine configuration file