linux-firmware: Move from bbappend to a custom firmware recipe

Ultra96 WiFi/BT chip requires custom firmware.  The main wifi firmware is
provided by the linux-firmware recipe, but the Bluetooth firmware must be
sourced from another location.

We only package the specific firmware that we require for this, and do
it in a way that is similar to the linux-firmware recipe.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

2 files changed, 65 insertions, 29 deletions

diff --git a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
new file mode 100644
index 00000000..c3adcf58
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
@@ -0,0 +1,65 @@
+# TIInit_11.8.32.bts is required for bluetooth support but this particular
+# version is not available in the linux-firmware repository.
+#
+SUMMARY = "TI Bluetooth firmware files for use with Linux kernel"
+SECTION = "kernel"
+
+LICENSE = "Firmware-ti-bt"
+
+LIC_FILES_CHKSUM = "file://LICENSE.ti-bt;md5=f39eac9f4573be5b012e8313831e72a9"
+
+# No common license for this, so be sure to include it
+NO_GENERIC_LICENSE[Firmware-ti-bt] = "LICENSE.ti-bt"
+
+SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;protocol=https"
+SRCREV = "c290f8af9e388f37e509ecb111a1b64572b7c225"
+
+S = "${WORKDIR}/git"
+
+inherit allarch
+
+CLEANBROKEN = "1"
+
+do_unpack[postfuncs] += "rename_license"
+
+rename_license() {
+        mv ${S}/LICENSE ${S}/LICENSE.ti-bt
+}
+
+do_compile() {
+        :
+}
+
+do_install() {
+        oe_runmake 'DEST_DIR=${D}' 'BASE_LIB_DIR=${nonarch_base_libdir}'
+
+        # Remove files we're not packaging...
+        rm -f   ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_7.6.15.bts \
+                ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_10.6.15.bts \
+                ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_bt_spec_4.1.bts \
+                ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_12.8.32.bts \
+                ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_12.10.28.bts \
+                ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_avpr_add-on.bts \
+                ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_bt_spec_4.0.bts \
+                ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_ble_add-on.bts
+
+        for each in ${D}${nonarch_base_libdir}/firmware/ti-connectivity/* ; do
+                ln -s ti-connectivity/`basename $each` ${D}${nonarch_base_libdir}/firmware/`basename $each`
+        done
+
+        cp LICENSE.ti-bt ${D}${nonarch_base_libdir}/firmware/License.ti-bt
+}
+
+#  11.8.32   =   WL180x, WL183x, WL185x PG2.1 or PG2.2, 8.32 ROM Version
+PACKAGES =+ "${PN}-wl180x ${PN}-license"
+
+FILES_${PN}-license = "${nonarch_base_libdir}/firmware/License.ti-bt"
+
+FILES_${PN}-wl180x = "${nonarch_base_libdir}/firmware/TIInit_11.8.32.bts \
+                      ${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_11.8.32.bts"
+
+RDEPENDS_${PN}-wl180x = "${PN}-license linux-firmware-wl18xx"
+
+LICENSE_${PN}-wl180x = "Firmware-ti-bt"
+
+INSANE_SKIP = "arch"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
deleted file mode 100644
index eb64045a..00000000
--- a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ /dev/null
@@ -1,29 +0,0 @@
-# TIInit_11.8.32.bts is required for bluetooth support but this particular
-# version is not available in the linux-firmware repository.
-#
-SRC_URI_append_ultra96 = "\
-        https://git.ti.com/ti-bt/service-packs/blobs/raw/c290f8af9e388f37e509ecb111a1b64572b7c225/initscripts/TIInit_11.8.32.bts;name=TIInit_11.8.32 \
-        "
-
-SRC_URI[TIInit_11.8.32.md5sum] = "b1e142773e8ef0537b93895ebe2fcae3"
-SRC_URI[TIInit_11.8.32.sha256sum] = "962322c05857ad6b1fb81467bdfc59c125e04a6a8eaabf7f24b742ddd68c3bfa"
-
-do_install_append_ultra96() {
-        cp ${WORKDIR}/TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
-        ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )
-        rm -f ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_7*
-        rm -f ${D}${nonarch_base_libdir}/firmware/TIInit_7*
-}
-
-INSANE_SKIP_${PN} += "installed-vs-shipped"
-
-PACKAGES_remove_ultra96 = "${PN}-wl12xx"
-
-FILES_${PN}-wl18xx_ultra96 = " \
-        ${nonarch_base_libdir}/firmware/wl18* \
-        ${nonarch_base_libdir}/firmware/TI* \
-        ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \
-        ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \
-        "
-
-PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}"