12 files changed, 156 insertions, 136 deletions
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/*"