Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure packagegroups #770

Merged
merged 5 commits into from
Feb 24, 2025
Merged

Restructure packagegroups #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bed926e
packagegroups: mass-rename packagegroup recipes
lumag Feb 21, 2025
fe0b5d6
packagegroups: split Hexagon DSP binaries to separate packagegroups
lumag Feb 21, 2025
ca868bd
initramfs-firmware-image: drop BAD_RECOMMENDS
lumag Feb 21, 2025
6687039
initramfs-firmware-rb12-image: drop BAD_RECOMMENDS
lumag Feb 21, 2025
43d876b
initramfs-firmware-mega-image: pull in hexagon DSP packages
lumag Feb 21, 2025
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
14 changes: 7 additions & 7 deletions conf/machine/qcom-armv8a.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
kernel-modules \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wireless-regdb-static', '', d)} \
packagegroup-firmware-dragonboard410c \
packagegroup-firmware-dragonboard820c \
packagegroup-firmware-dragonboard845c \
packagegroup-firmware-rb1 \
packagegroup-firmware-rb2 \
packagegroup-firmware-rb3gen2 \
packagegroup-firmware-rb5 \
packagegroup-dragonboard410c-firmware \
packagegroup-dragonboard820c-firmware \
packagegroup-dragonboard845c-firmware \
packagegroup-rb1-firmware \
packagegroup-rb2-firmware \
packagegroup-rb3gen2-firmware \
packagegroup-rb5-firmware \
"
2 changes: 1 addition & 1 deletion recipes-bsp/images/initramfs-firmware-db8074-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DESCRIPTION = "Tiny ramdisk image with Dragonboard APQ8074 firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-dragonboard-apq8074 \
packagegroup-dragonboard-apq8074-firmware \
"

require initramfs-firmware-image.inc
2 changes: 1 addition & 1 deletion recipes-bsp/images/initramfs-firmware-dragonboard820c-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DESCRIPTION = "Tiny ramdisk image with Dragonboard 820c firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-dragonboard820c \
packagegroup-dragonboard820c-firmware \
"

require initramfs-firmware-image.inc
27 changes: 7 additions & 20 deletions recipes-bsp/images/initramfs-firmware-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,14 @@ DESCRIPTION = "Tiny ramdisk image with firmware files"
PACKAGE_INSTALL = ""

PACKAGE_INSTALL:qcom-armv8a = " \
packagegroup-firmware-dragonboard410c \
packagegroup-firmware-dragonboard820c \
packagegroup-firmware-dragonboard845c \
packagegroup-firmware-rb1 \
packagegroup-firmware-rb2 \
packagegroup-firmware-rb3gen2 \
packagegroup-firmware-rb5 \
packagegroup-dragonboard410c-firmware \
packagegroup-dragonboard820c-firmware \
packagegroup-dragonboard845c-firmware \
packagegroup-rb1-firmware \
packagegroup-rb2-firmware \
packagegroup-rb3gen2-firmware \
packagegroup-rb5-firmware \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wireless-regdb-static', '', d)} \
"

BAD_RECOMMENDATIONS = " \
hexagon-dsp-binaries-qcom-db820c-adsp \
hexagon-dsp-binaries-thundercomm-db845c-adsp \
hexagon-dsp-binaries-thundercomm-db845c-cdsp \
hexagon-dsp-binaries-thundercomm-db845c-sdsp \
hexagon-dsp-binaries-thundercomm-rb1-adsp \
hexagon-dsp-binaries-thundercomm-rb2-adsp \
hexagon-dsp-binaries-thundercomm-rb2-cdsp \
hexagon-dsp-binaries-thundercomm-rb5-adsp \
hexagon-dsp-binaries-thundercomm-rb5-cdsp \
hexagon-dsp-binaries-thundercomm-rb5-sdsp \
"

require initramfs-firmware-image.inc
34 changes: 20 additions & 14 deletions recipes-bsp/images/initramfs-firmware-mega-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,34 @@ PACKAGE_INSTALL = " \

# Qualcomm Dragonboard / Robotics platforms
PACKAGE_INSTALL += " \
packagegroup-firmware-dragonboard-apq8074 \
packagegroup-firmware-dragonboard410c \
packagegroup-firmware-dragonboard820c \
packagegroup-firmware-dragonboard845c \
packagegroup-firmware-rb1 \
packagegroup-firmware-rb2 \
packagegroup-firmware-rb3gen2 \
packagegroup-firmware-rb5 \
packagegroup-dragonboard-apq8074-firmware \
packagegroup-dragonboard410c-firmware \
packagegroup-dragonboard820c-firmware \
packagegroup-dragonboard845c-firmware \
packagegroup-rb1-firmware \
packagegroup-rb2-firmware \
packagegroup-rb3gen2-firmware \
packagegroup-rb5-firmware \
packagegroup-dragonboard820c-hexagon-dsp-binaries \
packagegroup-dragonboard845c-hexagon-dsp-binaries \
packagegroup-rb1-hexagon-dsp-binaries \
packagegroup-rb2-hexagon-dsp-binaries \
packagegroup-rb3gen2-hexagon-dsp-binaries \
packagegroup-rb5-hexagon-dsp-binaries \
"

# Qualcomm HDKs
PACKAGE_INSTALL += " \
packagegroup-firmware-sm8150-hdk \
packagegroup-firmware-sm8350-hdk \
packagegroup-firmware-sm8450-hdk \
packagegroup-firmware-sm8550-hdk \
packagegroup-firmware-sm8650-hdk \
packagegroup-sm8150-hdk-firmware \
packagegroup-sm8350-hdk-firmware \
packagegroup-sm8450-hdk-firmware \
packagegroup-sm8550-hdk-firmware \
packagegroup-sm8650-hdk-firmware \
"

# Other Qualcomm DevKits
PACKAGE_INSTALL += " \
packagegroup-firmware-qar2130p \
packagegroup-qar2130p-firmware \
"

require initramfs-firmware-image.inc
2 changes: 1 addition & 1 deletion recipes-bsp/images/initramfs-firmware-qar2130p-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DESCRIPTION = "Tiny ramdisk image with QAR2130P devices firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-qar2130p \
packagegroup-qar2130p-firmware \
"

BAD_RECOMMENDATIONS = " \
Expand Down
7 changes: 2 additions & 5 deletions recipes-bsp/images/initramfs-firmware-rb12-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
DESCRIPTION = "Tiny ramdisk image with RB1/RB2 devices firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-rb1 \
packagegroup-firmware-rb2 \
packagegroup-rb1-firmware \
packagegroup-rb2-firmware \
"

BAD_RECOMMENDATIONS = " \
hexagon-dsp-binaries-thundercomm-rb1-adsp \
hexagon-dsp-binaries-thundercomm-rb2-adsp \
hexagon-dsp-binaries-thundercomm-rb2-cdsp \
linux-firmware-qcom-venus-6.0 \
"

Expand Down
2 changes: 1 addition & 1 deletion recipes-bsp/images/initramfs-firmware-sm8150-hdk-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DESCRIPTION = "Tiny ramdisk image with SM8150 HDK devices firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-sm8150-hdk \
packagegroup-sm8150-hdk-firmware \
"

BAD_RECOMMENDATIONS = " \
Expand Down
2 changes: 1 addition & 1 deletion recipes-bsp/images/initramfs-firmware-sm8350-hdk-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DESCRIPTION = "Tiny ramdisk image with SM8350 HDK devices firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-sm8350-hdk \
packagegroup-sm8350-hdk-firmware \
"

BAD_RECOMMENDATIONS = " \
Expand Down
2 changes: 1 addition & 1 deletion recipes-bsp/images/initramfs-firmware-sm8450-hdk-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DESCRIPTION = "Tiny ramdisk image with SM8450 HDK devices firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-sm8450-hdk \
packagegroup-sm8450-hdk-firmware \
"

BAD_RECOMMENDATIONS = " \
Expand Down
2 changes: 1 addition & 1 deletion recipes-bsp/images/initramfs-firmware-sm8550-hdk-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DESCRIPTION = "Tiny ramdisk image with SM8550 HDK devices firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-sm8550-hdk \
packagegroup-sm8550-hdk-firmware \
"

BAD_RECOMMENDATIONS = " \
Expand Down
2 changes: 1 addition & 1 deletion recipes-bsp/images/initramfs-firmware-sm8650-hdk-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DESCRIPTION = "Tiny ramdisk image with SM8650 HDK devices firmware files"

PACKAGE_INSTALL += " \
packagegroup-firmware-sm8650-hdk \
packagegroup-sm8650-hdk-firmware \
"

BAD_RECOMMENDATIONS = " \
Expand Down
8 changes: 6 additions & 2 deletions ...kagegroup-firmware-dragonboard-apq8074.bb → ...roups/packagegroup-dragonboard-apq8074.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
SUMMARY = "Firmware packages for the Dragonboard APQ8074 board"
SUMMARY = "Packages for the Dragonboard APQ8074 board"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a3xx', '', d)} \
linux-firmware-qcom-apq8074-audio \
linux-firmware-qcom-apq8074-modem \
Expand Down
8 changes: 6 additions & 2 deletions .../packagegroup-firmware-dragonboard410c.bb → ...agegroups/packagegroup-dragonboard410c.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
SUMMARY = "Firmware packages for the DragonBoard 410c board"
SUMMARY = "Packages for the DragonBoard 410c board"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a3xx', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-qcom-apq8016-wifi', '', d)} \
linux-firmware-qcom-apq8016-modem \
Expand Down
12 changes: 10 additions & 2 deletions .../packagegroup-firmware-dragonboard820c.bb → ...agegroups/packagegroup-dragonboard820c.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
SUMMARY = "Firmware packages for the DragonBoard 820c board"
SUMMARY = "Packages for the DragonBoard 820c board"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
${PN}-hexagon-dsp-binaries \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a530 linux-firmware-qcom-apq8096-adreno', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-qca6174', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-qca61x4-serial', '', d)} \
linux-firmware-qcom-apq8096-audio \
linux-firmware-qcom-apq8096-modem \
linux-firmware-qcom-venus-4.2 \
"

RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
hexagon-dsp-binaries-qcom-db820c-adsp \
"
12 changes: 10 additions & 2 deletions .../packagegroup-firmware-dragonboard845c.bb → ...agegroups/packagegroup-dragonboard845c.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
SUMMARY = "Firmware packages for the DragonBoard 845c board"
SUMMARY = "Packages for the DragonBoard 845c board"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
${PN}-hexagon-dsp-binaries \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a630 linux-firmware-qcom-sdm845-adreno', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990 linux-firmware-qcom-sdm845-modem', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn399x linux-firmware-qcom-sdm845-modem', '', d)} \
linux-firmware-qcom-sdm845-audio \
linux-firmware-qcom-sdm845-compute \
linux-firmware-qcom-venus-5.2 \
"

RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
hexagon-dsp-binaries-thundercomm-db845c-adsp \
hexagon-dsp-binaries-thundercomm-db845c-cdsp \
"
6 changes: 5 additions & 1 deletion ...egroups/packagegroup-firmware-qar2130p.bb → ...sp/packagegroups/packagegroup-qar2130p.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a650 linux-firmware-qcom-adreno-gmu-a621 linux-firmware-qcom-sar2130p-adreno', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn7850', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k-wcn7850', '', d)} \
Expand Down
12 changes: 10 additions & 2 deletions ...ackagegroups/packagegroup-firmware-rb1.bb → ...pes-bsp/packagegroups/packagegroup-rb1.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
SUMMARY = "Firmware packages for the RB1 Robotics platform"
SUMMARY = "Packages for the RB1 Robotics platform"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
${PN}-hexagon-dsp-binaries \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a702 linux-firmware-qcom-qcm2290-adreno', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990 linux-firmware-qcom-qcm2290-wifi ', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn3950', '', d)} \
linux-firmware-lt9611uxc \
linux-firmware-qcom-qcm2290-audio \
linux-firmware-qcom-qcm2290-modem \
linux-firmware-qcom-venus-6.0 \
"

RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
hexagon-dsp-binaries-thundercomm-rb1-adsp \
"
12 changes: 10 additions & 2 deletions ...ackagegroups/packagegroup-firmware-rb2.bb → ...pes-bsp/packagegroups/packagegroup-rb2.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
SUMMARY = "Firmware packages for the RB2 Robotics platform"
SUMMARY = "Packages for the RB2 Robotics platform"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
${PN}-hexagon-dsp-binaries \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a630 linux-firmware-qcom-qrb4210-adreno', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990 linux-firmware-qcom-qrb4210-wifi', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn3988', '', d)} \
Expand All @@ -11,6 +16,9 @@ RRECOMMENDS:${PN} += " \
linux-firmware-qcom-qrb4210-compute \
linux-firmware-qcom-qrb4210-modem \
linux-firmware-qcom-venus-6.0 \
"

RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
hexagon-dsp-binaries-thundercomm-rb2-adsp \
hexagon-dsp-binaries-thundercomm-rb2-cdsp \
"
12 changes: 10 additions & 2 deletions ...gegroups/packagegroup-firmware-rb3gen2.bb → ...bsp/packagegroups/packagegroup-rb3gen2.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
SUMMARY = "Firmware packages for the RB3Gen2 platform"
SUMMARY = "Packages for the RB3Gen2 platform"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
${PN}-hexagon-dsp-binaries \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a660 linux-firmware-qcom-qcm6490-adreno', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k-wcn6750 linux-firmware-qcom-qcm6490-wifi', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn6750', '', d)} \
linux-firmware-qcom-qcm6490-audio \
linux-firmware-qcom-qcm6490-compute \
linux-firmware-qcom-vpu \
"

RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
hexagon-dsp-binaries-thundercomm-rb3gen2-adsp \
hexagon-dsp-binaries-thundercomm-rb3gen2-cdsp \
"
12 changes: 10 additions & 2 deletions ...ackagegroups/packagegroup-firmware-rb5.bb → ...pes-bsp/packagegroups/packagegroup-rb5.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
SUMMARY = "Firmware packages for the RB5 Robotics platform"
SUMMARY = "Packages for the RB5 Robotics platform"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
${PN}-hexagon-dsp-binaries \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a650 linux-firmware-qcom-sm8250-adreno', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k-qca6390', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-qca6390', '', d)} \
linux-firmware-lt9611uxc \
linux-firmware-qcom-sm8250-audio \
linux-firmware-qcom-sm8250-compute \
linux-firmware-qcom-vpu \
"

RRECOMMENDS:${PN}-hexagon-dsp-binaries = " \
hexagon-dsp-binaries-thundercomm-rb5-adsp \
hexagon-dsp-binaries-thundercomm-rb5-cdsp \
"
8 changes: 6 additions & 2 deletions ...roups/packagegroup-firmware-sm8150-hdk.bb → .../packagegroups/packagegroup-sm8150-hdk.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
SUMMARY = "Firmware packages for the SM8150-HDK (aka HDK855) board"
SUMMARY = "Packages for the SM8150-HDK (aka HDK855) board"

inherit packagegroup

RRECOMMENDS:${PN} += " \
PACKAGES = " \
${PN}-firmware \
"

RRECOMMENDS:${PN}-firmware = " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a640 linux-firmware-qcom-sm8150-adreno', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn399x', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990', '', d)} \
Expand Down
Loading
Loading