From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 23 May 2013 20:10:46 +0000 (-0300)
Subject: firmware-imx: Remove Atheros firmware
X-Git-Tag: 2.1~1354
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1b7e9fb61ea3f6f49d49b0173ea55fe69cf37fe2;p=meta-freescale.git

firmware-imx: Remove Atheros firmware

The linux-firmware already provide the Atheros firmware so we should
use it and avoid duplication.

Change-Id: I5e8675612916ab20ae27e63aedba6758e9a17afb
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf
index 63048f76..5e6137c8 100644
--- a/meta-fsl-arm/conf/machine/imx53ard.conf
+++ b/meta-fsl-arm/conf/machine/imx53ard.conf
@@ -12,6 +12,6 @@ KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts"
 
 UBOOT_MACHINE = "mx53ard_config"
 
-MACHINE_FIRMWARE += "firmware-imx-ar3k \
-                     firmware-imx-ath6k"
+MACHINE_FIRMWARE += "linux-firmware-ar3k \
+                     linux-firmware-ath6k"
 MACHINE_FEATURES += "wifi bluetooth"
diff --git a/meta-fsl-arm/conf/machine/imx53qsb.conf b/meta-fsl-arm/conf/machine/imx53qsb.conf
index 31146883..ca842434 100644
--- a/meta-fsl-arm/conf/machine/imx53qsb.conf
+++ b/meta-fsl-arm/conf/machine/imx53qsb.conf
@@ -12,6 +12,6 @@ KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
 
 UBOOT_MACHINE = "mx53loco_config"
 
-MACHINE_FIRMWARE += "firmware-imx-ar3k \
-                     firmware-imx-ath6k"
+MACHINE_FIRMWARE = "linux-firmware-ar3k \
+                     linux-firmware-ath6k"
 MACHINE_FEATURES += " wifi bluetooth"
diff --git a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
index f3216173..43bdf2f1 100644
--- a/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/meta-fsl-arm/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -19,12 +19,10 @@ do_install() {
     find ${D}/lib/firmware/ -name Android.mk -exec rm '{}' ';'
     rm ${D}/lib/firmware/LICENCE.atheros_firmware \
        ${D}/lib/firmware/README
-}
-
-PACKAGES += "${PN}-ath6k ${PN}-ar3k"
 
-FILES_${PN}-ath6k = "/lib/firmware/ath6k/*"
-FILES_${PN}-ar3k  = "/lib/firmware/ar3k/*"
+    # FIXME: Remove firmware packaged in linux-firmware
+    rm -r ${D}/lib/firmware/ath6k ${D}/lib/firmware/ar3k
+}
 
 python populate_packages_prepend() {
     vpudir = bb.data.expand('/lib/firmware/vpu', d)