From f41bc28bcdba3db95f278cb41091b4884ea12f85 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 7 Sep 2023 13:21:25 -0700 Subject: Revert "firmware-nxp-wifi: Drop UART firmware now in linux-firmware" This reverts commit 6876c09d25027ad482add5fef01e92a50d379a5a. --- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb index e1bb56f88..38cb47510 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -1,9 +1,10 @@ # Copyright 2020-2023 NXP SUMMARY = "Wi-Fi firmware redistributed by NXP" -DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP \ -and not available in linux-firmware. Once a package becomes \ -available in linux-firmware, it can be dropped from this recipe." +DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP, \ +which is not covered by linux-firmware package. Once package becomes \ +available as a part of linux-firmware - it can be dropped from this \ +recipe in favor of upstream." SECTION = "kernel" LICENSE = "Proprietary" @@ -47,12 +48,14 @@ do_install() { install -m 0644 nxp/FwImage_8987/sd8987_wlan.bin ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_8987/sdiouart8987_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_8987/txpwrlimit_cfg_8987.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8987/uartuart8987_bt.bin ${D}${nonarch_base_libdir}/firmware/nxp # Install NXP Connectivity PCIE8997 firmware install -m 0644 nxp/FwImage_8997/ed_mac_ctrl_V3_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_8997/pcie8997_wlan_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_8997/pcieuart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_8997/txpwrlimit_cfg_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_8997/uartuart8997_bt_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp # Install NXP Connectivity SDIO8997 firmware install -m 0644 nxp/FwImage_8997_SD/ed_mac_ctrl_V3_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp @@ -65,6 +68,7 @@ do_install() { install -m 0644 nxp/FwImage_9098_PCIE/pcie9098_wlan_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_9098_PCIE/pcieuart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_9098_PCIE/txpwrlimit_cfg_9098.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_9098_PCIE/uartuart9098_bt_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp # Install NXP Connectivity SDIO9098 firmware install -m 0644 nxp/FwImage_9098_SD/sdio9098_wlan_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp @@ -73,10 +77,12 @@ do_install() { # Install NXP Connectivity IW416 firmware install -m 0644 nxp/FwImage_IW416_SD/sdioiw416_wlan_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_IW416_SD/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_IW416_SD/uartiw416_bt_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp # Install NXP Connectivity IW612 firmware install -m 0644 nxp/FwImage_IW612_SD/sduart_nw61x_v1.bin.se ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 nxp/FwImage_IW612_SD/sd_w61x_v1.bin.se ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 nxp/FwImage_IW612_SD/uartspi_n61x_v1.bin.se ${D}${nonarch_base_libdir}/firmware/nxp for f in nxp/FwImage_IW612_SD/IW612_SD_RFTest/*; do install -D -m 0644 $f ${D}${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/$(basename $f) done @@ -119,6 +125,7 @@ RDEPENDS:${PN}-nxp8987-sdio += "${PN}-nxp-common" FILES:${PN}-nxp8997-common = " \ ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \ ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \ + ${nonarch_base_libdir}/firmware/nxp/uartuart8997_bt_v4.bin \ " RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common" @@ -135,6 +142,7 @@ RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common" FILES:${PN}-nxp9098-common = " \ ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \ ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \ + ${nonarch_base_libdir}/firmware/nxp/uartuart9098_bt_v1.bin \ " RDEPENDS:${PN}-nxp9098-common += "${PN}-nxp-common" @@ -156,6 +164,7 @@ RDEPENDS:${PN}-nxpiw416-sdio += "${PN}-nxp-common" FILES:${PN}-nxpiw612-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \ ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \ + ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_v1.bin.se \ ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \ " RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common" -- cgit v1.2.3-54-g00ecf From 99980f4a7e4d66d6c03541b8d17f648a0a394f2f Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 7 Sep 2023 13:21:25 -0700 Subject: firmware-nxp-wifi: Fix overlap with linux-firmware Now that the firmware packages provided are also upstreamed to linux-firmware, fix the overlap error like: ``` * check_data_file_clashes: Package linux-firmware wants to install file ...1.0-r0/rootfs/lib/firmware/nxp/uartuart8997_bt_v4.bin But that file is already provided by package * firmware-nxp-wifi-nxp8997-common ``` Fixes: 1639 Signed-off-by: Tom Hochstein --- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 34 ++++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb index 38cb47510..f4d996663 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -1,10 +1,9 @@ # Copyright 2020-2023 NXP SUMMARY = "Wi-Fi firmware redistributed by NXP" -DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP, \ -which is not covered by linux-firmware package. Once package becomes \ -available as a part of linux-firmware - it can be dropped from this \ -recipe in favor of upstream." +DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \ +is available in linux-firmware, but what is here is the latest and \ +should be preferred." SECTION = "kernel" LICENSE = "Proprietary" @@ -121,6 +120,9 @@ FILES:${PN}-nxp8987-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/*8987* \ " RDEPENDS:${PN}-nxp8987-sdio += "${PN}-nxp-common" +RPROVIDES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio" +RREPLACES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio" +RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio" FILES:${PN}-nxp8997-common = " \ ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \ @@ -128,16 +130,25 @@ FILES:${PN}-nxp8997-common = " \ ${nonarch_base_libdir}/firmware/nxp/uartuart8997_bt_v4.bin \ " RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common" +RPROVIDES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common" +RREPLACES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common" +RCONFLICTS:${PN}-nxp8997-common = "linux-firmware-nxp8997-common" FILES:${PN}-nxp8997-pcie = " \ ${nonarch_base_libdir}/firmware/nxp/pci*8997* \ " RDEPENDS:${PN}-nxp8997-pcie += "${PN}-nxp8997-common" +RPROVIDES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie" +RREPLACES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie" +RCONFLICTS:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie" FILES:${PN}-nxp8997-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sdio*8997* \ " RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common" +RPROVIDES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio" +RREPLACES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio" +RCONFLICTS:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio" FILES:${PN}-nxp9098-common = " \ ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \ @@ -145,21 +156,33 @@ FILES:${PN}-nxp9098-common = " \ ${nonarch_base_libdir}/firmware/nxp/uartuart9098_bt_v1.bin \ " RDEPENDS:${PN}-nxp9098-common += "${PN}-nxp-common" +RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common" +RREPLACES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common" +RCONFLICTS:${PN}-nxp9098-common = "linux-firmware-nxp9098-common" FILES:${PN}-nxp9098-pcie = " \ ${nonarch_base_libdir}/firmware/nxp/pcie*9098* \ " RDEPENDS:${PN}-nxp9098-pcie += "${PN}-nxp9098-common" +RPROVIDES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie" +RREPLACES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie" +RCONFLICTS:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie" FILES:${PN}-nxp9098-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sdio*9098* \ " RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common" +RPROVIDES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio" +RREPLACES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio" +RCONFLICTS:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio" FILES:${PN}-nxpiw416-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/*iw416* \ " RDEPENDS:${PN}-nxpiw416-sdio += "${PN}-nxp-common" +RPROVIDES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" +RREPLACES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" +RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" FILES:${PN}-nxpiw612-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \ @@ -168,3 +191,6 @@ FILES:${PN}-nxpiw612-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \ " RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common" +RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio" +RREPLACES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio" +RCONFLICTS:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio" -- cgit v1.2.3-54-g00ecf From 8562bacb97402f22278a5a8bca82ed7fecc1ca40 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 7 Sep 2023 13:21:25 -0700 Subject: imx-base.inc: Add PREFERRED_RPROVIDER_linux-firmware-* Prefer firmware-nxp-wifi blobs over linux-firmware blobs. Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 3ddd498f4..1b09a2794 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -444,24 +444,33 @@ MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'n MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'firmware-nxp-wifi-nxp8987-sdio', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'kernel-module-nxp-wlan', '', d)}" +PREFERRED_RPROVIDER_linux-firmware-nxp8987-sdio = "firmware-nxp-wifi" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'firmware-nxp-wifi-nxp8997-pcie', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'kernel-module-nxp-wlan', '', d)}" +PREFERRED_RPROVIDER_linux-firmware-nxp8997-common = "firmware-nxp-wifi" +PREFERRED_RPROVIDER_linux-firmware-nxp8997-pcie = "firmware-nxp-wifi" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'firmware-nxp-wifi-nxp8997-sdio', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'kernel-module-nxp-wlan', '', d)}" +PREFERRED_RPROVIDER_linux-firmware-nxp8997-sdio = "firmware-nxp-wifi" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'firmware-nxp-wifi-nxp9098-pcie', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'kernel-module-nxp-wlan', '', d)}" +PREFERRED_RPROVIDER_linux-firmware-nxp9098-common = "firmware-nxp-wifi" +PREFERRED_RPROVIDER_linux-firmware-nxp9098-pcie = "firmware-nxp-wifi" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'firmware-nxp-wifi-nxp9098-sdio', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'kernel-module-nxp-wlan', '', d)}" +PREFERRED_RPROVIDER_linux-firmware-nxp9098-sdio = "firmware-nxp-wifi" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxpiw416-sdio', 'firmware-nxp-wifi-nxpiw416-sdio', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxpiw416-sdio', 'kernel-module-nxp-wlan', '', d)}" +PREFERRED_RPROVIDER_linux-firmware-nxpiw416-sdio = "firmware-nxp-wifi" MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxpiw612-sdio', 'firmware-nxp-wifi-nxpiw612-sdio', '', d)}" MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxpiw612-sdio', 'kernel-module-nxp-wlan', '', d)}" +PREFERRED_RPROVIDER_linux-firmware-nxpiw612-sdio = "firmware-nxp-wifi" # Extra QCA Wi-Fi & BTE driver and firmware MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" -- cgit v1.2.3-54-g00ecf