[meta-freescale] [meta-fsl-arm][PATCH 2/2] firmware-imx: Rename files on installation

[Jun Zhu]

Hi, Daiane,

According to the i.MX formal kernel, the Maruta module firmware/calibration files have the default path and name:
- The path should be /lib/firmware/bcm/<Module_name>/
- The firmware file name should be fw_bcmdhd.bin and fw_bcmdhd_apsta.bin

If change the path name and file name, the driver may not fail to be loaded.

BR,
Jun Zhu


-----Original Message-----
From: meta-freescale-bounces at yoctoproject.org [mailto:meta-freescale-bounces at yoctoproject.org] On Behalf Of Daiane Angolini
Sent: Saturday, September 10, 2016 3:37 AM
To: meta-freescale at yoctoproject.org
Subject: [meta-freescale] [meta-fsl-arm][PATCH 2/2] firmware-imx: Rename files on installation

The package provides the same filename for every partnumber. This patch copy that file using a different filename so they can coexist.

Signed-off-by: Daiane Angolini <daiane.angolini at nxp.com>
---
 recipes-bsp/firmware-imx/firmware-imx.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 90218c9..182678e 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -22,22 +22,24 @@ do_install() {
     cp -rfv firmware/* ${D}${base_libdir}/firmware/
 
     #1BW_BCM43340
-    cp -rfv git/brcm/1BW_BCM43340/*.bin ${D}${base_libdir}/firmware/bcm
+    cp -rfv git/brcm/1BW_BCM43340/fw_bcmdhd.bin 
+ ${D}${base_libdir}/firmware/bcm/fw_bcmdhd.1BW.bin
     cp -rfv git/brcm/1BW_BCM43340/*.cal ${D}${base_libdir}/firmware/bcm
     cp -rfv git/brcm/1BW_BCM43340/*.hcd ${D}${sysconfdir}/firmware/
 
     #1DX_BCM4343W
-    cp -rfv git/brcm/1DX_BCM4343W/*.bin ${D}${base_libdir}/firmware/bcm
+    cp -rfv git/brcm/1DX_BCM4343W/fw_bcmdhd.bin 
+ ${D}${base_libdir}/firmware/bcm/fw_bcmdhd.1DX.bin
     cp -rfv git/brcm/1DX_BCM4343W/*.cal ${D}${base_libdir}/firmware/bcm
     cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/
 
     #SN8000_BCM43362
-    cp -rfv git/brcm/SN8000_BCM43362/*.bin ${D}${base_libdir}/firmware/bcm
+    cp -rfv git/brcm/SN8000_BCM43362/fw_bcmdhd_apsta.bin ${D}${base_libdir}/firmware/bcm/fw_bcmdhd_apsta.SN8000.bin
+    cp -rfv git/brcm/SN8000_BCM43362/fw_bcmdhd.bin 
+ ${D}${base_libdir}/firmware/bcm/fw_bcmdhd.SN8000.bin
     cp -rfv git/brcm/SN8000_BCM43362/*.cal ${D}${base_libdir}/firmware/bcm
     cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/
 
     #ZP_BCM4339
-    cp -rfv git/brcm/ZP_BCM4339/*.bin ${D}${base_libdir}/firmware/bcm
+    cp -rfv git/brcm/ZP_BCM4339/fw_bcmdhd_apsta.bin ${D}${base_libdir}/firmware/bcm/fw_bcmdhd_apsta.ZP.bin
+    cp -rfv git/brcm/ZP_BCM4339/fw_bcmdhd.bin 
+ ${D}${base_libdir}/firmware/bcm/fw_bcmdhd.ZP.bin
     cp -rfv git/brcm/ZP_BCM4339/*.cal ${D}${base_libdir}/firmware/bcm
     cp -rfv git/brcm/ZP_BCM4339/*.hcd ${D}${sysconfdir}/firmware/
 
--
2.7.4

--
_______________________________________________
meta-freescale mailing list
meta-freescale at yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale