Skip to content

Commit 18b0b07

Browse files
mferlandrossburton
authored andcommitted
linux-firmware: split ath10k firmwares in separate packages
This patch introduces the following packages for ath10k based chips: - linux-firmware-ath10k-qca4019 - linux-firmware-ath10k-qca6174 - linux-firmware-ath10k-qca9377 - linux-firmware-ath10k-qca9887 - linux-firmware-ath10k-qca9888 - linux-firmware-ath10k-qca988x - linux-firmware-ath10k-qca9984 - linux-firmware-ath10k-qca99x0 - linux-firmware-ath10k-misc: catches all firmwares that are not already included in the other -ath10k- packages (currently empty). linux-firmware-ath10k is now a meta package that depends on all of the split-out ath10k packages. Signed-off-by: Marc Ferland <marc.ferland@sonatest.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Ross Burton <ross.burton@arm.com>
1 parent 8e7ee19 commit 18b0b07

File tree

1 file changed

+48
-8
lines changed

1 file changed

+48
-8
lines changed

meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,17 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
346346
${PN}-carl9170 \
347347
${PN}-qcom-qcm2290-wifi ${PN}-qcom-qrb4210-wifi ${PN}-qcom-sdm845-modem \
348348
${PN}-ar3k-license ${PN}-ar3k \
349-
${PN}-ath10k-license ${PN}-ath10k-wcn3990 ${PN}-ath10k \
349+
${PN}-ath10k-license ${PN}-ath10k \
350+
${PN}-ath10k-qca4019 \
351+
${PN}-ath10k-qca6174 \
352+
${PN}-ath10k-qca9377 \
353+
${PN}-ath10k-qca9887 \
354+
${PN}-ath10k-qca9888 \
355+
${PN}-ath10k-qca988x \
356+
${PN}-ath10k-qca9984 \
357+
${PN}-ath10k-qca99x0 \
358+
${PN}-ath10k-wcn3990 \
359+
${PN}-ath10k-misc \
350360
${PN}-ath11k ${PN}-ath12k ${PN}-qca \
351361
\
352362
${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \
@@ -508,7 +518,16 @@ LICENSE:${PN}-carl9170 = "GPL-2.0-or-later"
508518
LICENSE:${PN}-ar3k = "Firmware-qualcommAthos_ar3k & Firmware-atheros_firmware"
509519
LICENSE:${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
510520
LICENSE:${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
521+
LICENSE:${PN}-ath10k-qca4019 = "Firmware-qualcommAthos_ath10k"
522+
LICENSE:${PN}-ath10k-qca6174 = "Firmware-qualcommAthos_ath10k"
523+
LICENSE:${PN}-ath10k-qca9377 = "Firmware-qualcommAthos_ath10k"
524+
LICENSE:${PN}-ath10k-qca9887 = "Firmware-qualcommAthos_ath10k"
525+
LICENSE:${PN}-ath10k-qca9888 = "Firmware-qualcommAthos_ath10k"
526+
LICENSE:${PN}-ath10k-qca988x = "Firmware-qualcommAthos_ath10k"
527+
LICENSE:${PN}-ath10k-qca9984 = "Firmware-qualcommAthos_ath10k"
528+
LICENSE:${PN}-ath10k-qca99x0 = "Firmware-qualcommAthos_ath10k"
511529
LICENSE:${PN}-ath10k-wcn3990 = "Firmware-qualcommAthos_ath10k"
530+
LICENSE:${PN}-ath10k-misc = "Firmware-qualcommAthos_ath10k"
512531
LICENSE:${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
513532
LICENSE:${PN}-qca = "Firmware-qualcommAthos_ath10k"
514533

@@ -518,12 +537,21 @@ FILES:${PN}-ar3k = " \
518537
"
519538

520539
FILES:${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k"
521-
FILES:${PN}-ath10k = " \
522-
${nonarch_base_libdir}/firmware/ath10k \
523-
"
524-
FILES:${PN}-ath10k-wcn3990 = " \
525-
${nonarch_base_libdir}/firmware/ath10k/WCN3990 \
526-
"
540+
FILES:${PN}-ath10k-qca4019 = "${nonarch_base_libdir}/firmware/ath10k/QCA4019"
541+
FILES:${PN}-ath10k-qca6174 = "${nonarch_base_libdir}/firmware/ath10k/QCA6174"
542+
FILES:${PN}-ath10k-qca9377 = "${nonarch_base_libdir}/firmware/ath10k/QCA9377"
543+
FILES:${PN}-ath10k-qca9887 = "${nonarch_base_libdir}/firmware/ath10k/QCA9887"
544+
FILES:${PN}-ath10k-qca9888 = "${nonarch_base_libdir}/firmware/ath10k/QCA9888"
545+
FILES:${PN}-ath10k-qca988x = "${nonarch_base_libdir}/firmware/ath10k/QCA988X"
546+
FILES:${PN}-ath10k-qca9984 = "${nonarch_base_libdir}/firmware/ath10k/QCA9984"
547+
FILES:${PN}-ath10k-qca99x0 = "${nonarch_base_libdir}/firmware/ath10k/QCA99X0"
548+
FILES:${PN}-ath10k-wcn3990 = "${nonarch_base_libdir}/firmware/ath10k/WCN3990"
549+
FILES:${PN}-ath10k-misc = "${nonarch_base_libdir}/firmware/ath10k/*"
550+
# -ath10k is a virtual package that depends upon all ath10k packages.
551+
ALLOW_EMPTY:${PN}-ath10k = "1"
552+
# -ath10k-misc is a catch all package that includes all the ath10k
553+
# firmwares that are not already included in other -ath10k- packages.
554+
ALLOW_EMPTY:${PN}-ath10k-misc = "1"
527555

528556
FILES:${PN}-ath11k = " \
529557
${nonarch_base_libdir}/firmware/ath11k \
@@ -539,8 +567,16 @@ FILES:${PN}-qca = " \
539567

540568
RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license"
541569
RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license"
542-
RDEPENDS:${PN}-ath10k += "${PN}-ath10k-wcn3990"
570+
RDEPENDS:${PN}-ath10k-qca4019 += "${PN}-ath10k-license"
571+
RDEPENDS:${PN}-ath10k-qca6174 += "${PN}-ath10k-license"
572+
RDEPENDS:${PN}-ath10k-qca9377 += "${PN}-ath10k-license"
573+
RDEPENDS:${PN}-ath10k-qca9887 += "${PN}-ath10k-license"
574+
RDEPENDS:${PN}-ath10k-qca9888 += "${PN}-ath10k-license"
575+
RDEPENDS:${PN}-ath10k-qca988x += "${PN}-ath10k-license"
576+
RDEPENDS:${PN}-ath10k-qca9984 += "${PN}-ath10k-license"
577+
RDEPENDS:${PN}-ath10k-qca99x0 += "${PN}-ath10k-license"
543578
RDEPENDS:${PN}-ath10k-wcn3990 += "${PN}-ath10k-license"
579+
RDEPENDS:${PN}-ath10k-misc += "${PN}-ath10k-license"
544580
RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license"
545581
RDEPENDS:${PN}-ath12k += "${PN}-ath10k-license"
546582
RDEPENDS:${PN}-qca += "${PN}-ath10k-license"
@@ -1697,6 +1733,7 @@ RDEPENDS:${PN} += "${PN}-whence-license"
16971733
# Make linux-firmware depend on all of the split-out packages.
16981734
# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages.
16991735
# Make linux-firmware-ibt depend on all of the split-out ibt packages.
1736+
# Make linux-firmware-ath10k depend on all of the split-out ath10k packages.
17001737
python populate_packages:prepend () {
17011738
firmware_pkgs = oe.utils.packages_filter_out_system(d)
17021739
d.appendVar('RRECOMMENDS:linux-firmware', ' ' + ' '.join(firmware_pkgs))
@@ -1706,6 +1743,9 @@ python populate_packages:prepend () {
17061743

17071744
ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs)
17081745
d.appendVar('RRECOMMENDS:linux-firmware-ibt', ' ' + ' '.join(ibt_pkgs))
1746+
1747+
ath10k_pkgs = filter(lambda x: x.find('-ath10k-') != -1, firmware_pkgs)
1748+
d.appendVar('RRECOMMENDS:linux-firmware-ath10k', ' ' + ' '.join(ath10k_pkgs))
17091749
}
17101750

17111751
# Firmware files are generally not ran on the CPU, so they can be

0 commit comments

Comments
 (0)