Merge branch 'firmware_restructure' into 'master'

Using Linux firmware to pull in Qualcomm 6234 bluetooth drivers.

See merge request !1

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

+COMPATIBLE_MACHINE = "(imx6ul-vesta-v1|imx6ul-vesta-v2)"
+
+SUMMARY = "Vesta firmware"
+DESCRIPTION = "Qualcomm wifi driver"
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://git/LICENSE.qca_firmware;md5=2a397c0e988f4c52d3d526133b617c8d"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#Qualcomm 6234 firmware file
+SRCBRANCH ?= "master"
+SRCREV = "2e02576c1dab6fd35118eea1004f50aaaed3794f"
+SRC_URI = "git://git@github.com/qca/ath6kl-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/LICENSE.qca_firmware ${D}${base_libdir}/firmware
+    install -m 755 git/ath6k/AR6004/hw3.0/fw-5.bin ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
+}
+
+FILES_${PN} += " \
+	${base_libdir}/firmware/ath6k/AR6004/hw3.0/fw-5.bin \
+	${base_libdir}/firmware/LICENSE.qca_firmware \
+"
\ No newline at end of file

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

-# Copyright (C) 2012-2016 Freescale Semiconductor
+COMPATIBLE_MACHINE = "(imx6ul-vesta-v1|imx6ul-vesta-v2)"
 
-require recipes-bsp/firmware-vesta/firmware-vesta.inc
+SUMMARY = "Vesta firmware"
+DESCRIPTION = "Vesta wifi bdata file"
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://git/firmware/ath6k/LICENSE.qca_firmware;md5=2a397c0e988f4c52d3d526133b617c8d"
 
-#Qualcomm 6234 firmware git
-SRCREV = "64230378e8d4ad5a4024524282b85f191721cb23"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(imx6ul-vesta-v1|imx6ul-vesta-v2)"
+#Qualcomm 6234 board data file
+SRCBRANCH ?= "master"
+SRCREV = "a5b37d7b354b6140d7e8fbb8bea1842550067e1c"
+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/AR6004/hw3.0/bdata.bin ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
+}
 
+FILES_${PN} += " \
+	${base_libdir}/firmware/ath6k/AR6004/hw3.0/bdata.bin \
+"

recipes-bsp/firmware-vesta/firmware-vesta.inc

-SUMMARY = "Vesta v1 firmware"
-DESCRIPTION = "Vesta firmware such as for the wifi and bluetooth"
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://git/firmware/ath6k/LICENSE.qca_firmware;md5=2a397c0e988f4c52d3d526133b617c8d"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-#Qualcomm 6234 firmware git
-SRCBRANCH ?= "master"
-
-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 755 git/firmware/ath6k/AR6004/hw3.0/bdata.bin ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
-    install -m 755 git/firmware/ath6k/AR6004/hw3.0/fw-5.bin ${D}${base_libdir}/firmware/ath6k/AR6004/hw3.0
-
-	install -d ${D}${base_libdir}/firmware/ar3k/1020201
-    install -m 755 git/firmware/ar3k/1020201/PS_ASIC.pst ${D}${base_libdir}/firmware/ar3k/1020201
-    install -m 755 git/firmware/ar3k/1020201/RamPatch.txt ${D}${base_libdir}/firmware/ar3k/1020201
-}
-
-FILES_${PN} += " \
-	${base_libdir}/firmware/ath6k/AR6004/hw3.0/bdata.bin \
-	${base_libdir}/firmware/ath6k/AR6004/hw3.0/fw-5.bin \
-	${base_libdir}/firmware/ar3k/1020201/PS_ASIC.pst \
-	${base_libdir}/firmware/ar3k/1020201/RamPatch.txt \
-"

recipes-bsp/u-boot/u-boot-vesta_2015.04.bb

@@ -16,7 +16,7 @@ PROVIDES += "u-boot"
 SRCBRANCH = "master"
 
 #Always update SRCREV based on your last commit
-SRCREV = "9938a88c72a4b5a8e013a41e0ca37a5629db18de"
+SRCREV = "ad9fe760a675abd44b2ee7d79f99c8632450d317"
 
 SRC_URI = "git://git.rigado.com/vesta/u-boot-2015.04.git;protocol=https;branch=${SRCBRANCH}"
 

recipes-core/rigtools/rigtools.inc

@@ -22,16 +22,16 @@ do_install() {
     install -m 755 ${S}/etc/init.d/dgua_service ${D}/etc/init.d/dgua_service
     ln -sf /etc/init.d/dgua_service ${D}/etc/rc5.d/S70dgua_service
     
-    ln -sf /usr/bin/rigtool ${D}/usr/bin/boot_counter
-    ln -sf /usr/bin/rigtool ${D}/usr/bin/boot_toggle
-    ln -sf /usr/bin/rigtool ${D}/usr/bin/dgua
-    ln -sf /usr/bin/rigtool ${D}/usr/bin/dgua_service
-    ln -sf /usr/bin/rigtool ${D}/usr/bin/gateway_hostname
+    ln -sf /usr/bin/rigtools ${D}/usr/bin/boot_counter
+    ln -sf /usr/bin/rigtools ${D}/usr/bin/boot_toggle
+    ln -sf /usr/bin/rigtools ${D}/usr/bin/dgua
+    ln -sf /usr/bin/rigtools ${D}/usr/bin/dgua_service
+    ln -sf /usr/bin/rigtools ${D}/usr/bin/gateway_hostname
 }
 
 FILES_${PN} += " \
     /etc/dgua.conf \
-    /usr/bin/rigtool \
+    /usr/bin/rigtools \
     /usr/bin/boot_counter \
     /usr/bin/boot_toggle \
     /usr/bin/dgua \

recipes-kernel/linux-firmware/linux-firmware_git.bbappend

+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+LIC_FILES_CHKSUM += "\
+file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5"
+
+FWPATH = "/lib/firmware/ar3k"
+
+do_install_append () {
+	install -m 444 ar3k/1020201/PS_ASIC.pst ${D}${FWPATH}/1020201
+	install -m 444 ar3k/1020201/RamPatch.txt ${D}${FWPATH}/1020201
+}
+
+FILES_${PN}-ar3k = "  \
+  ${FWPATH}/1020201/PS_ASIC.pst  \
+  ${FWPATH}/1020201/RamPatch.txt  \
+"
\ No newline at end of file

recipes-vesta/images/core-image-minimal.bbappend

@@ -2,15 +2,13 @@ IMAGE_INSTALL_append = " \
     kernel-modules \
     firmware-vesta \
     scripts-vesta \
+    linux-firmware-ar3k \
+    firmware-qualcomm \
+    packagegroup-base-wifi \
     mtd-utils \
     rng-tools \
     i2c-tools \
-    curl \
-    json-c \
-    lua \
-    libarchive \
     avahi-daemon \
     openssh \
-    swupdate \
     rigtools \
 "

recipes-vesta/images/engr-test-image.bb

@@ -14,6 +14,8 @@ IMAGE_INSTALL_append += " \
     swupdate \
     kernel-modules \
     firmware-vesta \
+    linux-firmware-ar3k \
+    firmware-qualcomm \
     scripts-vesta \
     usbutils \
     imx-test \