73 files changed, 413 insertions, 776 deletions
diff --git a/meta-ti-extras/SECURITY b/meta-ti-extras/SECURITY
new file mode 100644
index 00000000..367adc34
--- /dev/null
+++ b/meta-ti-extras/SECURITY
@@ -0,0 +1,20 @@
+How to Report a Potential Vulnerability?
+========================================
+If you would like to report a public issue (for example, one with a released
+CVE number), please report it to the mailing list:
+  https://lists.yoctoproject.org/g/meta-ti
+If you are dealing with a not-yet released or urgent issue, please send a
+message to one of the maintainers listed in the README.  Include as many
+details as possible:
+  - the layer or software module affected
+  - the recipe and its version
+  - any example code, if available
+Branches maintained with security fixes
+---------------------------------------
+See https://wiki.yoctoproject.org/wiki/Releases for the list of current
+releases.  We only accept patches for the LTS releases and the master branch.
diff --git a/meta-ti-extras/conf/layer.conf b/meta-ti-extras/conf/layer.conf
index f2d6b250..d340c414 100644
--- a/meta-ti-extras/conf/layer.conf
+++ b/meta-ti-extras/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-extras"
 BBFILE_PATTERN_meta-ti-extras := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti-extras = "6"
-LAYERSERIES_COMPAT_meta-ti-extras = "nanbield scarthgap styhead"
+LAYERSERIES_COMPAT_meta-ti-extras = "walnascar whinlatter"
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb b/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb
index 9a5a6ffa..0d856362 100644
--- a/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Firmware files for Bluetooth"
+SUMMARY = "Firmware files for Bluetooth"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f39eac9f4573be5b012e8313831e72a9"
@@ -10,8 +10,6 @@ SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4"
 BRANCH = "master"
 SRC_URI = "git://git.ti.com/git/ti-bt/service-packs.git;protocol=https;branch=${BRANCH}"
-S = "${WORKDIR}/git"
 do_compile() {
    :
 }
diff --git a/meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb b/meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb
new file mode 100644
index 00000000..d5597ab9
--- /dev/null
+++ b/meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Firmware files for use with TI cc33xx"
+LICENSE = "TI-TSPA"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=df68504cbd0a4da1643ebcfd5783dbc9"
+SRCREV = "988ded3a7d4d0e46de62e9ebfcb685c502bd9edf"
+SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-fw.git;protocol=https;branch=master"
+PV = "1.7.0.120"
+CLEANBROKEN = "1"
+do_compile[no_exec] = "1"
+EXTRA_OEMAKE = "DEST_DIR=${D} BASE_LIB_DIR=${nonarch_base_libdir}"
+do_install() {
+    oe_runmake install
+}
+FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
diff --git a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb b/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
deleted file mode 100644
index 491ee0f3..00000000
--- a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-SUMMARY = "Firmware for DSP for an example application called copycodectest"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://src/ti/framework/dce/dce.c;startline=1;endline=31;md5=2c6e9aba6ed75f22b1a2b7544b1c809d"
-COMPATIBLE_MACHINE = "dra7xx"
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "dsp"
-SRC_URI = "git://git.ti.com/git/glsdk/dspdce.git;protocol=https;branch=master"
-SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8"
-PV = "1.00.00.07"
-S = "${WORKDIR}/git"
-require recipes-ti/includes/ti-paths.inc
-PR = "r4"
-inherit update-alternatives
-DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ipc-rtos ti-osal ti-cgt6x-native"
-export HWVERSION = "ES10"
-export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti"
-export XDCVERSION = "ti-xdctools-tree"
-export BIOSVERSION = "ti-sysbios-tree"
-export IPCVERSION = "ti-ipc-tree"
-export CEVERSION = "ti-codec-engine-tree"
-export FCVERSION = "ti-framework-components-tree"
-export XDAISVERSION = "ti-xdais-tree"
-export OSALVERSION = "ti-osal-tree"
-export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
-export C66XCGTOOLSPATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-do_configure() {
-    cd ${S}
-    make unconfig
-    make vayu_config
-}
-do_compile() {
-    cd ${S}
-    make dspbin
-}
-TARGET = "dra7-dsp1-fw.xe66"
-do_install() {
-    install -d ${D}${nonarch_base_libdir}/firmware
-    install -m 0644 ${S}/dra7xx-c66x-dsp.xe66 ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN}
-}
-ALTERNATIVE:${PN} = "dra7-dsp1-fw.xe66"
-ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/${TARGET}"
-ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}"
-ALTERNATIVE_PRIORITY = "10"
-INSANE_SKIP:${PN} = "arch"
-FILES:${PN} += "${nonarch_base_libdir}/firmware/*"
diff --git a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
index 9d85829b..d8e759d9 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
@@ -1,13 +1,10 @@
-DESCRIPTION = "Debug Sub-System (DebugSS) driver for Keystone and DRA7xx devices"
+SUMMARY = "Debug Sub-System (DebugSS) driver for Keystone and DRA7xx devices"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3"
-# This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR:append = "d"
-PR = "${MACHINE_KERNEL_PR}"
 PV:append = "+git"
-S = "${WORKDIR}/git/debugss_module/debugss-mod"
+S:append = "/debugss_module/debugss-mod"
 inherit module
@@ -20,3 +17,8 @@ COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 include dsptop.inc
+SRC_URI += "\
+    file://0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch \
+    file://0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch \
+"
diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
index 90ce8943..5e8c56b8 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI dsptop utility."
+SUMMARY = "TI dsptop utility."
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979"
@@ -6,7 +6,7 @@ DEPENDS = "libulm ncurses"
 PR = "${INC_PR}.2"
-S = "${WORKDIR}/git/dsptop"
+S:append = "/dsptop"
 DEVICE = ""
 DEVICE:dra7xx = "DRA7xx"
diff --git a/meta-ti-extras/recipes-bsp/dsptop/files/0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch b/meta-ti-extras/recipes-bsp/dsptop/files/0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch
new file mode 100644
index 00000000..19c6791e
--- /dev/null
+++ b/meta-ti-extras/recipes-bsp/dsptop/files/0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch
@@ -0,0 +1,32 @@
+From 5a514f6a6bb1c49bdbaf8eabc1776f54851227af Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Sun, 4 Aug 2024 11:17:28 -0500
+Subject: [PATCH] debugss_kmodule: Add include for mod_devicetable.h
+Add include for <linux/mod_devicetable.h> to fix compile error:
+git/debugss_module/debugss-mod/debugss_kmodule.c:1149:34: error:
+array type has incomplete element type 'struct of_device_id'
+Upstream-Status: Inactive-Upstream
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ debugss_kmodule.c | 2 ++
+ 1 file changed, 2 insertions(+)
+diff --git a/debugss_kmodule.c b/debugss_kmodule.c
+index 6fac61d..9e084eb 100644
+--- a/debugss_kmodule.c
+++ b/debugss_kmodule.c
+@@ -26,6 +26,8 @@
+ #include <linux/of_device.h>
+ #include "debugss_kmodule.h"
+#include <linux/mod_devicetable.h>
+
+ /* un-comment the line below to enable printing for kernel debug messages */
+ //#define DEBUGSS_DRV_DEBUG
+--
+2.17.1
diff --git a/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch b/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch
new file mode 100644
index 00000000..0afe0264
--- /dev/null
+++ b/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch
@@ -0,0 +1,57 @@
+From aaddf1fa8b92db23ae2ebc83826c2bb5f5c87c35 Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Thu, 3 Oct 2024 14:25:18 -0500
+Subject: [PATCH] debugss_kmodule: kernel 6.11 changed return value for remove
+ slot
+In kernel version 6.11 the function footprint changed for the remove
+slot to return a void instead of an int. [1]
+Add ifdef checking code to look for kernel version and pick the correct
+return code.
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/linux/platform_device.h?id=0edb555a65d1ef047a9805051c36922b52a38a9d
+Upstream-Status: Inactive-Upstream [lastcommit: 2021-04-20]
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ debugss_kmodule.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/debugss_kmodule.c b/debugss_kmodule.c
+index 9e084eb..4191be8 100644
+--- a/debugss_kmodule.c
+++ b/debugss_kmodule.c
+@@ -27,6 +27,7 @@
+ #include "debugss_kmodule.h"
+ #include <linux/mod_devicetable.h>
+#include <linux/version.h>
+ /* un-comment the line below to enable printing for kernel debug messages */
+ //#define DEBUGSS_DRV_DEBUG
+@@ -1132,7 +1133,11 @@ static int dra7xx_debugss_probe(struct platform_device *pdev)
+        return retval;
+ }
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
+ static int dra7xx_debugss_remove(struct platform_device *pdev)
+#else
+static void dra7xx_debugss_remove(struct platform_device *pdev)
+#endif
+ {
+        __D("%s:\n",__FUNCTION__);
+@@ -1145,7 +1150,9 @@ static int dra7xx_debugss_remove(struct platform_device *pdev)
+        /* Un-prepare debugSS clock */
+        clk_disable_unprepare(sys_clk_in1);
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
+        return 0;
+#endif
+ }
+ static const struct of_device_id dra7xx_debugss_of_match[] = {
+--
+2.17.1
diff --git a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
index 6a2cde30..73c7831e 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
@@ -9,9 +9,9 @@ REQUIRED_MACHINE_FEATURES = "dsp"
 DEPENDS = "ti-cgt6x-native"
 PR = "${INC_PR}.0"
-S = "${WORKDIR}/git/dsptop/ulm"
+S:append = "/dsptop/ulm"
-DEVICE=""
+DEVICE = ""
 DEVICE:dra7xx = "DRA7xx"
 EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
@@ -42,4 +42,14 @@ include dsptop.inc
 ALLOW_EMPTY:${PN} = "1"
-PARALLEL_MAKE= ""
+PARALLEL_MAKE = ""
+# Disable the "buildpaths" check while we figure out how we are
+# going to address this issue.
+#
+# The ti-cgt6x compiler is a custom TI compiler for the TI C6000
+# Digital Signal Processor(DSP) platform.  It does not currently
+# support reproducible builds and is provided via a binary blob
+# download that we cannot patch in the recipe to address the
+# issue.
+INSANE_SKIP:${PN}-dev += "buildpaths"
diff --git a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
index 8d066eb0..bfdf1ac5 100644
--- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master"
 SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"
-S = "${WORKDIR}/git"
 PV = "3.00.15.00"
 PR = "r7"
@@ -26,18 +24,18 @@ inherit update-alternatives
 DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos"
-export HWVERSION="ES10"
+export HWVERSION = "ES10"
-export BIOSTOOLSROOT="${STAGING_DIR_TARGET}/usr/share/ti"
+export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti"
-export XDCVERSION="ti-xdctools-tree"
+export XDCVERSION = "ti-xdctools-tree"
-export BIOSVERSION="ti-sysbios-tree"
+export BIOSVERSION = "ti-sysbios-tree"
-export IPCVERSION="ti-ipc-tree"
+export IPCVERSION = "ti-ipc-tree"
-export CEVERSION="ti-codec-engine-tree"
+export CEVERSION = "ti-codec-engine-tree"
-export FCVERSION="ti-framework-components-tree"
+export FCVERSION = "ti-framework-components-tree"
-export XDAISVERSION="ti-xdais-tree"
+export XDAISVERSION = "ti-xdais-tree"
-export TMS470CGTOOLPATH="${M4_TOOLCHAIN_INSTALL_DIR}"
+export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}"
-export IPCSRC="${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
+export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
 EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}"
@@ -65,3 +63,12 @@ ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGE
 ALTERNATIVE_PRIORITY = "20"
 FILES:${PN} += "${nonarch_base_libdir}/firmware/*"
+# Disable the "buildpaths" check while we figure out how we are
+# going to address this issue.
+#
+# The ti-cgt-arm compiler is a custom TI compiler.  It does not
+# currently support reproducible builds and is provided via a
+# binary blob download that we cannot patch in the recipe to address
+# the issue.
+INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
index b01dd6a5..73b582a2 100644
--- a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
+++ b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Programmable Real-time Unit Software Package"
+SUMMARY = "Programmable Real-time Unit Software Package"
 HOMEPAGE = "http://processors.wiki.ti.com/index.php/PRU-ICSS"
 LICENSE = "BSD-3-Clause & PD"
@@ -29,8 +29,6 @@ RDEPENDS:${PN}:append = " \
 DEPENDS = "ti-cgt-pru-native"
-S = "${WORKDIR}/git"
 export PRU_CGT = "${TI_CGT_PRU_INSTALL_DIR}"
 export PRU_SSP = "${S}"
diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch
deleted file mode 100644
index bb05c6fe..00000000
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3a8fc3ccf00796254d6cef4b6d4cd70dc37012e1 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Fri, 10 Mar 2017 13:28:29 -0500
-Subject: [PATCH] Add Makefile to install firmware files
-Upstream-Status: Pending
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
- Makefile | 9 +++++++++
- 1 file changed, 9 insertions(+)
- create mode 100644 Makefile
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..1cf38e3
--- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,9 @@
-+# Installs the the ti-connectivity wlan firmware files into the root file system
-+
-+install:
-+       @if [ ! -d $(DESTDIR) ] ; then \
-+               echo "Target filesystem directory doesn't exist."; \
-+               exit 1; \
-+       fi
-+       install -d  $(DEST_DIR)/lib/firmware/ti-connectivity
-+       cp *.bin $(DEST_DIR)/lib/firmware/ti-connectivity/
-- 
-2.7.4
diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
index dbae5a21..3e61db88 100644
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
+++ b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
@@ -1,17 +1,12 @@
-DESCRIPTION = "Firmware files for use with TI wl18xx"
+SUMMARY = "Firmware files for use with TI wl18xx"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
-SRC_URI = " \
+SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH}"
-        git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH} \
-        file://0001-Add-Makefile-to-install-firmware-files.patch \
-"
 SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71"
 BRANCH = "master"
-S = "${WORKDIR}/git"
 CLEANBROKEN = "1"
 do_compile() {
@@ -19,11 +14,8 @@ do_compile() {
 }
 do_install() {
-    if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+    install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
-        oe_runmake 'DEST_DIR=${D}/usr' install
+    install -m 0644 ${S}/*.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
-    else
-        oe_runmake 'DEST_DIR=${D}' install
-    fi
 }
 FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
diff --git a/meta-ti-extras/recipes-connectivity/cc33calibrator/cc33calibrator_git.bb b/meta-ti-extras/recipes-connectivity/cc33calibrator/cc33calibrator_git.bb
new file mode 100644
index 00000000..57311667
--- /dev/null
+++ b/meta-ti-extras/recipes-connectivity/cc33calibrator/cc33calibrator_git.bb
@@ -0,0 +1,24 @@
+SUMMARY = "The calibrator utility for TI wireless solution based on cc33xx driver"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d5fc448a36efe573623542dcb989afc4"
+SRCREV = "89d7e55b40972cbfc84f0734c35a7a6b4f7f5b31"
+SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-utils.git;branch=master;protocol=https"
+PV = "1.0.0.50"
+DEPENDS = "libnl"
+S:append = "/cc33calibrator"
+export CROSS_COMPILE = "${TARGET_PREFIX}"
+EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \
+                LDFLAGS="${LDFLAGS} -L${STAGING_LIBDIR}" \
+                CC="${CC}" \
+                NLVER=3"
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 cc33calibrator ${D}${bindir}/
+}
diff --git a/meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb b/meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb
new file mode 100644
index 00000000..724be6e5
--- /dev/null
+++ b/meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Configuration utility for TI CC33xx wireless devices"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d5fc448a36efe573623542dcb989afc4"
+SRCREV = "a2f84140b8d67cfc94472cf92676a409d1e47d86"
+SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-utils.git;branch=master;protocol=https"
+PV = "1.7.0.120"
+S:append = "/cc33conf"
+EXTRA_OEMAKE = "CC="${CC}""
+do_install() {
+        install -d ${D}${sbindir}
+        install -d ${D}${sbindir}/cc33conf/
+        install -m 0755 cc33xxconf ${D}${sbindir}/cc33conf/
+        install -m 0755 dictionary.txt ${D}${sbindir}/cc33conf/
+        install -m 0755 default.conf ${D}${sbindir}/cc33conf/
+        install -m 0755 README ${D}${sbindir}/cc33conf/
+        install -m 0755 cc33xx-conf.conf ${D}${sbindir}/cc33conf/
+        install -m 0755 cc33xx-conf.ini ${D}${sbindir}/cc33conf/
+        install -m 0755 conf.h ${D}${sbindir}/cc33conf/
+}
+FILES:${PN} += " \
+        ${sbindir}/cc33conf \
+"
diff --git a/meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb b/meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb
new file mode 100644
index 00000000..e3fe6f80
--- /dev/null
+++ b/meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Scripts and configuration files for TI cc33xx wireless drivers"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=904443cf7fae5c09c3d5f83f8557c265"
+SRCREV = "4371c93ea01b339f6f73f77d6d6bfcc185def8c0"
+SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-target-scripts.git;protocol=https;branch=master"
+FILES:${PN} += "${datadir}/cc33xx/"
+do_install() {
+        install -d ${D}${datadir}/cc33xx/
+        scripts=`find ./* -type f -name "*.*"`
+        for s in $scripts
+        do
+                install -m 0755 $s ${D}${datadir}/cc33xx/
+        done
+}
diff --git a/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb b/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb
index 2e528376..707f7c77 100644
--- a/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb
+++ b/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shared Transport Line Discipline User Mode initialisation Manager Daemon"
+SUMMARY = "Shared Transport Line Discipline User Mode initialisation Manager Daemon"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://uim.c;beginline=1;endline=18;md5=9f0bbfbc10c67689e81a523e2976c31e"
@@ -10,8 +10,6 @@ inherit update-rc.d
 SRCREV = "a75f45be2d5c74fc1dd913d08afc30f09a230aa9"
 SRC_URI = "git://git.ti.com/git/ti-bt/uim.git;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 do_install() {
        install -d ${D}${bindir}
        install -m 0755 uim ${D}${bindir}
diff --git a/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
index 1e9c445d..fac0524e 100644
--- a/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
+++ b/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The calibrator utility for TI wireless solution based on wl18xx driver"
+SUMMARY = "The calibrator utility for TI wireless solution based on wl18xx driver"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
@@ -11,8 +11,6 @@ SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;pro
           file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \
          "
-S = "${WORKDIR}/git"
 export CROSS_COMPILE = "${TARGET_PREFIX}"
 EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \
diff --git a/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb b/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb
index 87890a31..e3ea98aa 100644
--- a/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb
+++ b/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Scripts and configuration files for TI wireless drivers"
+SUMMARY = "Scripts and configuration files for TI wireless drivers"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c0d175d1f4a705"
@@ -11,8 +11,6 @@ file://0001-print_stat.sh-replace-system-bin-sh-with-bin-sh.patch \
 PR = "r1"
-S = "${WORKDIR}/git"
 FILES:${PN} += "${datadir}/wl18xx/"
 do_install() {
diff --git a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb
index a2a8b775..8285bf9f 100644
--- a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb
+++ b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Configuration utility for TI wireless drivers"
+SUMMARY = "Configuration utility for TI wireless drivers"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85c90328e3a9438"
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85
 SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2"
 SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;protocol=https"
-S = "${WORKDIR}/git/wlconf"
+S:append = "/wlconf"
 EXTRA_OEMAKE = "CC="${CC}""
diff --git a/meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb b/meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb
index 8b16830f..20548443 100644
--- a/meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb
+++ b/meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI Unified Instrumentation Architecture in C (cUIA)"
+SUMMARY = "TI Unified Instrumentation Architecture in C (cUIA)"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://cuia_${CUIA_PV}_manifest.html;md5=0eea94e3bb94de4ddee77653eba1c7c5"
@@ -9,7 +9,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_ccstudio/UIA/SCMCSD
 SRC_URI[cuia.md5sum] = "ef53989ac70c191841cd656cdc8770be"
 SRC_URI[cuia.sha256sum] = "f16d138a9146fdc7d52cba77bd30596da65835f6ffe4092baf2b33d1c1a4fb0d"
-S = "${WORKDIR}/cuia_${CUIA_PV}${CUIA_PVExtra}"
+S = "${UNPACKDIR}/cuia_${CUIA_PV}${CUIA_PVExtra}"
 CLEANBROKEN = "1"
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
index d3ada9c6..b803ac5b 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "GNU debugger for TI C6X DSP."
+SUMMARY = "GNU debugger for TI C6X DSP."
 SECTION = "devel"
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=bf0fe2872eb3dfeebb2cbe38206fe81f"
@@ -14,12 +14,12 @@ SRC_URI:append = " \
    file://0001-libbfd.h-suppress-GCC9-Wstringop-truncation.patch;striplevel=2 \
 "
-S = "${WORKDIR}/git/gdbc6x"
+S:append = "/gdbc6x"
 inherit update-rc.d
 inherit gettext
-CFLAGS += "-fcommon"
+CFLAGS += "-fcommon -fpermissive -std=gnu11"
 do_configure () {
    cd ${S}
@@ -36,7 +36,7 @@ do_install () {
    cp -rf ${S}/install_gdb/include/* ${D}${includedir}
    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/gdbserverproxy
+    install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/gdbserverproxy
 }
 RDEPENDS:${PN} = "gdbserverproxy-module-drv bash"
@@ -47,3 +47,7 @@ INITSCRIPT_NAME = "gdbserverproxy"
 INITSCRIPT_PARAMS = "defaults 95"
 PARALLEL_MAKE = ""
+# Disable the "buildpaths" check while we figure out how we are
+# going to address this issue.
+INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
index 3460eadb..6c538817 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI gdb-server to be used with c6xgdb."
+SUMMARY = "TI gdb-server to be used with c6xgdb."
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://../debian/copyright;md5=82c616b6c8f9c11c46feaaf8f9a11495"
@@ -6,7 +6,7 @@ DEPENDS = "ti-xdais ti-framework-components ti-cgt6x-native ti-sysbios ti-xdctoo
 PR = "${INC_PR}.0"
-S = "${WORKDIR}/git/gdbserver-c6x/src"
+S:append = "/gdbserver-c6x/src"
 PLATFORM = ""
 PLATFORM:dra7xx = "DRA7xx_PLATFORM"
@@ -47,3 +47,13 @@ require recipes-ti/includes/ti-paths.inc
 ALLOW_EMPTY:${PN} = "1"
 PARALLEL_MAKE = ""
+# Disable the "buildpaths" check while we figure out how we are
+# going to address this issue.
+#
+# The ti-cgt6x compiler is a custom TI compiler for the TI C6000
+# Digital Signal Processor(DSP) platform.  It does not currently
+# support reproducible builds and is provided via a binary blob
+# download that we cannot patch in the recipe to address the
+# issue.
+INSANE_SKIP:${PN}-dev += "buildpaths"
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
index 8bea12f7..2ee97269 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
@@ -1,10 +1,7 @@
-DESCRIPTION = "Interface for GDB to commincate witha TI C66X DSP"
+SUMMARY = "Interface for GDB to commincate witha TI C66X DSP"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=75859989545e37968a99b631ef42722e"
-# This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR:append = "b"
-PR = "${MACHINE_KERNEL_PR}"
 PV:append = "+git"
 SRC_URI:append = "\
@@ -12,7 +9,7 @@ SRC_URI:append = "\
    file://0002-Support-Linux-kernels-v6.6.patch;patchdir=../.. \
 "
-S = "${WORKDIR}/git/kernel_module/gdbproxy-mod"
+S:append = "/kernel_module/gdbproxy-mod"
 inherit module
diff --git a/meta-ti-extras/recipes-devtools/python-yamllint/python3-yamllint_1.33.0.bb b/meta-ti-extras/recipes-devtools/python-yamllint/python3-yamllint_1.33.0.bb
deleted file mode 100644
index 4b7bd065..00000000
--- a/meta-ti-extras/recipes-devtools/python-yamllint/python3-yamllint_1.33.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "A linter for YAML files."
-HOMEPAGE = "https://github.com/adrienverge/yamllint"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
-inherit pypi setuptools3
-PYPI_PACKAGE = "yamllint"
-SRC_URI[sha256sum] = "2dceab9ef2d99518a2fcf4ffc964d44250ac4459be1ba3ca315118e4a1a81f7d"
-DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
-RDEPENDS:${PN} += "${PYTHON_PN}-pyyaml"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb b/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
index 54f6ff8a..2ae44086 100644
--- a/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
+++ b/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
@@ -6,10 +6,10 @@ inherit autotools pkgconfig
 DEPENDS = "libdrm ti-ipc"
-SRC_URI = "git://git.omapzoom.org/repo/libdce.git;protocol=git;branch=master"
+SRC_URI = "git://git.ti.com/git/omapzoom/libdce.git;protocol=https;branch=master"
-SRCREV = "ec14e1d5cea1ed3c3ea0e2b9cf1fd581acff93e3"
+SRCREV = "182aea18596eb2b3a82cffc536a6404f5000fb30"
-S = "${WORKDIR}/git"
 EXTRA_OECONF += "IPC_HEADERS=${STAGING_INCDIR}/ti/ipc/mm"
 COMPATIBLE_HOST ?= "null"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb
index ceefe0d6..22fa67fd 100644
--- a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb
+++ b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Userspace setup for beaglebone capes"
+SUMMARY = "Userspace setup for beaglebone capes"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
@@ -14,13 +14,13 @@ SRC_URI = "file://cape.service \
 do_install() {
        install -d ${D}${base_libdir}/systemd/system/
-        install -m 0644 ${WORKDIR}/cape.service ${D}${base_libdir}/systemd/system
+        install -m 0644 ${UNPACKDIR}/cape.service ${D}${base_libdir}/systemd/system
        install -d ${D}${base_libdir}/systemd/system/basic.target.wants
        ln -sf ../cape.service ${D}${base_libdir}/systemd/system/basic.target.wants/
        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/cape*.sh ${D}${bindir}
+        install -m 0755 ${UNPACKDIR}/cape*.sh ${D}${bindir}
 }
 FILES:${PN} += "${base_libdir}/systemd/system"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb
index 85ab861d..8ad75f26 100644
--- a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb
+++ b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6f02761e31334c48f7021fb94c89aaa"
 SRCREV = "05bedba192646152b7bc80b0accaea75aef864e5"
 SRC_URI = "git://github.com/jadonk/beaglebone-getting-started.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 do_install() {
        install -d ${D}${datadir}/${PN}
        cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${PN}
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb b/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb
deleted file mode 100644
index 3ab00ec3..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-DESCRIPTION = "Units to initialize usb gadgets"
-PR = "r19"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-COMPATIBLE_MACHINE = "(ti33x)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-SRC_URI = "file://storage-gadget-init.service \
-           file://network-gadget-init.service \
-           file://udhcpd.service \
-           file://udhcpd.conf \
-           file://bone-gmass-eject.rules \
-           file://udhcpd.rules \
-           file://g-storage-reinsert.sh \
-           file://g-ether-start-service.sh \
-           file://g-ether-load.sh \
-           file://update-image-info-on-mmcblk0p1.sh \
-          "
-do_install() {
-        install -d ${D}${base_libdir}/systemd/system/basic.target.wants
-        install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system
-        for i in ${WORKDIR}/storage-gadget-init.service ; do
-                install -m 0644 $i ${D}${base_libdir}/systemd/system
-                ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/
-        done
-        install -d ${D}${sysconfdir}/udev/rules.d
-        install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d
-        install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/*.sh ${D}${bindir}
-}
-PACKAGES =+ "${PN}-storage ${PN}-network ${PN}-udhcpd"
-ALLOW_EMPTY:${PN} = "1"
-FILES:${PN}-storage = "${base_libdir}/systemd/system/storage-gadget-init.service \
-                       ${base_libdir}/systemd/system/basic.target.wants/storage-gadget-init.service \
-                       ${bindir}/g-storage-reinsert.sh \
-                       ${bindir}/update-image-info-on-mmcblk0p1.sh \
-                       ${sysconfdir}/udev/rules.d/bone-gmass-eject.rules"
-FILES:${PN}-network = "${base_libdir}/systemd/system/network-gadget-init.service \
-                       ${base_libdir}/systemd/system/basic.target.wants/network-gadget-init.service \
-                       ${bindir}/g-ether-load.sh \
-                       ${bindir}/g-ether-start-service.sh \
-                       ${sysconfdir}/udev/rules.d/udhcpd.rules"
-FILES:${PN}-udhcpd = "${base_libdir}/systemd/system/udhcpd.service \
-                      ${base_libdir}/systemd/system/basic.target.wants/udhcpd.service \
-                      ${sysconfdir}/udhcpd.conf"
-RRECOMMENDS:${PN} = "${PN}-storage ${PN}-network ${PN}-udhcpd"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/bone-gmass-eject.rules b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/bone-gmass-eject.rules
deleted file mode 100644
index ee6f93e2..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/bone-gmass-eject.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="block",ACTION=="change",KERNEL=="mmcblk0p1",RUN+="/usr/bin/g-ether-start-service.sh"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-load.sh b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-load.sh
deleted file mode 100755
index f9400649..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-load.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-function get_devmem()
-{
-        /usr/bin/devmem2 $1 | grep ": " | cut -d ":" -f 2|cut -d "x" -f 2
-}
-function hex_to_mac_addr()
-{
-        addr=$1
-        n=0
-        mac_addr=$(echo ${addr} | while read -r -n2 c; do 
-                if [ ! -z "$c" ]; then
-                        if [ $n -ne 0 ] ; then
-                                echo -n ":${c}"
-                        else
-                                echo -n "${c}"
-                        fi
-                fi
-                n=$(($n+1))
-        done)
-        echo ${mac_addr}
-}
-function reverse_bytes()
-{
-        addr=$1
-        New_addr=$(echo ${addr} | while read -r -n2 c; do 
-                if [ ! -z "$c" ]; then
-                        New_addr=${c}${New_addr}
-                else echo
-                        echo ${New_addr}
-                fi
-        done)
-        echo ${New_addr}
-}
-DEVMEM_ADDR_LO=$(get_devmem 0x44e10638|bc)
-DEVMEM_ADDR_LO=$(reverse_bytes ${DEVMEM_ADDR_LO})
-DEVMEM_ADDR_HI=$(get_devmem 0x44e1063C)
-DEVMEM_ADDR_HI=$(reverse_bytes ${DEVMEM_ADDR_HI})
-DEV_ADDR=$(hex_to_mac_addr "${DEVMEM_ADDR_HI}${DEVMEM_ADDR_LO}")
-modprobe g_ether host_addr=${DEV_ADDR}
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh
deleted file mode 100755
index 6e73b155..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ -a /sys/devices/platform/omap/musb-ti81xx/musb-hdrc.0/gadget/lun0/file ]
-then
-        x=$(cat /sys/devices/platform/omap/musb-ti81xx/musb-hdrc.0/gadget/lun0/file)
-        if [ -z "$x" ]
-        then
-                /bin/systemctl stop storage-gadget-init.service
-                /bin/systemctl start network-gadget-init.service
-        fi
-fi
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-storage-reinsert.sh b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-storage-reinsert.sh
deleted file mode 100755
index d358640a..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-storage-reinsert.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-/bin/systemctl stop storage-gadget-init.service
-/bin/systemctl stop network-gadget-init.service
-/bin/systemctl start storage-gadget-init.service
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/network-gadget-init.service b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/network-gadget-init.service
deleted file mode 100644
index 0ee29147..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/network-gadget-init.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Start USB Ethernet gadget
-Conflicts=storage-gadget-init.service
-[Service]
-RemainAfterExit=yes
-ExecStart=/usr/bin/g-ether-load.sh
-ExecStop=/sbin/rmmod g_ether
-[Install]
-WantedBy=gether.target
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/storage-gadget-init.service b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/storage-gadget-init.service
deleted file mode 100644
index 9a8513e8..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/storage-gadget-init.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Start usb mass storage gadget
-After=dev-mmcblk0p1.device
-[Service]
-RemainAfterExit=yes
-ExecStart=/sbin/modprobe g_mass_storage file=/dev/mmcblk0p1 cdrom=0 stall=0 removable=1 nofua=1
-ExecStop=/sbin/rmmod g_mass_storage
-[Install]
-WantedBy=basic.target
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.conf b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.conf
deleted file mode 100644
index 3bcf00f0..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-start      192.168.7.1
-end        192.168.7.1
-interface  usb0
-max_leases 1
-option subnet 255.255.255.252
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.rules b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.rules
deleted file mode 100644
index db65f9ac..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBSYSTEM=="net",ACTION=="add",KERNEL=="usb0",RUN+="/sbin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252",RUN+="/bin/systemctl start udhcpd.service"
-SUBSYSTEM=="net",ACTION=="remove",KERNEL=="usb0",RUN+="/bin/systemctl stop udhcpd.service"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.service b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.service
deleted file mode 100644
index 1f4ac688..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=DHCP server for USB0 network gadget
-After=dev-usb0.device
-Conflicts=storage-gadget-init.service
-[Service]
-ExecStart=/usr/sbin/udhcpd -f -S /etc/udhcpd.conf
-ExecStop=/bin/kill -TERM $MAINPID
-KillSignal=SIGINT
-[Install]
-WantedBy=gether.target
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/update-image-info-on-mmcblk0p1.sh b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/update-image-info-on-mmcblk0p1.sh
deleted file mode 100755
index a4daf734..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/update-image-info-on-mmcblk0p1.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-mount /dev/mmcblk0p1 /mnt
-echo "Image info snapshot" > /mnt/info.txt
-echo >> /mnt/info.txt
-echo "/etc/angstrom-version:" >> /mnt/info.txt
-cat /etc/angstrom-version >> /mnt/info.txt
-echo >> /mnt/info.txt
-echo "/proc/cpuinfo:" >> /mnt/info.txt
-cat /proc/cpuinfo >> /mnt/info.txt
-echo >> /mnt/info.txt
-echo "uname -a:" >> /mnt/info.txt
-uname -a >> /mnt/info.txt
-echo >> /mnt/info.txt
-echo "/proc/cmdline:" >> /mnt/info.txt
-cat /proc/cmdline >> /mnt/info.txt
-echo >> /mnt/info.txt
-echo "ifconfig:" >> /mnt/info.txt
-ifconfig >> /mnt/info.txt
-echo >> /mnt/info.txt
-echo "/etc/angstrom-build-info:" >> /mnt/info.txt
-cat /etc/angstrom-build-info >> /mnt/info.txt
-echo >> /mnt/info.txt
-echo "/etc/image-version-info:" >> /mnt/info.txt
-cat /etc/image-version-info >> /mnt/info.txt
-echo >> /mnt/info.txt
-echo "opkg list-installed:" >> /mnt/info.txt
-opkg list-installed >> /mnt/info.txt
-umount /mnt
diff --git a/meta-ti-extras/recipes-ti/bios/ti-sysbios.inc b/meta-ti-extras/recipes-ti/bios/ti-sysbios.inc
index f31decec..edcea538 100644
--- a/meta-ti-extras/recipes-ti/bios/ti-sysbios.inc
+++ b/meta-ti-extras/recipes-ti/bios/ti-sysbios.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI SYS/BIOS v6 Kernel"
+SUMMARY = "TI SYS/BIOS v6 Kernel"
 HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
@@ -7,16 +7,18 @@ require ../includes/ti-paths.inc
 require ../includes/ti-staging.inc
 require ../includes/ti-eula-unpack.inc
-S = "${WORKDIR}/bios_${PV}"
+S = "${UNPACKDIR}/bios_${PV}"
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=sysbiosbin"
-BINFILE="bios_${PV}.bin"
+BINFILE = "bios_${PV}.bin"
-TI_BIN_UNPK_CMDS="Y: q:workdir:Y"
+TI_BIN_UNPK_CMDS = "Y: q:workdir:Y"
 do_install() {
    CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
    install -d ${D}${SYSBIOS_INSTALL_DIR_RECIPE}
    cp ${CP_ARGS} ${S}/* ${D}${SYSBIOS_INSTALL_DIR_RECIPE}
+    rm ${D}${SYSBIOS_INSTALL_DIR_RECIPE}/bios_${PV}*.log
 }
 ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb b/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb
index d242510f..4b0723df 100644
--- a/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb
+++ b/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb
@@ -10,7 +10,7 @@ SRC_URI[sysbiosbin.md5sum] = "647243209d66d5dd35503b0ec5a84ab9"
 SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a"
 TI_BIN_UNPK_CMDS = ""
-TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}"
+TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${UNPACKDIR}"
 BINFILE = "bios_${PV}.run"
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/${BINFILE};name=sysbiosbin"
diff --git a/meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb b/meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb
index 2e25ea76..b248683b 100644
--- a/meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb
+++ b/meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Codec Engine for TI ARM/DSP processors"
+SUMMARY = "Codec Engine for TI ARM/DSP processors"
 HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://codec_engine_${PV}_Manifest.html;md5=de7d9c2594a6f386
 SRC_URI[cetarball.md5sum] = "d66a8ccbd6cdfe9f735af9f4a07e2b9b"
 SRC_URI[cetarball.sha256sum] = "ed7b7399903bbf76af06ee6457836f344ad75b903618339bae82b3967f27ffa1"
-S = "${WORKDIR}/codec_engine_${PV}"
+S = "${UNPACKDIR}/codec_engine_${PV}"
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV},lite.tar.gz;name=cetarball "
diff --git a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb
index 400221f9..4043da55 100644
--- a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb
+++ b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb
@@ -13,9 +13,9 @@ SRCREV = "de7954abab0f0caa8a2c7b53095c30226d901a31"
 DEPENDS = "ti-cgt6x-native"
 PR = "r0"
-S = "${WORKDIR}/git/aet"
+S:append = "/aet"
-DEVICE=""
+DEVICE = ""
 DEVICE:dra7xx = "DRA7xx"
 EXTRA_OEMAKE = "C6X_C_DIR=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x/include"
diff --git a/meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb b/meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb
index 64bac240..df34a39e 100644
--- a/meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb
+++ b/meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Baremetal GCC for ARM"
+SUMMARY = "Baremetal GCC for ARM"
 LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=f77466c63f5787f4bd669c402aabe061"
@@ -10,7 +10,7 @@ SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc
 SRC_URI[gcc-arm-none.md5sum] = "299ebd3f1c2c90930d28ab82e5d8d6c0"
 SRC_URI[gcc-arm-none.sha256sum] = "bb17109f0ee697254a5d4ae6e5e01440e3ea8f0277f2e8169bf95d07c7d5fe69"
-S = "${WORKDIR}/gcc-arm-none-eabi-7-2018-q2-update"
+S = "${UNPACKDIR}/gcc-arm-none-eabi-7-2018-q2-update"
 # only x86_64 is supported
 COMPATIBLE_HOST = "x86_64.*-linux"
@@ -23,7 +23,7 @@ do_install() {
 FILES:${PN} = "${GCC_ARM_NONE_TOOLCHAIN_RECIPE}/*"
-INSANE_SKIP:${PN} = "already-stripped libdir staticdev build-deps file-rdeps"
+INSANE_SKIP:${PN} = "already-stripped libdir staticdev build-deps file-rdeps arch"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb b/meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb
index c7608a76..4341acb0 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI CG_XML"
+SUMMARY = "TI CG_XML"
 HOMEPAGE = "http://software-dl.ti.com/ccs/non-esd/releases/other/applications_packages/cg_xml/index.htm"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
@@ -9,7 +9,7 @@ require recipes-ti/includes/ti-unpack.inc
 PV = "2.61.00"
 PE = "1"
-S = "${WORKDIR}/cg_xml_${PV}"
+S = "${UNPACKDIR}/cg_xml_${PV}"
 SRC_URI = "\
    http://software-dl.ti.com/ccs/non-esd/releases/other/applications_packages/cg_xml/cg_xml_v${@'${PV}'.replace('.','_')}/cgxml-${PV}-linux-installer.run;name=cgxmlbin_linux \
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://cg_xml_${PV}_Manifest.pdf;md5=fc02a39748ba50373f32b2f
 SRC_URI[cgxmlbin_linux.md5sum] = "6ce60caa97bbf15158d806fb062fadff"
 SRC_URI[cgxmlbin_linux.sha256sum] = "da77cb10bd3d5de89e27e4ce8f4408a2e50775c8980225f9a828ddc242bb81f9"
-BINFILE="cgxml-${PV}-linux-installer.run"
+BINFILE = "cgxml-${PV}-linux-installer.run"
-TI_BIN_UNPK_CMDS=""
+TI_BIN_UNPK_CMDS = ""
-TI_BIN_UNPK_ARGS="--prefix ${S} --mode unattended"
+TI_BIN_UNPK_ARGS = "--prefix ${S} --mode unattended"
 do_install() {
    CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb
index b7b6d9b1..031d889f 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb
@@ -8,7 +8,7 @@ require recipes-ti/includes/ti-unpack.inc
 require recipes-ti/includes/ti-staging.inc
 require recipes-ti/includes/ti-paths.inc
-S = "${WORKDIR}/ti-cgt-arm-${PV}"
+S = "${UNPACKDIR}/ti-cgt-arm-${PV}"
 PE = "1"
 PR = "r0"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb
index c96113fe..7ef20b7a 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "TI PRU Code Generation Tools"
+SUMMARY = "TI PRU Code Generation Tools"
 HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm"
 LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Hewlett-Packard & AFL-3.0 & MIT & BSD-2-Clause & PD"
-LIC_FILES_CHKSUM = "file://ti-cgt-pru_${PV}/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ti-cgt-pru_${PV}/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc"
 LIC_FILES_CHKSUM:class-target = "file://usr/share/doc/ti/cgt-pru/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc"
 require recipes-ti/includes/ti-paths.inc
@@ -10,7 +10,7 @@ require recipes-ti/includes/ti-unpack.inc
 BINFILE = "ti_cgt_pru_${PV}_linux_installer_x86.bin"
 BINFILE_NAME = "cgt-pru-x86"
-TI_BIN_UNPK_ARGS = "--prefix ${S}"
+TI_BIN_UNPK_ARGS = "--prefix ${UNPACKDIR}"
 TI_BIN_UNPK_CMDS = ""
 BINFILE:class-target = "ti_cgt_pru_${PV}_armlinuxa8hf_busybox_installer.sh"
@@ -24,14 +24,17 @@ SRC_URI[cgt-pru-x86.sha256sum] = "1f1405167214f2c0ef848591b17a7799fdcd9f55f11bc9
 SRC_URI[cgt-pru-arm.md5sum] = "648a6d7d8162fd6a89f381c7b974e6b0"
 SRC_URI[cgt-pru-arm.sha256sum] = "8390cb77b46b728ce2940595b81406f76d86dfed58c21258e3206a7c1232ccf2"
+S = "${UNPACKDIR}"
 do_install() {
    install -d ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}
    cp -r ${S}/ti-cgt-pru_${PV}/. \
          ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}/
+    rm ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}/*installer_install.log
 }
 do_install:class-target() {
-    ${WORKDIR}/${BINFILE} --prefix ${D}
+    ${S}/${BINFILE} --prefix ${D}
 }
 FILES:${PN} += "${datadir}/ti/*"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc b/meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc
index f0992aa7..f32bc0d3 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI ARM Code Generation Tools"
+SUMMARY = "TI ARM Code Generation Tools"
 HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/CodeGenerationTools.htm"
 SECTION = "devel"
 LICENSE = "TI"
@@ -9,13 +9,13 @@ require ../includes/ti-paths.inc
 require ../includes/ti-staging.inc
 require ../includes/ti-eula-unpack.inc
-S = "${WORKDIR}/cgt470_${PV}"
+S = "${UNPACKDIR}/cgt470_${PV}"
 SRC_URI = "http://install.source.dir.local/ti_cgt_tms470_${PVwithdots}_setup_linux_x86.bin;name=cgt470bin"
-BINFILE="ti_cgt_tms470_${PVwithdots}_setup_linux_x86.bin"
+BINFILE = "ti_cgt_tms470_${PVwithdots}_setup_linux_x86.bin"
-TI_BIN_UNPK_CMDS="Y:qY:workdir: : "
+TI_BIN_UNPK_CMDS = "Y:qY:workdir: : "
-TI_BIN_UNPK_WDEXT="/cgt470_${PV}"
+TI_BIN_UNPK_WDEXT = "/cgt470_${PV}"
 do_install() {
    install -d ${D}${CODEGEN_ARM_INSTALL_DIR_RECIPE}
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb
index a7de8e38..adf21563 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb
@@ -11,15 +11,15 @@ LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b6311962635a4f15630e36ec2d875eca"
-S = "${WORKDIR}/c6000_7.4.16"
+S = "${UNPACKDIR}/c6000_7.4.16"
 require recipes-ti/includes/ti-paths.inc
 require recipes-ti/includes/ti-unpack.inc
 BINFILE = "ti_cgt_c6000_7.4.16_linux_installer_x86.bin"
 BINFILE_NAME = "cgt6x_7.4.16_x86_installer"
-TI_BIN_UNPK_ARGS = "--prefix ${WORKDIR} --mode unattended"
+TI_BIN_UNPK_ARGS = "--prefix ${UNPACKDIR} --mode unattended"
-TI_BIN_UNPK_CMDS=""
+TI_BIN_UNPK_CMDS = ""
 SRC_URI = "http://install.source.dir.local/${BINFILE};name=${BINFILE_NAME}"
@@ -32,7 +32,7 @@ COMPATIBLE_HOST:class-target = "null"
 do_install() {
    install -d ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE}
-    cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c6000_7.4.16/. ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE}
+    cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${UNPACKDIR}/c6000_7.4.16/. ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE}
 }
 FILES:${PN} += "${TI_CGT6X_7_INSTALL_DIR_RECIPE}"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb
index fd34657a..25e0f596 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI DSP Code Generation Tools"
+SUMMARY = "TI DSP Code Generation Tools"
 HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm"
 LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD"
@@ -92,7 +92,7 @@ do_install() {
 }
 do_install:class-target() {
-    ${WORKDIR}/${BINFILE} --prefix ${D}
+    ${UNPACKDIR}/${BINFILE} --prefix ${D}
 }
 FILES:${PN} += "${datadir}/ti/*"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb
index b45b52a3..04b16032 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb
@@ -30,11 +30,11 @@ TI_BIN_UNPK_CMDS = ""
 SRC_URI[cgt7x_x86_installer.md5sum]    = "813840908f333dd2a31f92edec71c1fb"
 SRC_URI[cgt7x_x86_installer.sha256sum] = "21379811a8857489f72ca8ec45a46eb086ced0bdbb58e78f73a86e63984ab2f5"
-S = "${WORKDIR}/c7000_${PV}"
+S = "${UNPACKDIR}/c7000_${PV}"
 do_install() {
    install -d ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE}
-    cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE}
+    cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${UNPACKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE}
 }
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb b/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb
index b1361804..969518e2 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb
@@ -1,3 +1,4 @@
+SUMMARY = "TI XDCtools (RTSC - Real Time Software Components"
 DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)"
 HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc"
 SECTION = "devel"
@@ -69,7 +70,7 @@ COMPATIBLE_HOST:ti-soc = "(.*)"
 COMPATIBLE_HOST:class-native = "(.*)"
 COMPATIBLE_HOST:class-nativesdk = "(.*)"
-S = "${WORKDIR}/xdctools_${PV}_core"
+S = "${UNPACKDIR}/xdctools_${PV}_core"
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip"
diff --git a/meta-ti-extras/recipes-ti/dsplib/dsplib.inc b/meta-ti-extras/recipes-ti/dsplib/dsplib.inc
index 6ebc3b34..566dab0a 100644
--- a/meta-ti-extras/recipes-ti/dsplib/dsplib.inc
+++ b/meta-ti-extras/recipes-ti/dsplib/dsplib.inc
@@ -11,11 +11,8 @@ DEPENDS = "ti-cgt6x-native \
           ti-xdctools-native \
           ti-sysbios \
           doxygen-native \
-           zip-native \
           swtools"
-S = "${WORKDIR}/git"
 DSPLIB_GIT_BRANCH = "master"
 DSPLIB_GIT_PROTOCOL = "https"
 DSPLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/dsplib.git"
@@ -26,19 +23,19 @@ SRCREV = "${DSPLIB_SRCREV}"
 LIC_FILES_CHKSUM = "file://ti/dsplib/src/common/c66/lnk.cmd;beginline=1;endline=37;md5=0f0c9c4d51d8af75419781591ace190b"
-export DSPLIB_WORK_DIR="${S}"
+export DSPLIB_WORK_DIR = "${S}"
-export CGTOOLS_INSTALL_DIR  = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
+export CGTOOLS_INSTALL_DIR = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export C64PCODEGENTOOL="${CGTOOLS_INSTALL_DIR}"
+export C64PCODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
-export C674CODEGENTOOL="${CGTOOLS_INSTALL_DIR}"
+export C674CODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
-export C66CODEGENTOOL ="${CGTOOLS_INSTALL_DIR}"
+export C66CODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
 export SWTOOLS_PATH = "${SWTOOLS_INSTALL_DIR}/ti/mas/swtools"
-export XDCBUILDCFG="${SWTOOLS_PATH}/config.bld"
+export XDCBUILDCFG = "${SWTOOLS_PATH}/config.bld"
-export INCDIR="${MATHLIB_INSTALL_DIR}/"
+export INCDIR = "${MATHLIB_INSTALL_DIR}/"
 PATH:append = ":${XDC_INSTALL_DIR}"
-XDCPATH.="${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;"
+XDCPATH .= "${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;"
-XDCPATH.="${SWTOOLS_INSTALL_DIR};${MATHLIB_INSTALL_DIR};${DSPLIB_WORK_DIR};"
+XDCPATH .= "${SWTOOLS_INSTALL_DIR};${MATHLIB_INSTALL_DIR};${DSPLIB_WORK_DIR};"
 export XDCPATH
@@ -57,19 +54,6 @@ do_install() {
        rm -r ${D}${DSPLIB_INSTALL_DIR_RECIPE}/dsplib
 }
-inherit deploy
-addtask deploy before do_build after do_install
-do_deploy() {
-        install -d ${DEPLOYDIR}
-        # zip up files in ${D}${DSPLIB_INSTALL_DIR_RECIPE}
-        # and place the zip file in ${DEPLOYDIR}
-        mkdir ./${DSPLIB_PACKAGE_NAME}
-        cp -r ${D}${DSPLIB_INSTALL_DIR_RECIPE}/. ./${DSPLIB_PACKAGE_NAME}
-        zip -9 -y -r -q ${DEPLOYDIR}/${DSPLIB_PACKAGE_NAME}.zip ./${DSPLIB_PACKAGE_NAME}
-        rm -r ./${DSPLIB_PACKAGE_NAME}
-}
 ALLOW_EMPTY:${PN} = "1"
 FILES:${PN}-dev += "${DSPLIB_INSTALL_DIR_RECIPE}"
diff --git a/meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc b/meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc
index 81407ed7..6a1768a3 100644
--- a/meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc
+++ b/meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc
@@ -1,11 +1,11 @@
-DESCRIPTION = "TI Framework Components"
+SUMMARY = "TI Framework Components"
 HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
 require recipes-ti/includes/ti-paths.inc
-S = "${WORKDIR}/framework_components_${PV}"
+S = "${UNPACKDIR}/framework_components_${PV}"
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV},lite.tar.gz;name=fctarball"
diff --git a/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc b/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
index ab5cbdb6..8fa2ceca 100644
--- a/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
+++ b/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
@@ -1,3 +1,4 @@
+SUMMARY = "IMGLIB for TI DSPs"
 DESCRIPTION = "IMGLIB contains optimized general-purpose image/video processing routines for TI DSPs"
 HOMEPAGE = "http://www.ti.com/tool/sprc264"
 SECTION = "devel"
@@ -11,7 +12,7 @@ COMPATIBLE_MACHINE = "omap-a15"
 SRC_URI = "http://software-dl.ti.com/sdoemb/sdoemb_public_sw/imglib/${PV}/exports/${BINFILE};name=imglib"
-S = "${WORKDIR}/imglib-c66x-${PV}"
+S = "${UNPACKDIR}/imglib-c66x-${PV}"
 BINFILE = "imglib_c66x_${PV}_Linux.bin"
 TI_BIN_UNPK_ARGS = "--mode silent --prefix ${S}"
diff --git a/meta-ti-extras/recipes-ti/includes/ti-paths.inc b/meta-ti-extras/recipes-ti/includes/ti-paths.inc
index e8b0f17b..9f8b5897 100644
--- a/meta-ti-extras/recipes-ti/includes/ti-paths.inc
+++ b/meta-ti-extras/recipes-ti/includes/ti-paths.inc
@@ -20,7 +20,6 @@ export MATHLIB_C66_INSTALL_DIR_RECIPE  = "${installdir}/ti-mathlib-c66x-tree"
 export MATHLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c674x-tree"
 export MPM_INSTALL_DIR_RECIPE          = "${installdir}/ti-mpm-tree"
 export OMP_INSTALL_DIR_RECIPE          = "${installdir}/ti-omp-tree"
-export OSAL_INSTALL_DIR_RECIPE         = "${installdir}/ti-osal-tree"
 export PDK_INSTALL_DIR_RECIPE          = "${installdir}/ti-pdk-tree"
 export SYSBIOS_INSTALL_DIR_RECIPE      = "${installdir}/ti-sysbios-tree"
 export SWTOOLS_INSTALL_DIR_RECIPE      = "${installdir}/ti-swtools-tree"
@@ -48,7 +47,6 @@ export MATHLIB_C66_INSTALL_DIR  = "${STAGING_DIR_TARGET}${MATHLIB_C66_INSTALL_DI
 export MATHLIB_C674_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C674_INSTALL_DIR_RECIPE}"
 export MPM_INSTALL_DIR          = "${STAGING_DIR_TARGET}${MPM_INSTALL_DIR_RECIPE}"
 export OMP_INSTALL_DIR          = "${STAGING_DIR_TARGET}${OMP_INSTALL_DIR_RECIPE}"
-export OSAL_INSTALL_DIR         = "${STAGING_DIR_TARGET}${OSAL_INSTALL_DIR_RECIPE}"
 export PDK_INSTALL_DIR          = "${STAGING_DIR_TARGET}${PDK_INSTALL_DIR_RECIPE}"
 export SWTOOLS_INSTALL_DIR      = "${STAGING_DIR_TARGET}${SWTOOLS_INSTALL_DIR_RECIPE}"
 export SYSBIOS_INSTALL_DIR      = "${STAGING_DIR_TARGET}${SYSBIOS_INSTALL_DIR_RECIPE}"
diff --git a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
index 13068843..4cefefbf 100644
--- a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
+++ b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
@@ -5,7 +5,7 @@
 #  TI_BIN_UNPK_ARGS   - contains the arguments to be passed to the bin file.
 #  TI_BIN_UNPK_CMDS   - contains list of commands separated with colon to be 
 #                       passed while unpacking the bin file. The keyword 
-#                       workdir expands to WORKDIR and commands are appendded
+#                       workdir expands to UNPACKDIR and commands are appendded
 #                       with '\n'. Eg. TI_BIN_UNPK_CMDS="Y:Y: qY:workdir"
 #  TI_BIN_UNPK_WDEXT  - This variable extends workdir path, if user wants to put
 #                       the output in some internal directory
@@ -30,7 +30,7 @@ python ti_bin_do_unpack() {
    # Change to the working directory
    save_cwd = os.getcwd()
-    workdir  = localdata.getVar('WORKDIR')
+    workdir  = localdata.getVar('UNPACKDIR')
    workdir  = bb.data.expand(workdir, localdata)
    os.chdir(workdir)
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux/0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux/0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch
deleted file mode 100644
index ea514695..00000000
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux/0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cca4fd812959a0cd241dd3bbebfd461ece94c9b8 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denis@denix.org>
-Date: Mon, 29 Mar 2021 19:42:00 -0400
-Subject: [PATCH] examples/ClusterMgr: sys_errlist[] has been deprecated in
- glibc
-Use strerror() instead.
-Upstream-Status: Pending
-Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
- src/examples/templates/ex46_graph/manager/ClusterMgr.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/src/examples/templates/ex46_graph/manager/ClusterMgr.c b/src/examples/templates/ex46_graph/manager/ClusterMgr.c
-index 19216c9..a1fa679 100644
--- a/src/examples/templates/ex46_graph/manager/ClusterMgr.c
-+++ b/src/examples/templates/ex46_graph/manager/ClusterMgr.c
-@@ -714,7 +714,7 @@ static pid_t ClusterMgr_system(char *cmd, bool wait)
-     pid = fork();
- 
-     if (pid == -1) {
-        LOG "CM_system: fork error: %s\n", sys_errlist[errno] LOGF
-+        LOG "CM_system: fork error: %s\n", strerror(errno) LOGF
-         status = -1;
-         goto leave;
-     }
-@@ -739,7 +739,7 @@ static pid_t ClusterMgr_system(char *cmd, bool wait)
-     else {
-         /* overlay a new executable */
-         execvp(argv[0], argv);
-        LOG "CM_system: execvp error: %s\n", sys_errlist[errno] LOGF
-+        LOG "CM_system: execvp error: %s\n", strerror(errno) LOGF
-         status = -1;
-     }
- 
-- 
-2.7.4
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb
deleted file mode 100644
index 81706592..00000000
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "TI Inter Process Communication (IPC) examples with Host running bios"
-require ti-ipc-examples.inc
-SRC_URI += "file://0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch;patchdir=../git/ipc-examples"
-DEPENDS = "ti-ipc ti-xdctools-native ti-sysbios ti-ipc-rtos zip-native"
-do_compile:append() {
-  if [  "${PLATFORM}" != "UNKNOWN" ]; then
-    oe_runmake extract HOSTOS="linux" IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
-    if [ ! -z ${ALT_PLATFORM} ]; then
-      oe_runmake extract PLATFORM="${ALT_PLATFORM}" HOSTOS="linux" \
-         IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
-    fi
-    oe_runmake -C examples all HOSTOS="linux" \
-      LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
-      IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
-    if [ ! -z ${ALT_PLATFORM} ]; then
-      oe_runmake -C examples all HOSTOS="linux" \
-        LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
-        IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-        PLATFORM="${ALT_PLATFORM}"
-    fi
-  fi
-}
-do_install:append() {
-  cd ${S_ipc-examples}/src
-  if [  "${PLATFORM}" != "UNKNOWN" ]; then
-    # Install directory for linux examples
-    install -d ${D}${bindir}/ipc/examples
-    oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-      LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
-      HOSTOS="linux" EXEC_DIR="${D}/${bindir}/ipc/examples"
-    if [ ! -z ${ALT_PLATFORM} ]; then
-      oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-        LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
-        HOSTOS="linux" EXEC_DIR="${D}/${bindir}/ipc/examples" \
-        PLATFORM="${ALT_PLATFORM}"
-    fi
-  fi
-}
-FILES:${PN} += "${bindir}/*"
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples.inc b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples.inc
deleted file mode 100644
index 09352505..00000000
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:IPC"
-require recipes-ti/ipc/ti-ipc-common.inc
-require ti-ipc-rtos.inc
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${S_ipc-examples}/src/makefile;beginline=1;endline=30;md5=a52324bd5033bb49ea07bade1244ac9a"
-INSANE_SKIP:${PN} += "arch"
-ALLOW_EMPTY:${PN} = "1"
-IPC_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
-do_compile() {
-  cd ${S_ipc-examples}/src
-  oe_runmake .examples \
-    IPCTOOLS="${S_ipc-metadata}/src/etc"
-  for alt_platform in ${ALT_PLATFORM}; do
-    oe_runmake .examples "PLATFORM=${alt_platform}" \
-      IPCTOOLS="${S_ipc-metadata}/src/etc"
-  done
-}
-do_install() {
-  cd ${S_ipc-examples}/src
-  IPC_VERSION=`echo ${PV}${RELEASE_SUFFIX} | sed -e 's|\.|_|g'`
-}
-INHIBIT_PACKAGE_STRIP = "1"
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples_git.bb b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples_git.bb
deleted file mode 100644
index bcc8674e..00000000
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples_git.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "TI Inter Process Communication (IPC) examples with Host running linux"
-require ti-ipc-examples.inc
-DEPENDS = "ti-ipc ti-xdctools-native ti-sysbios ti-ipc-rtos zip-native"
-do_compile:append() {
-  if [  "${PLATFORM}" != "UNKNOWN" ]; then
-    oe_runmake extract HOSTOS="bios" IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
-    for alt_platform in ${ALT_PLATFORM}; do
-      oe_runmake extract PLATFORM="${alt_platform}" HOSTOS="bios" \
-         IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
-    done
-    oe_runmake -C examples all HOSTOS="bios" \
-      IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
-    for alt_platform in ${ALT_PLATFORM}; do
-      oe_runmake -C examples all HOSTOS="bios" \
-        IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" PLATFORM="${alt_platform}"
-    done
-  fi
-}
-do_install:append() {
-  if [  "${PLATFORM}" != "UNKNOWN" ]; then
-    # Install directory for bios examples
-    install -d ${D}/ipc_${IPC_VERSION}/examples/bios
-    oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-      HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/bios"
-    oe_runmake -C examples install_rov IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-      HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/bios"
-    for alt_platform in ${ALT_PLATFORM}; do
-      oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-        HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/${alt_platform}/bios" \
-        PLATFORM="${alt_platform}"
-      oe_runmake -C examples install_rov IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
-        HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/${alt_platform}/bios" \
-        PLATFORM="${alt_platform}"
-    done
-  fi
-}
-FILES:${PN} += "ipc_*"
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
index 14ac7c77..2f93db72 100644
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
+++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
@@ -1,7 +1,7 @@
 require recipes-ti/includes/ti-paths.inc
 TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/git/ipc/ipc-examples.git"
-TI_IPC_EXAMPLES_DEST_SUFFIX = "git/ipc-examples"
+TI_IPC_EXAMPLES_DEST_SUFFIX = "${BB_GIT_DEFAULT_DESTSUFFIX}/ipc-examples"
 TI_IPC_EXAMPLES_GIT_PROTOCOL = "https"
 TI_IPC_EXAMPLES_GIT_BRANCH = "master"
 TI_IPC_EXAMPLES_NAME = "ipc-examples"
@@ -13,7 +13,7 @@ branch=${TI_IPC_EXAMPLES_GIT_BRANCH};\
 name=${TI_IPC_EXAMPLES_NAME}"
 TI_IPC_METADATA_GIT_URI = "git://git.ti.com/git/ipc/ipc-metadata.git"
-TI_IPC_METADATA_DEST_SUFFIX = "git/ipc-metadata"
+TI_IPC_METADATA_DEST_SUFFIX = "${BB_GIT_DEFAULT_DESTSUFFIX}/ipc-metadata"
 TI_IPC_METADATA_GIT_PROTOCOL = "https"
 TI_IPC_METADATA_GIT_BRANCH = "master"
 TI_IPC_METADATA_NAME = "ipc-metadata"
@@ -33,8 +33,8 @@ SRCREV_FORMAT = "default"
 SRCREV_ipc-metadata = "${TI_IPC_METADATA_SRCREV}"
 SRCREV_ipc-examples = "${TI_IPC_EXAMPLES_SRCREV}"
-S_ipc-examples = "${WORKDIR}/git/ipc-examples"
+S_ipc-examples = "${S}/ipc-examples"
-S_ipc-metadata = "${WORKDIR}/git/ipc-metadata"
+S_ipc-metadata = "${S}/ipc-metadata"
 RELEASE_TYPE = "GA"
 RELEASE_SUFFIX = ""
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
index 999993ea..853fa117 100644
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
+++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
@@ -2,6 +2,9 @@ require recipes-ti/ipc/ti-ipc.inc
 require recipes-ti/ipc/ti-ipc-common.inc
 require ti-ipc-rtos.inc
+inherit deploy
+inherit update-alternatives
 DEPENDS = "ti-xdctools-native ti-sysbios doxygen-native zip-native"
 PACKAGES =+ "${PN}-fw"
@@ -78,24 +81,43 @@ KFPLAT = ""
 ALTERNATIVE_PRIORITY = "5"
-pkg_postinst:${PN}-fw:omap-a15 () {
+ALTERNATIVE:${PN}-fw:omapl138 = "rproc-dsp-fw"
-  update-alternatives --install /lib/firmware/dra7-dsp1-fw.xe66 dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 ${ALTERNATIVE_PRIORITY}
+ALTERNATIVE:${PN}-fw:omap-a15 = "dra7-dsp1-fw.xe66 \
-  update-alternatives --install /lib/firmware/dra7-dsp2-fw.xe66 dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 ${ALTERNATIVE_PRIORITY}
+                                 dra7-dsp2-fw.xe66 \
-  update-alternatives --install /lib/firmware/dra7-ipu1-fw.xem4 dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${ALTERNATIVE_PRIORITY}
+                                 dra7-ipu1-fw.xem4 \
-  update-alternatives --install /lib/firmware/dra7-ipu2-fw.xem4 dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4 ${ALTERNATIVE_PRIORITY}
+                                 dra7-ipu2-fw.xem4 \
-}
+                                "
-pkg_postrm:${PN}-fw:omap-a15 () {
+ALTERNATIVE_LINK_NAME[rproc-dsp-fw] = "${nonarch_base_libdir}/firmware/rproc-dsp-fw"
-  update-alternatives --remove dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66
+ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/dra7-dsp1-fw.xe66"
-  update-alternatives --remove dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66
+ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${nonarch_base_libdir}/firmware/dra7-dsp2-fw.xe66"
-  update-alternatives --remove dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4
+ALTERNATIVE_LINK_NAME[dra7-ipu1-fw.xem4] = "${nonarch_base_libdir}/firmware/dra7-ipu1-fw.xem4"
-  update-alternatives --remove dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4
+ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/dra7-ipu2-fw.xem4"
+ALTERNATIVE_TARGET[rproc-dsp-fw] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmOMAPL138_DSP/messageq_single.xe674"
+ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66"
+ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66"
+ALTERNATIVE_TARGET[dra7-ipu1-fw.xem4] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4"
+ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4"
+do_deploy() {
+  install -d ${DEPLOYDIR}
 }
-pkg_postinst:${PN}-fw:omapl138 () {
+do_deploy:append:omap-a15() {
-  update-alternatives --install /lib/firmware/rproc-dsp-fw rproc-dsp-fw ipc/ti_platforms_evmOMAPL138_DSP/messageq_single.xe674 ${ALTERNATIVE_PRIORITY}
+  install -d ${DEPLOYDIR}/ipc
+  install -m 0644 ${S}/packages/ti/ipc/tests/bin/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${DEPLOYDIR}/ipc/dra7-ipu1-fw.xem4
 }
-pkg_postrm:${PN}-fw:omapl138 () {
+addtask deploy after do_install
-  update-alternatives --remove rproc-dsp-fw ipc/ti_platforms_evmOMAPL138_DSP/messageq_single.xe674
-}
+# Disable the "buildpaths" check while we figure out how we are
+# going to address this issue.
+#
+# The ti-cgt6x compiler is a custom TI compiler for the TI C6000
+# Digital Signal Processor(DSP) platform.  It does not currently
+# support reproducible builds and is provided via a binary blob
+# download that we cannot patch in the recipe to address the
+# issue.
+INSANE_SKIP:${PN}-dev += "buildpaths"
+INSANE_SKIP:${PN}-fw += "buildpaths"
diff --git a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
index 98ec0e9e..0113a916 100644
--- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
+++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
@@ -10,11 +10,13 @@ JH_CELL_FILES ?= "*.cell"
 JH_CELL_FILES:k3 ?= "k3-*.cell"
 JH_CELL_FILES:am62xx ?= "k3-am625-*.cell"
 JH_CELL_FILES:am62pxx ?= "k3-am62p5-*.cell"
+JH_CELL_FILES:am62lxx ?= "k3-am62l*.cell"
 JH_INMATE_DTB ?= ""
 JH_INMATE_DTB:am62xx ?= "inmate-k3-am625-sk.dtb"
 JH_INMATE_DTB:am65xx ?= "inmate-k3-am654-idk.dtb"
 JH_INMATE_DTB:am62pxx ?= "inmate-k3-am62p5-sk.dtb"
+JH_INMATE_DTB:am62lxx ?= "inmate-k3-am62l3-evm.dtb"
 JH_INMATE_DTB:j7 ?= "inmate-k3-j721e-evm.dtb"
 JH_INMATE_DTB:j7200-evm ?= "inmate-k3-j7200-evm.dtb"
@@ -22,6 +24,7 @@ JH_LINUX_DEMO_CELL ?= ""
 JH_LINUX_DEMO_CELL:am62xx ?= "k3-am625-sk-linux-demo.cell"
 JH_LINUX_DEMO_CELL:am65xx ?= "k3-am654-idk-linux-demo.cell"
 JH_LINUX_DEMO_CELL:am62pxx ?= "k3-am62p5-sk-linux-demo.cell"
+JH_LINUX_DEMO_CELL:am62lxx ?= "k3-am62l3-evm-linux-demo.cell"
 JH_LINUX_DEMO_CELL:j7 ?= "k3-j721e-evm-linux-demo.cell"
 JH_LINUX_DEMO_CELL:j7200-evm ?= "k3-j7200-evm-linux-demo.cell"
@@ -31,6 +34,7 @@ JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
 JH_CMDLINE ?= ""
 JH_CMDLINE:am62xx ?= "console=ttyS3,115200n8 earlycon=ns16550a,mmio32,0x02810000"
 JH_CMDLINE:am62pxx ?= "console=ttyS1,115200n8"
+JH_CMDLINE:am62lxx ?= "console=ttyS3,115200n8"
 JH_CMDLINE:am65xx ?= "console=ttyS1,115200n8"
 JH_CMDLINE:j7 ?= "console=ttyS3,115200n8"
 JH_CMDLINE:j7200-evm ?= "console=ttyS3,115200n8"
@@ -51,11 +55,11 @@ do_install() {
        install -d ${D}/boot
        if [ -n "${JH_RAMFS_IMAGE}" ]
        then
-                if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
+                if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio ]
                then
-                        install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
+                        install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio ${D}/boot
                else
-                        bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
+                        bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio)!"
                        bberror "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
                fi
        fi
@@ -68,7 +72,7 @@ do_install() {
                ./jailhouse-cell-linux -w ${D}${JH_DATADIR}/${JH_INMATE_DTB} \
                        -a ${JH_ARCH} -c "${JH_CMDLINE}" \
                        -d ../configs/${JH_ARCH}/dts/${JH_INMATE_DTB} \
-                        -i ${D}/boot/${JH_RAMFS_IMAGE}-${MACHINE}.cpio \
+                        -i ${D}/boot/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio \
                        ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
                        ${DEPLOY_DIR_IMAGE}/Image \
                        | tr -cd '\11\12\15\40-\176' \
@@ -96,7 +100,8 @@ RDEPENDS:pyjailhouse = "python3-core python3-ctypes python3-fcntl python3-shell"
 RRECOMMENDS:${PN} = "${PN}-tools"
-INSANE_SKIP:${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags usrmerge"
+INSANE_SKIP:${PN}-dbg = "usrmerge buildpaths"
 KERNEL_MODULE_AUTOLOAD += "jailhouse"
@@ -117,10 +122,7 @@ python __anonymous () {
 }
 FILES:${PN} = " \
-    /boot/* \
+    /boot \
-    /usr/libexec \
+    /usr \
-    /usr/sbin/* \
+    /lib \
-    /usr/libexec/* \
-    /usr/share/* \
-    /lib/firmware/* \
 "
diff --git a/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc
index 6faf16b8..e8374201 100644
--- a/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc
+++ b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc
@@ -11,10 +11,10 @@ LIC_FILES_CHKSUM = " \
    file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 "
-COMPATIBLE_MACHINE = "am62xx|am62pxx"
+COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
 TARGET_CC_ARCH += "${LDFLAGS}"
 PV = "0.12+git"
-SRCREV = "603819ef9a771a3c253a141220daab8e61751a43"
+SRCREV = "ef512f9591febed854d8f07ad8c1fa731c2d3c69"
 BRANCH = "master"
 SRC_URI = " \
    git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \
@@ -43,7 +43,6 @@ export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}"
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
-S = "${WORKDIR}/git"
 B = "${S}"
 DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native"
@@ -63,6 +62,7 @@ JH_SYSCONFIG_CELL ?= ""
 JH_SYSCONFIG_CELL:am62xx ?= "k3-am625-sk.cell"
 JH_SYSCONFIG_CELL:am65xx ?= "k3-am654-idk.cell"
 JH_SYSCONFIG_CELL:am62pxx ?= "k3-am62p5-sk.cell"
+JH_SYSCONFIG_CELL:am62lxx ?= "k3-am62l3-evm.cell"
 JH_SYSCONFIG_CELL:j7 ?= "k3-j721e-evm.cell"
 JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell"
diff --git a/meta-ti-extras/recipes-ti/mathlib/mathlib.inc b/meta-ti-extras/recipes-ti/mathlib/mathlib.inc
index 6ad073ec..ae70cc37 100644
--- a/meta-ti-extras/recipes-ti/mathlib/mathlib.inc
+++ b/meta-ti-extras/recipes-ti/mathlib/mathlib.inc
@@ -11,11 +11,8 @@ DEPENDS = "ti-cgt6x-native \
           ti-xdctools-native \
           ti-sysbios \
           doxygen-native \
-           zip-native \
           swtools"
-S = "${WORKDIR}/git"
 MATHLIB_GIT_BRANCH = "master"
 MATHLIB_GIT_PROTOCOL = "https"
 MATHLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/mathlib.git"
@@ -26,18 +23,18 @@ SRCREV = "${MATHLIB_SRCREV}"
 LIC_FILES_CHKSUM = "file://ti/mathlib/src/acosdp/acosdp.h;beginline=1;endline=35;md5=c133f7e139b46385906c861dd9552250"
-export MATHLIB_WORK_DIR="${S}"
+export MATHLIB_WORK_DIR = "${S}"
-export CGTOOLS_INSTALL_DIR  = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
+export CGTOOLS_INSTALL_DIR = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export C64PCODEGENTOOL="${CGTOOLS_INSTALL_DIR}"
+export C64PCODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
-export C674CODEGENTOOL="${CGTOOLS_INSTALL_DIR}"
+export C674CODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
-export C66CODEGENTOOL ="${CGTOOLS_INSTALL_DIR}"
+export C66CODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
 export SWTOOLS_PATH = "${SWTOOLS_INSTALL_DIR}/ti/mas/swtools"
-export XDCBUILDCFG="${SWTOOLS_PATH}/config.bld"
+export XDCBUILDCFG = "${SWTOOLS_PATH}/config.bld"
 PATH:append = ":${XDC_INSTALL_DIR}"
-XDCPATH.="${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;"
+XDCPATH .= "${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;"
-XDCPATH.="${SWTOOLS_INSTALL_DIR};${MATHLIB_WORK_DIR};"
+XDCPATH .= "${SWTOOLS_INSTALL_DIR};${MATHLIB_WORK_DIR};"
 export XDCPATH
@@ -56,19 +53,6 @@ do_install() {
        rm -r ${D}${MATHLIB_INSTALL_DIR_RECIPE}/mathlib
 }
-inherit deploy
-addtask deploy before do_build after do_install
-do_deploy() {
-        install -d ${DEPLOYDIR}
-        # zip up files in ${D}${MATHLIB_INSTALL_DIR_RECIPE}
-        # and place the zip file in ${DEPLOYDIR}
-        mkdir ./${MATHLIB_PACKAGE_NAME}
-        cp -r ${D}${MATHLIB_INSTALL_DIR_RECIPE}/. ./${MATHLIB_PACKAGE_NAME}
-        zip -9 -y -r -q ${DEPLOYDIR}/${MATHLIB_PACKAGE_NAME}.zip ./${MATHLIB_PACKAGE_NAME}
-        rm -r ./${MATHLIB_PACKAGE_NAME}
-}
 ALLOW_EMPTY:${PN} = "1"
 FILES:${PN}-dev += "${MATHLIB_INSTALL_DIR_RECIPE}"
diff --git a/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb b/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb
deleted file mode 100644
index aa4bc6cd..00000000
--- a/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-DESCRIPTION = "TI OpenMP RTOS"
-HOMEPAGE = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git"
-LICENSE = "BSD-3-Clause"
-require recipes-ti/includes/ti-paths.inc
-inherit features_check
-REQUIRED_MACHINE_FEATURES = "dsp"
-REQUIRED_DISTRO_FEATURES = "openmp"
-PV = "2_06_03_00"
-PR = "r0"
-OPENMP_RTOS_GIT_URI = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git"
-OPENMP_RTOS_GIT_PROTOCOL = "https"
-OPENMP_RTOS_GIT_BRANCH = "master"
-BRANCH = "${OPENMP_RTOS_GIT_BRANCH}"
-SRC_URI = "${OPENMP_RTOS_GIT_URI};protocol=${OPENMP_RTOS_GIT_PROTOCOL};branch=${BRANCH}"
-SRCREV = "c090eb664d9815a36ead0e14f31e102590680fb8"
-LIC_FILES_CHKSUM = "file://docs/license/omp_manifest_template.html;md5=61a6972303c0447b7c056195d7ebafee"
-DEPENDS = "common-csl-ip-rtos doxygen-native libulm ti-xdctools-native ti-ipc-rtos ti-sysbios ti-cgt6x-native zip-native"
-COMPATIBLE_MACHINE = "omap-a15"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-S = "${WORKDIR}/git"
-export IPC_DIR = "${IPC_INSTALL_DIR}"
-export XDC_DIR = "${XDC_INSTALL_DIR}"
-export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}"
-export ULM_DIR ="${STAGING_DIR_TARGET}/usr/share/ti/ulm"
-export C6636_PDK_DIR ="${PDK_INSTALL_DIR}"
-export AM572_PDK_DIR ="${PDK_INSTALL_DIR}"
-export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export BUILD_AM572 = "0"
-BUILD_AM572:omap-a15 = "1"
-RELEASE_TARGET = ""
-RELEASE_TARGET:omap-a15 = "am57xx"
-do_compile() {
-    make -f utils/product/Makefile .zipfile
-}
-do_install() {
-    install -d ${D}${OMP_INSTALL_DIR_RECIPE}
-    cp -r ${S}/exports/openmp_dsp_${RELEASE_TARGET}_*/. -d  ${D}${OMP_INSTALL_DIR_RECIPE}
-}
-ALLOW_EMPTY:${PN} = "1"
-FILES:${PN}-dev += " \
-    ${OMP_INSTALL_DIR_RECIPE}/ \
-"
-INSANE_SKIP:${PN}-dev = "arch"
diff --git a/meta-ti-extras/recipes-ti/osal/ti-osal.inc b/meta-ti-extras/recipes-ti/osal/ti-osal.inc
deleted file mode 100644
index b0470793..00000000
--- a/meta-ti-extras/recipes-ti/osal/ti-osal.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "TI Operating System Abstraction Library (OSAL)"
-HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/osal"
-LICENSE = "BSD-3-Clause & EPL-1.0"
-SECTION = "devel"
-require ../includes/ti-paths.inc
-require ../includes/ti-staging.inc
-S = "${WORKDIR}/osal_${PV}"
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/osal/${PV}/exports/osal_${PV}.tar.gz;name=osaltarball"
-do_install() {
-    install -d ${D}${OSAL_INSTALL_DIR_RECIPE}
-    cp -pPrf ${S}/* ${D}${OSAL_INSTALL_DIR_RECIPE}
-}
-INSANE_SKIP:${PN}-dev = "staticdev"
-ALLOW_EMPTY:${PN} = "1"
-FILES:${PN}-dev += "${OSAL_INSTALL_DIR_RECIPE}"
-COMPATIBLE_HOST ?= "null"
-COMPATIBLE_HOST:ti-soc = "(.*)"
diff --git a/meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb b/meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb
deleted file mode 100644
index 226458be..00000000
--- a/meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require ti-osal.inc
-PV = "1_24_00_09"
-PR = "r0"
-LIC_FILES_CHKSUM = "file://osal_${PV}_Manifest.html;md5=c110191994d011cee4cd02189ed3c9f4"
-SRC_URI[osaltarball.md5sum] = "a7ea85447fa0ff0f786d527a52fa6e8b"
-SRC_URI[osaltarball.sha256sum] = "d14f1f43c8a7965e86add69bd813cea56ea7e38abeb55de3fdcdaf4a69f19bf3"
diff --git a/meta-ti-extras/recipes-ti/swtools/swtools_git.bb b/meta-ti-extras/recipes-ti/swtools/swtools_git.bb
index 4bcd6754..82de2040 100644
--- a/meta-ti-extras/recipes-ti/swtools/swtools_git.bb
+++ b/meta-ti-extras/recipes-ti/swtools/swtools_git.bb
@@ -12,7 +12,6 @@ DEPENDS = "ti-cgt6x-native \
 PV = "5_0_8"
 PR = "r3"
-S = "${WORKDIR}/git"
 SWTOOLS_GIT_BRANCH = "master"
 SWTOOLS_GIT_PROTOCOL = "https"
diff --git a/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc b/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
index 6b5e186c..94c5d33b 100644
--- a/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
+++ b/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI Vision Library (VLIB) for C66x"
+SUMMARY = "TI Vision Library (VLIB) for C66x"
 HOMEPAGE = "http://software-dl.ti.com/libs/vlib/latest/index_FDS.html"
 SECTION = "devel"
 LICENSE = "TI-TSPA & BSD-3-Clause"
@@ -11,11 +11,11 @@ COMPATIBLE_MACHINE = "omap-a15"
 SRC_URI = "http://software-dl.ti.com/libs/vlib/${PV}//exports/vlib_c66x_obj_${PV}_Linux.bin;name=vlibbin"
-S = "${WORKDIR}/vlib_c66x_${PV}"
+S = "${UNPACKDIR}/vlib_c66x_${PV}"
-BINFILE="vlib_c66x_obj_${PV}_Linux.bin"
+BINFILE = "vlib_c66x_obj_${PV}_Linux.bin"
 TI_BIN_UNPK_ARGS = "--mode silent --prefix ${S}"
-TI_BIN_UNPK_CMDS=""
+TI_BIN_UNPK_CMDS = ""
 do_install() {
    CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
diff --git a/meta-ti-extras/recipes-ti/xdais/ti-xdais.inc b/meta-ti-extras/recipes-ti/xdais/ti-xdais.inc
index 67d19022..070e28c3 100644
--- a/meta-ti-extras/recipes-ti/xdais/ti-xdais.inc
+++ b/meta-ti-extras/recipes-ti/xdais/ti-xdais.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "TI eXpress DSP Algorithm Interface Standard (XDAIS) specification"
+SUMMARY = "TI eXpress DSP Algorithm Interface Standard (XDAIS) specification"
 HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais"
 LICENSE = "GPL-2.0-only"
 SECTION = "devel"
@@ -6,7 +6,7 @@ SECTION = "devel"
 require ../includes/ti-paths.inc
 require ../includes/ti-staging.inc
-S = "${WORKDIR}/xdais_${PV}"
+S = "${UNPACKDIR}/xdais_${PV}"
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/${PV}/exports/xdais_${PV}.tar.gz;name=xdaistarball"