Merge branch 'qc-firmware' into 'master'

Use QC6234 firmware compatible with QC's private ath6kl driver

See merge request !12

recipes-bsp/firmware-vesta/firmware-qualcomm.bb

-SUMMARY = "Vesta firmware"
-DESCRIPTION = "Qualcomm wifi driver"
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://git/firmware/ath6k/LICENSE.qca_firmware;md5=2a397c0e988f4c52d3d526133b617c8d"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-#Qualcomm 6234 firmware file
-SRCBRANCH ?= "qc-private"
-SRCREV = "8ca838e0fc17e1e75a8f9244f2fe01bd37702a96"
-SRC_URI = "git://git.rigado.com/vesta/vesta-firmware.git;protocol=https;branch=${SRCBRANCH};destsuffix=${S}/git "
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
-	install -m 444 git/firmware/ath6k/LICENSE.qca_firmware ${D}${base_libdir}/firmware
-    install -m 755 git/firmware/ath6k/AR6004/hw3.0/fw.ram.bin ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
-}
-
-FILES_${PN} += " \
-	${base_libdir}/firmware/ath6k/AR6004/hw3.0/fw.ram.bin \
-	${base_libdir}/firmware/LICENSE.qca_firmware \
-"
-
-COMPATIBLE_MACHINE = "(vesta|imx6ul)"

recipes-bsp/firmware-vesta/firmware-vesta.bb

 SUMMARY = "Vesta firmware"
-DESCRIPTION = "Vesta wifi bdata file"
+DESCRIPTION = "Vesta wifi bdata.bin, fw.ram.bin file, and abtfilt files"
 SECTION = "base"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://git/firmware/ath6k/LICENSE.qca_firmware;md5=2a397c0e988f4c52d3d526133b617c8d"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+RDEPENDS_${PN} = "dbus-lib libnl libnl-genl bluez5"
 
 #Qualcomm 6234 board data file
 SRCBRANCH ?= "master"
-SRCREV = "a5b37d7b354b6140d7e8fbb8bea1842550067e1c"
+
+SRCREV = "c91c43994c879846c15a3cf5251ddc84a03c4287"
 SRC_URI = "git://git.rigado.com/vesta/vesta-firmware.git;protocol=https;branch=${SRCBRANCH};destsuffix=${S}/git "
 
+INSANE_SKIP_${PN} = "ldflags"
+
 do_install() {
-	install -d ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
+    install -d ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
+    install -m 444 git/firmware/ath6k/LICENSE.qca_firmware ${D}${base_libdir}/firmware
+    install -m 555 git/firmware/ath6k/AR6004/hw3.0/fw.ram.bin ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
     install -m 444 git/firmware/ath6k/AR6004/hw3.0/bdata.bin ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
+    install -d ${D}${sbindir}
+    install -m 555 git/firmware/ath6k/AR6004/hw3.0/abtfilt ${D}${sbindir}
 }
 
 FILES_${PN} += " \
+        ${base_libdir}/firmware/LICENSE.qca_firmware \
+        ${base_libdir}/firmware/ath6k/AR6004/hw3.0/fw.ram.bin \
 	${base_libdir}/firmware/ath6k/AR6004/hw3.0/bdata.bin \
+	${sbindir}/abtfilt \
 "
 
-COMPATIBLE_MACHINE = "(vesta|imx6ul)"
\ No newline at end of file
+COMPATIBLE_MACHINE = "(vesta|imx6ul)"

recipes-core/scripts-vesta/files/setmac.sh

@@ -28,5 +28,9 @@ if [ ! -f /lib/firmware/ar3k/1020201/ar3kbdaddr.pst ] ; then
 	echo $(get_mac 33) > /lib/firmware/ar3k/1020201/ar3kbdaddr.pst
 fi
 
+#install ath6kl driver module
 MODVER=$(ls /lib/modules)
 insmod /lib/modules/$MODVER/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko
+
+#start bluettooh coexistance user-space daemon
+abtfilt -d -a -x -w wlan0 -b -s

recipes-kernel/linux/linux-vesta_4.1-1.0.bb

@@ -14,9 +14,9 @@ PV .= "4.1-1.0+git${SRCPV}"
 SRCBRANCH = "master"
 
 #Always update SRCREV based on your last commit
-SRCREV = "90b43244ffd6486129212a84bb0e220b6198c36e"
+SRCREV = "41360cd86047d7352729e1f1bfd8aafa28df3fe3"
 
-SRC_URI = "git://git.rigado.com/vesta/linux-fslc-imx-4.1-1.0.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "git://git.rigado.com/vesta/linux-fslc-imx-4.1-1.0.git;protocol=https;branch=${SRCBRANCH}; \ 
            file://defconfig"
 
 COMPATIBLE_MACHINE = "(vesta|imx6ul)"