Merge remote branch 'freescale/denzil' into master

* freescale/denzil:
  imx-firmware: Install the atheros wifi firmware

1 files changed, 5 insertions, 1 deletions

diff --git a/recipes-bsp/imx-firmware/imx-firmware_0.1.bb b/recipes-bsp/imx-firmware/imx-firmware_0.1.bb
index 78443ef..5d63605 100644
--- a/recipes-bsp/imx-firmware/imx-firmware_0.1.bb
+++ b/recipes-bsp/imx-firmware/imx-firmware_0.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Freescale IMX firmware such as for the VPU"
 SECTION = "base"
 LICENSE = "Freescale"
 LIC_FILES_CHKSUM = "file://licenses/vpu/EULA;md5=6469a8514eed615d6bf8c09f41846d8f"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://firmware-imx-11.09.01.tar.gz \
            file://vpu_fw_imx51.bin \
@@ -16,6 +16,8 @@ S = "${WORKDIR}/firmware-imx-11.09.01"
 # todo: make FILES_ machine dependent using override, i.MX53 only now.
 FILES_${PN} = "/lib/firmware/vpu/vpu_fw_imx53.bin"
 FILES_${PN} += "/lib/firmware/sdma/sdma-imx53-to1.bin"
+FILES_${PN} += "/lib/firmware/ath6k/*"
+FILES_${PN} += "/lib/firmware/ar3k/*"
 
 do_patch() {
         cp ${WORKDIR}/vpu_fw_imx51.bin ${S}/firmware/vpu/
@@ -29,5 +31,7 @@ do_install() {
         install -d ${D}/lib/firmware/sdma
         install -m 0755 ${S}/firmware/sdma/sdma-imx53-to1.bin ${D}/lib/firmware/sdma
         chmod 644 ${D}/lib//firmware/sdma/sdma-imx53-to1.bin
+        cp -rf ${S}/firmware/ath6k ${D}/lib/firmware
+        cp -rf ${S}/firmware/ar3k ${D}/lib/firmware
 }