[meta-fsl-arm][PATCH 1/2] firmware-imx: Add brcm firmware installation

[meta-fsl-arm][PATCH 1/2] firmware-imx: Add brcm firmware installation

[Daiane Angolini]

Add the subpackage firmware-imx-brcm which installs 4 set of WiFi and Bluetooth
firmwares:

* 1BW_BCM43340
* 1DX_BCM4343W
* SN8000_BCM43362
* ZP_BCM4339

Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
---
 recipes-bsp/firmware-imx/firmware-imx.inc    | 32 ++++++++++++++++++++++++++--
 recipes-bsp/firmware-imx/firmware-imx_5.4.bb |  3 +++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index 3aa99a6..2f82791 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -6,14 +6,41 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 
 PE = "1"
 
-SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true"
+#BRCM firmware git
+SRCBRANCH ?= "master"
+
+SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
+           git://git.freescale.com/imx/imx-firmware.git;branch=${SRCBRANCH};destsuffix=${S}/git "
 
 inherit fsl-eula-unpack
 
 do_install() {
     install -d ${D}${base_libdir}/firmware/imx
+    install -d ${D}${base_libdir}/firmware/brcm
+    install -d ${D}${sysconfdir}/firmware
+
     cp -rfv firmware/* ${D}${base_libdir}/firmware/
 
+    #1BW_BCM43340
+    cp -rfv git/brcm/1BW_BCM43340/*.bin ${D}${base_libdir}/firmware/brcm
+    cp -rfv git/brcm/1BW_BCM43340/*.cal ${D}${base_libdir}/firmware/brcm
+    cp -rfv git/brcm/1BW_BCM43340/*.hcd ${D}${sysconfdir}/firmware/
+
+    #1DX_BCM4343W
+    cp -rfv git/brcm/1DX_BCM4343W/*.bin ${D}${base_libdir}/firmware/brcm
+    cp -rfv git/brcm/1DX_BCM4343W/*.cal ${D}${base_libdir}/firmware/brcm
+    cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/
+
+    #SN8000_BCM43362
+    cp -rfv git/brcm/SN8000_BCM43362/*.bin ${D}${base_libdir}/firmware/brcm
+    cp -rfv git/brcm/SN8000_BCM43362/*.cal ${D}${base_libdir}/firmware/brcm
+    cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/
+
+    #ZP_BCM4339
+    cp -rfv git/brcm/ZP_BCM4339/*.bin ${D}${base_libdir}/firmware/brcm
+    cp -rfv git/brcm/ZP_BCM4339/*.cal ${D}${base_libdir}/firmware/brcm
+    cp -rfv git/brcm/ZP_BCM4339/*.hcd ${D}${sysconfdir}/firmware/
+
     mv ${D}${base_libdir}/firmware/epdc/ ${D}${base_libdir}/firmware/imx/epdc/
     mv ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
 
@@ -44,8 +71,9 @@ ALLOW_EMPTY_${PN} = "1"
 
 PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
 
-PACKAGES =+ "${PN}-epdc"
+PACKAGES =+ "${PN}-epdc ${PN}-brcm"
 
 FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/"
+FILES_${PN}-brcm = "${base_libdir}/firmware/brcm/*.bin ${base_libdir}/firmware/brcm/*.cal ${sysconfdir}/firmware/"
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_5.4.bb b/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
index a7a2b38..5f7a6a1 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_5.4.bb
@@ -6,4 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
 SRC_URI[md5sum] = "dae846ca2fc4504067f725f501491adf"
 SRC_URI[sha256sum] = "c5bd4bff48cce9715a5d6d2c190ff3cd2262c7196f7facb9b0eda231c92cc223"
 
+#BRCM firmware git
+SRCREV = "951c1363abe95dd75ab3e9447f640d7807240236"
+
 COMPATIBLE_MACHINE = "(mx5|mx6|mx6ul|mx7)"
-- 
2.7.4

[meta-fsl-arm][PATCH 2/2] imx7dsabresd: Install WiFi and Bluetooth by default

[Daiane Angolini]

This machine has the ZP_BCM4339 chip, so install the firmware by default.

Signed-off-by: Daiane Angolini <daiane.angolini@nxp.com>
---
 conf/machine/imx7dsabresd.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 0bd6735..7a88cea 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -23,3 +23,5 @@ UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config"
 UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs"
 UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config"
 UBOOT_CONFIG[mfgtool] = "mx7dsabresd_config"
+
+MACHINE_EXTRA_RRECOMMENDS += "firmware-imx-brcm"
-- 
2.7.4