1 files changed, 38 insertions, 91 deletions

diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index 943d8a680..98fb5c5e5 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -1,4 +1,4 @@
-# Copyright 2020-2025 NXP
+# Copyright 2020-2026 NXP
 
 SUMMARY = "Wi-Fi firmware redistributed by NXP"
 DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \
@@ -7,66 +7,47 @@ should be preferred."
 
 SECTION = "kernel"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bc649096ad3928ec06a8713b8d787eac"
 
 SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "d31ea8aaba67e188ba0071a90da0364e3946c83a"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "d7e4bb37b45bbf93faf888e0ca6763a29e28054a"
 
 
 inherit allarch
 
 CLEANBROKEN = "1"
 ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY:${PN}-all-sdio = "1"
 ALLOW_EMPTY:${PN}-all-pcie = "1"
+ALLOW_EMPTY:${PN}-all-sdio = "1"
+ALLOW_EMPTY:${PN}-all-usb = "1"
 
-do_compile() {
-        :
-}
+do_compile[noexec] = "1"
 
 do_install() {
-
     install -d ${D}${nonarch_base_libdir}/firmware/nxp
-    install -d ${D}${nonarch_base_libdir}/firmware/brcm/
-
-    # Install bcm4359-pcie
-    for f in cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie*; do
-        [ -e $f ] && install -D -m 0644 $f ${D}${nonarch_base_libdir}/firmware/brcm/$(basename $f)
-    done
-
-    for f in cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd; do
-        [ -e $f ] && install -D -m 0644 $f ${D}${sysconfdir}/firmware/$(basename $f)
-    done
-
-    for f in nxp/FwImage_IW612_SD/*; do
-        [ -e $f ] && install -D -m 0644 $f ${D}${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/$(basename $f)
-    done
-
     oe_runmake install INSTALLDIR=${D}${nonarch_base_libdir}/firmware/nxp
 
-    # Upstream SDIO8997 and IW416 driver firmwares are located on mrvl folder
+    # Upstream ISDIO8997 and W416 driver firmwares are located on mrvl folder
     install -d ${D}${nonarch_base_libdir}/firmware/mrvl
     ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin
     ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin
 
     ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sd9098_wlan_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdio9098_wlan_v1.bin
     ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart9098_combo_v1.bin
-    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sd8997_wlan_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdio8997_wlan_v4.bin
-    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin
     ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduartiw416_combo.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin
 }
 
 PACKAGES =+ " \
-    ${PN}-bcm4359-pcie \
+    ${PN}-all-pcie \
+    ${PN}-all-sdio \
+    ${PN}-all-usb \
+    \
     ${PN}-nxp-common \
-    ${PN}-nxp8801-sdio \
     ${PN}-nxp8987-sdio \
-    ${PN}-nxp8997-common \
-    ${PN}-nxp8997-pcie \
     ${PN}-nxp8997-sdio \
-    ${PN}-nxp9098-pcie \
     ${PN}-nxp9098-common \
+    ${PN}-nxp9098-pcie \
     ${PN}-nxp9098-sdio \
     ${PN}-nxpaw693-pcie \
     ${PN}-nxpiw416-sdio \
@@ -75,9 +56,22 @@ PACKAGES =+ " \
     ${PN}-nxpiw612-sdio \
 "
 
-FILES:${PN}-bcm4359-pcie = " \
-    ${nonarch_base_libdir}/firmware/brcm/brcmfmac4359-pcie.* \
-    ${sysconfdir}/firmware/BCM4349B1_*.hcd \
+RDEPENDS:${PN}-all-sdio = " \
+    ${PN}-nxp8987-sdio \
+    ${PN}-nxp8997-sdio \
+    ${PN}-nxp9098-sdio \
+    ${PN}-nxpiw416-sdio \
+    ${PN}-nxpiw610-sdio \
+    ${PN}-nxpiw612-sdio \
+"
+
+RDEPENDS:${PN}-all-pcie = " \
+    ${PN}-nxp9098-pcie \
+    ${PN}-nxpaw693-pcie \
+"
+
+RDEPENDS:${PN}-all-usb = " \
+    ${PN}-nxpiw610-usb \
 "
 
 FILES:${PN}-nxp-common = " \
@@ -85,11 +79,6 @@ FILES:${PN}-nxp-common = " \
     ${nonarch_base_libdir}/firmware/nxp/helper_uart_3000000.bin \
 "
 
-FILES:${PN}-nxp8801-sdio = " \
-    ${nonarch_base_libdir}/firmware/nxp/*8801* \
-"
-RDEPENDS:${PN}-nxp8801-sdio += "${PN}-nxp-common"
-
 FILES:${PN}-nxp8987-sdio = " \
     ${nonarch_base_libdir}/firmware/nxp/*8987* \
 "
@@ -98,32 +87,9 @@ 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 \
-    ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \
-    ${nonarch_base_libdir}/firmware/nxp/uart8997_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/mrvl/sdiouart8997_combo_v4.bin \
-    ${nonarch_base_libdir}/firmware/nxp/sd*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 \
@@ -151,6 +117,12 @@ 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}-nxpaw693-pcie += " \
+    ${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
+    ${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
+"
+RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
+
 FILES:${PN}-nxpiw416-sdio = " \
     ${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin \
     ${nonarch_base_libdir}/firmware/nxp/*iw416* \
@@ -178,38 +150,13 @@ FILES:${PN}-nxpiw610-usb += " \
 RDEPENDS:${PN}-nxpiw610-usb += "${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/sduart_nw61x_*.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_*.bin.se \
+    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_*.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \
-    ${nonarch_base_libdir}/firmware/nxp/uartuart_n61x_v1.bin.se \
 "
 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"
-
-FILES:${PN}-nxpaw693-pcie += " \
-    ${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
-    ${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
-"
-RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
-
-RDEPENDS:${PN}-all-sdio = " \
-    ${PN}-nxp8801-sdio \
-    ${PN}-nxp8987-sdio \
-    ${PN}-nxp9098-sdio \
-    ${PN}-nxpiw416-sdio \
-    ${PN}-nxpiw610-sdio \
-    ${PN}-nxpiw612-sdio \
-"
-
-RDEPENDS:${PN}-all-pcie = " \
-    ${PN}-nxp8997-pcie \
-    ${PN}-nxp9098-pcie \
-    ${PN}-nxpaw693-pcie \
-"
-
-RDEPENDS:${PN}-all-usb = " \
-    ${PN}-nxpiw610-usb \
-"