12 files changed, 73 insertions, 112 deletions

diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc
index 5125856f..e3a50fdd 100644
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -11,4 +11,3 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"
 
 # TI platforms all use devicetrees with overlays
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
-KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
diff --git a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
index 5762ee8a..95ba1e2d 100755
--- a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
@@ -18,7 +18,8 @@ S = "${WORKDIR}/git"
 CPSW9G_FW_DIR = "${S}/ethfw"
 CPSW9G_FW_FILENAME = "app_remoteswitchcfg_server_pdk_mem_map_strip.xer5f"
 
-require recipes-bsp/ti-linux-fw/firmware-common.inc
+# make sure that lib/firmware, and all its contents are part of the package
+FILES:${PN} += "${nonarch_base_libdir}/firmware"
 
 do_install() {
   install -d ${D}${nonarch_base_libdir}/firmware
@@ -31,3 +32,10 @@ ALTERNATIVE:${PN} = "j7-main-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
 ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${CPSW9G_FW_FILENAME}"
 ALTERNATIVE_PRIORITY = "17"
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INSANE_SKIP:${PN} += "arch"
+
+do_compile[noexec] = "1"
+do_configure[noexec] = "1"
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/firmware-common.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/firmware-common.inc
deleted file mode 100644
index fb9861b8..00000000
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/firmware-common.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Clean is broken for most firmware-only repos
-CLEANBROKEN = "1"
-
-# Make sure that lib/firmware, and all its contents are part of the package
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-# This is used to prevent the build system from stripping the firmwares
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-
-# This is used to prevent the build system from splitting out the firmware debug info into a separate file
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-# Firmware here are prebuilt with no external dependencies
-INHIBIT_DEFAULT_DEPS = "1"
-
-# Disable arch checking as firmware is likely to be a different arch from the Yocto build
-INSANE_SKIP:${PN} += "arch"
-
-# Firmware has no configure nor build steps
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index f216efa4..b22585ff 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -1,3 +1,5 @@
+SUMMARY = "Common include for TI Linux firmware"
+
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
 
@@ -17,7 +19,7 @@ TI_SYSFW_VERSION = "11.01.02"
 TI_HSM_DEMO_FW_VERSION = "11.00.09"
 TAD5212_FW_VERSION = "1.0.0.0"
 
-TI_LINUX_FW_SRCREV ?= "1190654141a9604e21307555882d77eaaf8c5fac"
+TI_LINUX_FW_SRCREV ?= "33bec0e2ea9a25362c0c8243b2f1ed392dbc5b02"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
@@ -30,4 +32,24 @@ SRC_URI = "${TI_LINUX_FW_GIT_URI};protocol=${TI_LINUX_FW_GIT_PROTOCOL};${TI_LINU
 
 S = "${WORKDIR}/git"
 
-require recipes-bsp/ti-linux-fw/firmware-common.inc
+CLEANBROKEN = "1"
+
+# Make sure that lib/firmware, and all its contents are part of the package
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
+
+# This is used to prevent the build system from stripping the firmwares
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+# This is used to prevent the build system from splitting out the firmware debug info into a separate file
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+# Firmware here are prebuilt with no external dependencies
+INHIBIT_DEFAULT_DEPS = "1"
+
+# Disable arch checking as firmware is likely to be a different arch from the Yocto build
+INSANE_SKIP:${PN} += "arch"
+
+# Firmware in Linux Firmware has no configure nor build steps
+do_compile[noexec] = "1"
+do_configure[noexec] = "1"
diff --git a/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-edgeai-fw.bb b/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-edgeai-fw.bb
deleted file mode 100644
index 378e3a12..00000000
--- a/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-edgeai-fw.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
-
-COMPATIBLE_MACHINE = "am62axx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit update-alternatives
-
-PLAT_SFX = ""
-PLAT_SFX:am62axx = "am62axx"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-PV = "${CORESDK_RTOS_VERSION}"
-PR = "${INC_PR}.1"
-
-# Secure Build
-inherit ti-secdev
-
-IPC_FW_DIR = "ti-ipc/${PLAT_SFX}"
-
-INSTALL_IPC_FW_DIR = "${nonarch_base_libdir}/firmware/${IPC_FW_DIR}"
-
-C7X_1_FW = "dsp_edgeai_c7x_1_release_strip.out"
-
-IPC_FW_LIST = ""
-IPC_FW_LIST:am62axx = "${C7X_1_FW}"
-
-do_install() {
-    # Sign Firmware
-    for FW_NAME in ${IPC_FW_LIST}
-    do
-        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${IPC_FW_DIR}/${FW_NAME} ${S}/${IPC_FW_DIR}/${FW_NAME}.signed
-    done
-
-    # Install Firmware
-    install -d ${D}${INSTALL_IPC_FW_DIR}
-    for FW_NAME in ${IPC_FW_LIST}
-    do
-        install -m 0644 ${S}/${IPC_FW_DIR}/${FW_NAME}        ${D}${INSTALL_IPC_FW_DIR}
-        install -m 0644 ${S}/${IPC_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_IPC_FW_DIR}
-    done
-}
-
-ALTERNATIVE:${PN}:am62axx = "\
-                    am62a-c71_0-fw        am62a-c71_0-fw-sec \
-                    "
-
-ALTERNATIVE_LINK_NAME[am62a-c71_0-fw]     = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw"
-ALTERNATIVE_LINK_NAME[am62a-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw-sec"
-
-ALTERNATIVE_TARGET[am62a-c71_0-fw]     = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}"
-ALTERNATIVE_TARGET[am62a-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed"
-
-ALTERNATIVE_PRIORITY = "20"
diff --git a/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb b/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb
index b74d2d2c..20c6b531 100644
--- a/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb
@@ -35,20 +35,21 @@ IPC_FW_DIR = "ti-ipc/${PLAT_SFX}"
 
 INSTALL_IPC_FW_DIR = "${nonarch_base_libdir}/firmware/${IPC_FW_DIR}"
 
-MCU_1_0_FW = "ipc_echo_test_mcu1_0_release_strip.xer5f"
-MCU_1_1_FW = "ipc_echo_test_mcu1_1_release_strip.xer5f"
-MCU_2_0_FW = "ipc_echo_test_mcu2_0_release_strip.xer5f"
-MCU_2_1_FW = "ipc_echo_test_mcu2_1_release_strip.xer5f"
-MCU_3_0_FW = "ipc_echo_test_mcu3_0_release_strip.xer5f"
-MCU_3_1_FW = "ipc_echo_test_mcu3_1_release_strip.xer5f"
-MCU_4_0_FW = "ipc_echo_test_mcu4_0_release_strip.xer5f"
-MCU_4_1_FW = "ipc_echo_test_mcu4_1_release_strip.xer5f"
-C66_1_FW   = "ipc_echo_test_c66xdsp_1_release_strip.xe66"
-C66_2_FW   = "ipc_echo_test_c66xdsp_2_release_strip.xe66"
-C7X_1_FW   = "ipc_echo_test_c7x_1_release_strip.xe71"
-C7X_2_FW   = "ipc_echo_test_c7x_2_release_strip.xe71"
-C7X_3_FW   = "ipc_echo_test_c7x_3_release_strip.xe71"
-C7X_4_FW   = "ipc_echo_test_c7x_4_release_strip.xe71"
+MCU_1_0_FW =       "ipc_echo_test_mcu1_0_release_strip.xer5f"
+MCU_1_1_FW =       "ipc_echo_test_mcu1_1_release_strip.xer5f"
+MCU_2_0_FW =       "ipc_echo_test_mcu2_0_release_strip.xer5f"
+MCU_2_1_FW =       "ipc_echo_test_mcu2_1_release_strip.xer5f"
+MCU_3_0_FW =       "ipc_echo_test_mcu3_0_release_strip.xer5f"
+MCU_3_1_FW =       "ipc_echo_test_mcu3_1_release_strip.xer5f"
+MCU_4_0_FW =       "ipc_echo_test_mcu4_0_release_strip.xer5f"
+MCU_4_1_FW =       "ipc_echo_test_mcu4_1_release_strip.xer5f"
+C66_1_FW =         "ipc_echo_test_c66xdsp_1_release_strip.xe66"
+C66_2_FW =         "ipc_echo_test_c66xdsp_2_release_strip.xe66"
+C7X_1_FW =         "ipc_echo_test_c7x_1_release_strip.xe71"
+C7X_1_FW:am62axx = "dsp_edgeai_c7x_1_release_strip.out"
+C7X_2_FW =         "ipc_echo_test_c7x_2_release_strip.xe71"
+C7X_3_FW =         "ipc_echo_test_c7x_3_release_strip.xe71"
+C7X_4_FW =         "ipc_echo_test_c7x_4_release_strip.xe71"
 
 IPC_FW_LIST = ""
 IPC_FW_LIST:am65xx =  "${MCU_1_0_FW} ${MCU_1_1_FW}"
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
index ec52d09c..07ace3c4 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -3,7 +3,7 @@
 PV = "2.13+git"
 
 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
-SRCREV_tfa = "d90bb650fe4cb3784f62214ab5829f4051c38d0a"
+SRCREV_tfa = "e0c4d3903b382bf34f552af53e6d955fae5283ab"
 SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
 SRCBRANCH = "master"
 
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
index 0d61a732..340c732e 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
@@ -6,4 +6,4 @@ PR = "r0"
 
 BRANCH = "ti-u-boot-2025.01"
 
-SRCREV = "5350f13b66393212475a15c4e107add1d38267d3"
+SRCREV = "d2a72467939e169210bcd8e57de4b3e6ce2ef149"
diff --git a/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb b/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb
index c5293a3f..3aa69700 100644
--- a/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb
@@ -39,7 +39,26 @@ do_install() {
     done
 }
 
-require recipes-bsp/ti-linux-fw/firmware-common.inc
+# Make sure that lib/firmware, and all its contents are part of the package
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
+
+# This is used to prevent the build system from stripping the firmwares
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+# This is used to prevent the build system from splitting out the firmware debug info into a separate file
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+# This is a prebuilt with no external dependencies
+INHIBIT_DEFAULT_DEPS = "1"
+
+# Disable arch checking as firmware is likely to be a different arch from the Yocto build
+INSANE_SKIP:${PN} += "arch"
+
+# Zephyr-Firmware has no configure, compile, nor clean steps
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+CLEANBROKEN = "1"
 
 inherit update-alternatives
 
diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
index 8691e523..1549e50f 100644
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -10,7 +10,7 @@ PV = "0.3+git"
 COMPATIBLE_MACHINE = "k3"
 
 BRANCH ?= "master"
-SRCREV = "ea9938bf9cafd9c0cb05ef060a713ab4ac72270f"
+SRCREV = "e6abc1b87f1d5bc4c2ab5f1ebfbf5a70e437dcb4"
 
 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
 
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
index 23675b35..7ab98d30 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
 
 BRANCH ?= "ti-linux-6.12.y"
 
-SRCREV ?= "9167ea3511ca6ac1536b3114d92791b3de7422a3"
-PV = "6.12.34+git"
+SRCREV ?= "e3e551586dfad357550da433969d6d9f458e06ce"
+PV = "6.12.35+git"
 
 # Special configuration for remoteproc/rpmsg IPC modules
 module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
index 8c14446a..40ddc4fd 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
@@ -1,13 +1,3 @@
-# Add DTC FLAGS -@ when KERNEL_DTB_OVERLAY_SUPPORT is enabled
-
-def get_extra_dtc_args(d):
-    if d.getVar('KERNEL_DTB_OVERLAY_SUPPORT') == "1":
-        return "DTC_FLAGS=-@"
-    else:
-        return ""
-
-EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}"
-
 # Tell the kernel class to install the DTBs in the same directory structure as
 # the kernel.
 KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"