meta-digi-arm: replace firmware-mxs for firmware-atheros

This package is now used in both ccimx6adpt and ccardimx28js.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>

meta-digi-arm/conf/machine/include/ccardimx28.inc

@@ -14,7 +14,7 @@ UBOOT_SUFFIX = "sb"
 WPA_DRIVER = "nl80211"
 
 # Firmware
-MACHINE_FIRMWARE = "firmware-mxs-ar3k"
+MACHINE_FIRMWARE = "firmware-atheros-ar3k"
 
 MACHINE_EXTRA_RDEPENDS    += "nvram ubootenv update-flash"
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"

meta-digi-arm/conf/machine/include/ccimx6.inc

@@ -14,6 +14,7 @@ UBOOT_SUFFIX = "imx"
 # Firmware
 MACHINE_FIRMWARE ?= ""
 MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q"
+MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
 
 MACHINE_EXTRA_RDEPENDS    += "e2fsprogs e2fsprogs-mke2fs parted"
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"

meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros_unknown.bb

@@ -1,6 +1,6 @@
 # Copyright (C) 2013 Digi International.
 
-SUMMARY = "Firmware files for Digi's MXS based platforms, such as Atheros bluetooth."
+SUMMARY = "Firmware files for Digi's platforms, such as Atheros bluetooth."
 SECTION = "base"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=ef5b088ca04b6f10b1764aa182f4f51d"
@@ -29,4 +29,4 @@ PACKAGES += "${PN}-ar3k"
 
 FILES_${PN}-ar3k  = "/lib/firmware/ar3k/*"
 
-COMPATIBLE_MACHINE = "(mxs)"
+COMPATIBLE_MACHINE = "(mxs|mx6)"