Merge pull request #2864 from Freescale/backport-2862-to-blacksailblacksail

[Backport blacksail] firmware-nxp-wifi: Drop the nxp8997-sdio package

1 files changed, 1 insertions, 8 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 a5a73c595..527a4e148 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -28,9 +28,8 @@ do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/nxp
     oe_runmake install INSTALLDIR=${D}${nonarch_base_libdir}/firmware/nxp
 
-    # Upstream ISDIO8997 and W416 driver firmwares are located on mrvl folder
+    # Upstream IW416 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
@@ -45,7 +44,6 @@ PACKAGES =+ "\
     \
     ${PN}-nxp-common \
     ${PN}-nxp8987-sdio \
-    ${PN}-nxp8997-sdio \
     ${PN}-nxp9098-common \
     ${PN}-nxp9098-pcie \
     ${PN}-nxp9098-sdio \
@@ -59,7 +57,6 @@ PACKAGES =+ "\
 
 RDEPENDS:${PN}-all-sdio = "\
     ${PN}-nxp8987-sdio \
-    ${PN}-nxp8997-sdio \
     ${PN}-nxp9098-sdio \
     ${PN}-nxpaw693-sdio \
     ${PN}-nxpiw416-sdio \
@@ -96,10 +93,6 @@ RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 
 # Per-package block; see the note above FILES:${PN}-nxp-common.
 # nooelint: oelint.var.order.FILES
-FILES:${PN}-nxp8997-sdio += "\
-    ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \
-"
-
 FILES:${PN}-nxp9098-common += "\
     ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \
     ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \