Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/build-yocto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,14 @@ jobs:
type: default
include:
# Additional builds for specific machines
- machine: qcom-armv8a
distro:
name: qcom-distro-nomixin
yamlfile: ':ci/qcom-distro-nomixin.yml'
kernel:
type: default
dirname: ""
yamlfile: ""
- machine: qcom-armv8a
distro:
name: qcom-distro
Expand Down
4 changes: 0 additions & 4 deletions ci/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ repos:
layers:
meta:

meta-lts-mixins:
url: https://git.yoctoproject.org/meta-lts-mixins
branch: wrynose/linux-firmware

bitbake:
url: https://github.com/openembedded/bitbake
branch: "2.18"
Expand Down
2 changes: 0 additions & 2 deletions ci/oe-selftest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ BUILDDIR="$(mktemp -p "$WORK_DIR" -d -t build-oe-selftest-XXXX)"
cd "$WORK_DIR/oe-core"
. ./oe-init-build-env "$BUILDDIR"

# Add the lts-linux-firmware-mixin layer
bitbake-layers add-layer "$WORK_DIR/meta-lts-mixins"
# Add the meta-qcom layer
bitbake-layers add-layer "$REPO_DIR"

Expand Down
58 changes: 58 additions & 0 deletions ci/qcom-distro-nomixin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json

header:
version: 14

distro: qcom-distro

defaults:
repos:
branch: wrynose

repos:
meta-qcom-distro:
url: https://github.com/qualcomm-linux/meta-qcom-distro

meta-openembedded:
url: https://github.com/openembedded/meta-openembedded
patches:
plain:
repo: meta-qcom
path: patches/meta-oe/0001-mariadb-fix-building-for-the-ARMv8.3-A-and-later-sys.patch
layers:
meta-filesystems:
meta-gnome:
meta-multimedia:
meta-networking:
meta-oe:
meta-python:
meta-xfce:

meta-virtualization:
url: https://git.yoctoproject.org/git/meta-virtualization

meta-audioreach:
url: https://github.com/AudioReach/meta-audioreach
branch: master

meta-selinux:
url: https://git.yoctoproject.org/meta-selinux

meta-updater:
url: https://github.com/uptane/meta-updater

meta-security:
url: https://git.yoctoproject.org/meta-security
layers:
.:
meta-tpm:

local_conf_header:
virtualization:
SKIP_META_VIRT_SANITY_CHECK = "1"

target:
- qcom-multimedia-image
- qcom-multimedia-proprietary-image
- qcom-container-orchestration-image
- qcom-networking-image
57 changes: 5 additions & 52 deletions ci/qcom-distro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,57 +2,10 @@

header:
version: 14

distro: qcom-distro

defaults:
repos:
branch: wrynose
includes:
- ci/qcom-disto-nomixin.yml

repos:
meta-qcom-distro:
url: https://github.com/qualcomm-linux/meta-qcom-distro

meta-openembedded:
url: https://github.com/openembedded/meta-openembedded
patches:
plain:
repo: meta-qcom
path: patches/meta-oe/0001-mariadb-fix-building-for-the-ARMv8.3-A-and-later-sys.patch
layers:
meta-filesystems:
meta-gnome:
meta-multimedia:
meta-networking:
meta-oe:
meta-python:
meta-xfce:

meta-virtualization:
url: https://git.yoctoproject.org/git/meta-virtualization

meta-audioreach:
url: https://github.com/AudioReach/meta-audioreach
branch: master

meta-selinux:
url: https://git.yoctoproject.org/meta-selinux

meta-updater:
url: https://github.com/uptane/meta-updater

meta-security:
url: https://git.yoctoproject.org/meta-security
layers:
.:
meta-tpm:

local_conf_header:
virtualization:
SKIP_META_VIRT_SANITY_CHECK = "1"

target:
- qcom-multimedia-image
- qcom-multimedia-proprietary-image
- qcom-container-orchestration-image
- qcom-networking-image
meta-lts-mixins:
url: https://git.yoctoproject.org/meta-lts-mixins
branch: wrynose/linux-firmware
6 changes: 4 additions & 2 deletions conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ BBFILE_COLLECTIONS += "qcom"
BBFILE_PATTERN_qcom := "^${LAYERDIR}/"
BBFILE_PRIORITY_qcom = "6"

LAYERDEPENDS_qcom = "core lts-linux-firmware-mixin"
LAYERRECOMMENDS_qcom = "openembedded-layer meta-arm"
LAYERDEPENDS_qcom = "core"
LAYERRECOMMENDS_qcom = "openembedded-layer meta-arm lts-linux-firmware-mixin"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this really what we intend? This way we'll have to support two firmware versions, and the version qcom prefer will no longer be the one from the mixin layer.

With this change, you need to remove the meta-lts-mixins dependency in the ci/yocto-check-layer.sh.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what we must support until meta-lts-mixins / firmware branch is enable and available on the autobuilder.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and the version qcom prefer will no longer be the one from the mixin layer.

See the bbappend. If the layer is available, it will be used.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what we must support until meta-lts-mixins / firmware branch is enable and available on the autobuilder.

Have you considered that meta-lts-mixins may never be YP compatible?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and the version qcom prefer will no longer be the one from the mixin layer.

See the bbappend. If the layer is available, it will be used.

This will introduce a lot of complexity. We will now support two distinct versions of linux-firmware. For example #2450, that patch the linux-firmare may won't work, and similar ones will have the same problems.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jose Quaresma (@quaresmajose) any other proposals? The worse case would be to drop the meta-qcom/wrynose from the autobuilder and from the YP compatibility program.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jose Quaresma (@quaresmajose) any other proposals? The worse case would be to drop the meta-qcom/wrynose from the autobuilder and from the YP compatibility program.

This is not possible. meta-qcom being YP compatible is a must have. and part of our 'product' definition.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jose Quaresma (@quaresmajose) any other proposals? The worse case would be to drop the meta-qcom/wrynose from the autobuilder and from the YP compatibility program.

This is not possible. meta-qcom being YP compatible is a must have. and part of our 'product' definition.

Which means that (per definition) we should depend only on YP-compatible layers. Until the required branch of the mixins layer is not marked as compatible, we can not depend on it.

@quaresmajose Jose Quaresma (quaresmajose) Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no other proposal or solution to this problem. I think we need to discuss this more broadly. Moving this discussion to #2457 is more appropriate in my opinion because we can get opinions from other YP maintainers.

LAYERSERIES_COMPAT_qcom = "wrynose"

LICENSE_PATH += "${LAYERDIR}/licenses"
Expand All @@ -24,6 +24,8 @@ BBFILES_DYNAMIC += " \
meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/*/*/*.bbappend \
networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
lts-linux-firmware-mixin:${LAYERDIR}/dynamic-layers/lts-linux-firmware-mixin/*/*/*.bb \
lts-linux-firmware-mixin:${LAYERDIR}/dynamic-layers/lts-linux-firmware-mixin/*/*/*.bbappend \
openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
qcom-distro:${LAYERDIR}/dynamic-layers/qcom-distro/*/*/*.bb \
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DEFAULT_PREFERENCE:qcom = "1"
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 9957e017831ae90142ad2be4fc828a7160db7390 Mon Sep 17 00:00:00 2001
From: Sairamreddy Bojja <sbojja@qti.qualcomm.com>
Date: Mon, 13 Apr 2026 12:41:13 +0530
Subject: [PATCH] conf: add links for QCM6490 IDP

Add links for QCM6490 IDP platform based on RB3 Gen2.

Signed-off-by: Sairamreddy Bojja <sbojja@qti.qualcomm.com>
Upstream-Status: Backport [https://github.com/linux-msm/hexagon-dsp-binaries/commit/9957e017831ae90142ad2be4fc828a7160db7390]
---
conf.d/hexagon-dsp-binaries-qualcomm-qcm6490-idp.yaml | 5 +++++
config.txt | 4 ++++
2 files changed, 9 insertions(+)
create mode 100644 conf.d/hexagon-dsp-binaries-qualcomm-qcm6490-idp.yaml

diff --git a/conf.d/hexagon-dsp-binaries-qualcomm-qcm6490-idp.yaml b/conf.d/hexagon-dsp-binaries-qualcomm-qcm6490-idp.yaml
new file mode 100644
index 000000000000..aa2a4123fe4b
--- /dev/null
+++ b/conf.d/hexagon-dsp-binaries-qualcomm-qcm6490-idp.yaml
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+machines:
+ Qualcomm Technologies, Inc. QCM6490 IDP:
+ DSP_LIBRARY_PATH: qcm6490/Qualcomm/QCM6490-IDP/dsp
diff --git a/config.txt b/config.txt
index a7640e4bf61f..8d3624dfc71c 100644
--- a/config.txt
+++ b/config.txt
@@ -94,3 +94,7 @@ Link: sa8775p/Qualcomm/SA8775P-RIDE/dsp/gdsp1 sa8775p/Qualcomm/IQ9075-EVK/dsp/gd
Link: sa8775p/Qualcomm/SA8775P-RIDE/dsp/cdsp1 sa8775p/Qualcomm/IQ9075-EVK/dsp/cdsp1
Link: sa8775p/Qualcomm/SA8775P-RIDE/dsp/gdsp0 sa8775p/Qualcomm/IQ9075-EVK/dsp/gdsp0
Link: sa8775p/Qualcomm/SA8775P-RIDE/dsp/gdsp1 sa8775p/Qualcomm/IQ9075-EVK/dsp/gdsp1
+
+# QCM6490 IDP
+Link: qcm6490/Thundercomm/RB3gen2/dsp/adsp qcm6490/Qualcomm/QCM6490-IDP/dsp/adsp
+Link: qcm6490/Thundercomm/RB3gen2/dsp/cdsp qcm6490/Qualcomm/QCM6490-IDP/dsp/cdsp
--
2.53.0

Loading
Loading