diff options
author | Marc Ferland <marc.ferland@sonatest.com> | 2025-01-20 10:46:03 -0500 |
---|---|---|
committer | Ross Burton <ross.burton@arm.com> | 2025-01-23 12:14:29 +0000 |
commit | 82cc1808a35276e2cecb8a74f3e38b5711e76c48 (patch) | |
tree | e7a23c50280fc9263487cedd77ac7db3725cd2e5 | |
parent | f0c5b10901c5416fc29ddb8d06470ab20a9b8b88 (diff) | |
download | poky-82cc1808a35276e2cecb8a74f3e38b5711e76c48.tar.gz |
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.
(From OE-Core rev: 18b0b076e749bf8684958acf1a97504a69f73edd)
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>
-rw-r--r-- | meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb | 56 |
1 files changed, 48 insertions, 8 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb index ba66ea407d..da253219c0 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250109.bb | |||
@@ -346,7 +346,17 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ | |||
346 | ${PN}-carl9170 \ | 346 | ${PN}-carl9170 \ |
347 | ${PN}-qcom-qcm2290-wifi ${PN}-qcom-qrb4210-wifi ${PN}-qcom-sdm845-modem \ | 347 | ${PN}-qcom-qcm2290-wifi ${PN}-qcom-qrb4210-wifi ${PN}-qcom-sdm845-modem \ |
348 | ${PN}-ar3k-license ${PN}-ar3k \ | 348 | ${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 \ | ||
350 | ${PN}-ath11k ${PN}-ath12k ${PN}-qca \ | 360 | ${PN}-ath11k ${PN}-ath12k ${PN}-qca \ |
351 | \ | 361 | \ |
352 | ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ | 362 | ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ |
@@ -508,7 +518,16 @@ LICENSE:${PN}-carl9170 = "GPL-2.0-or-later" | |||
508 | LICENSE:${PN}-ar3k = "Firmware-qualcommAthos_ar3k & Firmware-atheros_firmware" | 518 | LICENSE:${PN}-ar3k = "Firmware-qualcommAthos_ar3k & Firmware-atheros_firmware" |
509 | LICENSE:${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" | 519 | LICENSE:${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" |
510 | LICENSE:${PN}-ath10k = "Firmware-qualcommAthos_ath10k" | 520 | 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" | ||
511 | LICENSE:${PN}-ath10k-wcn3990 = "Firmware-qualcommAthos_ath10k" | 529 | LICENSE:${PN}-ath10k-wcn3990 = "Firmware-qualcommAthos_ath10k" |
530 | LICENSE:${PN}-ath10k-misc = "Firmware-qualcommAthos_ath10k" | ||
512 | LICENSE:${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" | 531 | LICENSE:${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" |
513 | LICENSE:${PN}-qca = "Firmware-qualcommAthos_ath10k" | 532 | LICENSE:${PN}-qca = "Firmware-qualcommAthos_ath10k" |
514 | 533 | ||
@@ -518,12 +537,21 @@ FILES:${PN}-ar3k = " \ | |||
518 | " | 537 | " |
519 | 538 | ||
520 | FILES:${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k" | 539 | FILES:${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k" |
521 | FILES:${PN}-ath10k = " \ | 540 | FILES:${PN}-ath10k-qca4019 = "${nonarch_base_libdir}/firmware/ath10k/QCA4019" |
522 | ${nonarch_base_libdir}/firmware/ath10k \ | 541 | FILES:${PN}-ath10k-qca6174 = "${nonarch_base_libdir}/firmware/ath10k/QCA6174" |
523 | " | 542 | FILES:${PN}-ath10k-qca9377 = "${nonarch_base_libdir}/firmware/ath10k/QCA9377" |
524 | FILES:${PN}-ath10k-wcn3990 = " \ | 543 | FILES:${PN}-ath10k-qca9887 = "${nonarch_base_libdir}/firmware/ath10k/QCA9887" |
525 | ${nonarch_base_libdir}/firmware/ath10k/WCN3990 \ | 544 | FILES:${PN}-ath10k-qca9888 = "${nonarch_base_libdir}/firmware/ath10k/QCA9888" |
526 | " | 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" | ||
527 | 555 | ||
528 | FILES:${PN}-ath11k = " \ | 556 | FILES:${PN}-ath11k = " \ |
529 | ${nonarch_base_libdir}/firmware/ath11k \ | 557 | ${nonarch_base_libdir}/firmware/ath11k \ |
@@ -539,8 +567,16 @@ FILES:${PN}-qca = " \ | |||
539 | 567 | ||
540 | RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" | 568 | RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" |
541 | RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" | 569 | 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" | ||
543 | RDEPENDS:${PN}-ath10k-wcn3990 += "${PN}-ath10k-license" | 578 | RDEPENDS:${PN}-ath10k-wcn3990 += "${PN}-ath10k-license" |
579 | RDEPENDS:${PN}-ath10k-misc += "${PN}-ath10k-license" | ||
544 | RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" | 580 | RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" |
545 | RDEPENDS:${PN}-ath12k += "${PN}-ath10k-license" | 581 | RDEPENDS:${PN}-ath12k += "${PN}-ath10k-license" |
546 | RDEPENDS:${PN}-qca += "${PN}-ath10k-license" | 582 | RDEPENDS:${PN}-qca += "${PN}-ath10k-license" |
@@ -1697,6 +1733,7 @@ RDEPENDS:${PN} += "${PN}-whence-license" | |||
1697 | # Make linux-firmware depend on all of the split-out packages. | 1733 | # Make linux-firmware depend on all of the split-out packages. |
1698 | # Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. | 1734 | # Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. |
1699 | # Make linux-firmware-ibt depend on all of the split-out ibt packages. | 1735 | # 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. | ||
1700 | python populate_packages:prepend () { | 1737 | python populate_packages:prepend () { |
1701 | firmware_pkgs = oe.utils.packages_filter_out_system(d) | 1738 | firmware_pkgs = oe.utils.packages_filter_out_system(d) |
1702 | d.appendVar('RRECOMMENDS:linux-firmware', ' ' + ' '.join(firmware_pkgs)) | 1739 | d.appendVar('RRECOMMENDS:linux-firmware', ' ' + ' '.join(firmware_pkgs)) |
@@ -1706,6 +1743,9 @@ python populate_packages:prepend () { | |||
1706 | 1743 | ||
1707 | ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs) | 1744 | ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs) |
1708 | d.appendVar('RRECOMMENDS:linux-firmware-ibt', ' ' + ' '.join(ibt_pkgs)) | 1745 | 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)) | ||
1709 | } | 1749 | } |
1710 | 1750 | ||
1711 | # Firmware files are generally not ran on the CPU, so they can be | 1751 | # Firmware files are generally not ran on the CPU, so they can be |