From 34c43073b5a0652c9b2efb059c947014d267018e Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 20 Jun 2026 01:41:28 +0300 Subject: [PATCH 1/4] packagegroup-qcom-m2-firmware: make linux-firmware-ath12k-qcc2072 optional The linux-firmware-ath12k-qcc2072 package is only provided by the linux-firmware package from the mixins layer. Move the package to the separate list, which gets included only if the mixins layer is enabled. Signed-off-by: Dmitry Baryshkov --- recipes-bsp/packagegroups/packagegroup-qcom-m2-firmware.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/packagegroups/packagegroup-qcom-m2-firmware.bb b/recipes-bsp/packagegroups/packagegroup-qcom-m2-firmware.bb index 2bd729dfc..39a568705 100644 --- a/recipes-bsp/packagegroups/packagegroup-qcom-m2-firmware.bb +++ b/recipes-bsp/packagegroups/packagegroup-qcom-m2-firmware.bb @@ -3,10 +3,15 @@ SUMMARY = "Firmware for Qualcomm M.2 wireless attachments" inherit packagegroup QCOM_M2_WIFI_FIRMWARE = " \ - linux-firmware-ath12k-qcc2072 \ linux-firmware-ath12k-qcn9274 \ linux-firmware-ath12k-wcn7850 \ " +# This package is only available from the lts-linux-firmware-mixins layer and +# thus can't be enabled by default. Enable it for Qualcomm machines, which also +# force enable the updated linux-firmware version. +QCOM_M2_WIFI_FIRMWARE:append:qcom = " \ + linux-firmware-ath12k-qcc2072 \ +" QCOM_M2_BT_FIRMWARE = " \ linux-firmware-qca-qcc2072 \ From da65ade031bbc38f213ba96d0f55a50a5a3bca5d Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 20 Jun 2026 01:41:28 +0300 Subject: [PATCH 2/4] hexagon-dsp-binaries: make shikra package optional The linux-firmware-shikra-compute package is only provided by the linux-firmware package from the mixins layer. Move the dependent package to the separate list, which gets included only if the mixins layer is enabled. Signed-off-by: Dmitry Baryshkov --- .../hexagon-dsp-binaries/hexagon-dsp-binaries_20260519.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/hexagon-dsp-binaries/hexagon-dsp-binaries_20260519.bb b/recipes-bsp/hexagon-dsp-binaries/hexagon-dsp-binaries_20260519.bb index d534dad82..0ff508d3d 100644 --- a/recipes-bsp/hexagon-dsp-binaries/hexagon-dsp-binaries_20260519.bb +++ b/recipes-bsp/hexagon-dsp-binaries/hexagon-dsp-binaries_20260519.bb @@ -68,7 +68,6 @@ PACKAGE_BEFORE_PN =+ "\ ${PN}-qcom-sa8775p-ride-gdsp \ ${PN}-qcom-sdm845-hdk-adsp \ ${PN}-qcom-sdm845-hdk-cdsp \ - ${PN}-qcom-shikra-cqs-evk-cdsp \ ${PN}-qcom-sm8750-mtp-adsp \ ${PN}-qcom-sm8750-mtp-cdsp \ ${PN}-radxa-dragon-q6a-adsp \ @@ -87,6 +86,12 @@ PACKAGE_BEFORE_PN =+ "\ ${PN}-thundercomm-rubikpi3-adsp \ ${PN}-thundercomm-rubikpi3-cdsp \ " +# Dependent packages are only available from the lts-linux-firmware-mixins +# layer and thus can't be enabled by default. Enable it for Qualcomm machines, +# which also force enable the updated linux-firmware version. +PACKAGES:append:qcom = " \ + ${PN}-qcom-shikra-cqs-evk-cdsp \ +" LICENSE:${PN} = "dspso-WHENCE" LICENSE:${PN}-conf = "MIT" From 4641830932b2213d0a59dbcd2c22b62b73385873 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 18 Jun 2026 14:00:30 +0300 Subject: [PATCH 3/4] linux-firmware: forcibly enable version from lts-linux-firmware-mixin The linux-firmwre recipe from lts-linux-firmware-mixin is disabled by default in the pending patches in that layer. Enable it as we are mostly using the updated firmware for all the tests. Signed-off-by: Dmitry Baryshkov --- recipes-kernel/linux-firmware/linux-firmware_20260519.bbappend | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 recipes-kernel/linux-firmware/linux-firmware_20260519.bbappend diff --git a/recipes-kernel/linux-firmware/linux-firmware_20260519.bbappend b/recipes-kernel/linux-firmware/linux-firmware_20260519.bbappend new file mode 100644 index 000000000..67ed581b4 --- /dev/null +++ b/recipes-kernel/linux-firmware/linux-firmware_20260519.bbappend @@ -0,0 +1,2 @@ +DEFAULT_PREFERENCE:qcom = "1" +DEFAULT_PREFERENCE:class-devupstream:qcom = "-1" From feccfeae097483be22268d4310212f64c2aaf70b Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Fri, 19 Jun 2026 10:02:26 +0100 Subject: [PATCH 4/4] ci/base.lock: update meta-lts-mixins layer Relevant changes for meta-lts-mixins: - 11dcf7d SECURITY.md: describe security policy and pointers - 9cab569 linux-firmware: set DEFAULT_PREFERENCE to "-1" - b9d53c1 layer.conf: use the same priority as OE-Core Signed-off-by: Jose Quaresma [DB: dropped extra changes from the lts-mixins] Signed-off-by: Dmitry Baryshkov --- ci/base.lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/base.lock.yml b/ci/base.lock.yml index 6341d1aea..3e74c7518 100644 --- a/ci/base.lock.yml +++ b/ci/base.lock.yml @@ -5,7 +5,7 @@ overrides: oe-core: commit: 06dd66e6220e5ce4ed4b9af4d8231ae5f0a8ce80 meta-lts-mixins: - commit: 348a9eaaf3991e2329d0cef14dce23fabaef9191 + commit: 11dcf7de2b3cf74fd11049684903b73206a69df6 bitbake: commit: 22021758e66737bcf68dfd2b74adc6a0cb1d42d9 meta-arm: