From 1a9e19c1449193571cd8cffebd5238d536989669 Mon Sep 17 00:00:00 2001 From: Patrick Vogelaar Date: Wed, 14 Jun 2023 10:56:48 +0200 Subject: [PATCH] fix(coreos-image-testable): phy firmware not available in coreos-image-testable Reason was that the actual firmware was just added to the coreos-image-all-feature. * use MACHINE_ESSENTIALS_EXTRA_RDEPENDS instead of IMAGE_INSTALL and move to machine config * refined linux-firmware recipe to just have microchip on its own. --- .../recipes-core/images/coreos-image-all-features.bb | 4 ---- .../meta-belden-marvell-bsp/conf/machine/cn9131-bldn-mbv.conf | 4 ++++ layers/openembedded-core | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/layers/meta-belden-coreos/recipes-core/images/coreos-image-all-features.bb b/layers/meta-belden-coreos/recipes-core/images/coreos-image-all-features.bb index 25a5c3b..6cdacc9 100644 --- a/layers/meta-belden-coreos/recipes-core/images/coreos-image-all-features.bb +++ b/layers/meta-belden-coreos/recipes-core/images/coreos-image-all-features.bb @@ -10,7 +10,3 @@ IMAGE_INSTALL:append = "${@bb.utils.contains("IMAGE_FEATURES", "swupdate", " swu # development tools IMAGE_INSTALL:append = " systemd-analyze" - -### Device specific settings -# Needed for phy firmware -IMAGE_INSTALL:append:cn9131-bldn-mbv = " linux-firmware" \ No newline at end of file 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 e424d65..7723ac5 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 @@ -6,3 +6,7 @@ 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/openembedded-core b/layers/openembedded-core index 717b9f1..a70209c 160000 --- a/layers/openembedded-core +++ b/layers/openembedded-core @@ -1 +1 @@ -Subproject commit 717b9f18a51e9c9fd5a471238aa2ea4de439ef17 +Subproject commit a70209cc6b111957b8dda9190e1291911a52286b