From 4c2a6df26ca8e90191fc6aad22cacbb25ea4c6ae Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 20 Apr 2023 10:49:21 -0700 Subject: firmware-nxp-wifi: Fix install -D The install -D option does unfortunately have idiosyncratic requirements on the destination format. If you don't get the format right, it fails: ``` install: target 'tmp/work/all-poky-linux/firmware-nxp-wifi/1.0-r0/image/lib/firmware/brcm' is not a directory ``` This commit also fixes a missing -D option. Fixes: f9ce2b8 Signed-off-by: Tom Hochstein --- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 11 ++++++++--- 1 file changed, 8 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 cfa449c3..3d29aa50 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -28,11 +28,16 @@ do_compile() { do_install() { # Install various flavors of Broadcom firmware provided by Murata: # - bcm4359-pcie - install -D -m 0644 cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie* ${D}${nonarch_base_libdir}/firmware/brcm - install -m 0644 cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd ${D}${sysconfdir}/firmware + for f in cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie*; do + install -D -m 0644 $f ${D}${nonarch_base_libdir}/firmware/brcm/$(basename $f) + done + + for f in cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd; do + install -D -m 0644 $f ${D}${sysconfdir}/firmware/$(basename $f) + done # Install NXP Connectivity common - install -D -m 0644 nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp + install -D -m 0644 nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp/wifi_mod_para.conf # Install NXP Connectivity SD8801 firmware install -m 0644 nxp/FwImage_8801_SD/ed_mac_ctrl_V1_8801.conf ${D}${nonarch_base_libdir}/firmware/nxp -- cgit v1.2.3-54-g00ecf From d230a8b1f603d01c6eb1220d0066f3a90a75f65a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 20 Apr 2023 14:56:48 -0700 Subject: firmware-nxp-wifi: Fix iw416 and iw612 additions Complete the installation for the just-added iw416 and iw612 and add the packaging. Fixes: e513c53 Signed-off-by: Tom Hochstein --- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 24 ++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) 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 3d29aa50..af2a79e4 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -67,10 +67,17 @@ do_install() { install -m 0644 nxp/FwImage_9098_SD/sdiouart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp # 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/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 } PACKAGES =+ " \ @@ -83,6 +90,8 @@ PACKAGES =+ " \ ${PN}-nxp8997-sdio \ ${PN}-nxp9098-pcie \ ${PN}-nxp9098-sdio \ + ${PN}-nxpiw416-sdio \ + ${PN}-nxpiw612-sdio \ " FILES:${PN}-bcm4359-pcie = " \ @@ -131,3 +140,16 @@ FILES:${PN}-nxp9098-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sdiouart9098* \ " RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp-common" + +FILES:${PN}-nxpiw416-sdio = " \ + ${nonarch_base_libdir}/firmware/nxp/*iw416* \ +" +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