CI/CD Auto-Merger: cicd.scarthgap.202507011953

Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV u-boot-ti-staging_2025.01: SRCREV k3conf: SRCREV linux-ti-staging_6.12: PV,SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=1190654141a9604e21307555882d77eaaf8c5fac..33bec0e2ea9a25362c0c8243b2f1ed392dbc5b02 u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=5350f13b66393212475a15c4e107add1d38267d3..d2a72467939e169210bcd8e57de4b3e6ce2ef149 k3conf: https://git.ti.com/cgit/k3conf/k3conf/log/?qt=range&q=ea9938bf9cafd9c0cb05ef060a713ab4ac72270f..e6abc1b87f1d5bc4c2ab5f1ebfbf5a70e437dcb4 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=9167ea3511ca6ac1536b3114d92791b3de7422a3..e3e551586dfad357550da433969d6d9f458e06ce Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
trusted-firmware-a: Move back to tfa upstream except for am62lxx
2026-01-12 01:20:20 +00:00 · 2025-07-01 19:53:14 -05:00 · 2025-07-01 13:48:35 -05:00 · 2025-07-01 13:38:12 -05:00 · 2025-06-27 10:11:15 -05:00 · 2025-06-27 10:05:48 -05:00
111 changed files with 675 additions and 273 deletions
--- a/check_yocto_rules.json
+++ b/check_yocto_rules.json
@@ -0,0 +1,31 @@
+{
+    "APPEND-1" : {
+        "skip_vars" : [ "ALTERNATIVE", "FILES", "INSANE_SKIP", "RDEPENDS", "RRECOMMENDS" ]
+    },
+    "APPEND-2" : {
+        "skip_vars" : [ "KERNEL_LOCALVERSION", "PR", "PV" ],
+        "file_regex" : {
+            "meta-ti-bsp\\/recipes-graphics\\/mesa\\/mesa-pvr_\\S+\\.bb" : {
+                "skip_vars": [ "GALLIUMDRIVERS", "VULKAN_DRIVERS" ]
+            },
+            "meta-ti-bsp\\/recipes-graphics\\/mesa\\/mesa-pvr\\.inc" : {
+                "skip_vars": [ "TOOLS", "TOOLS_DEPS", "GALLIUMDRIVERS", "VULKAN_DRIVERS" ]
+            }
+        }
+    },
+    "GUARD-1" : {
+        "skip_files" : [
+            "meta-ti-bsp/recipes-core/udev/eudev_%.bbappend",
+            "meta-ti-bsp/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend",
+            "meta-ti-bsp/recipes-security/optee/optee-%.bbappend"
+        ]
+    },
+    "GUARD-2" : {
+        "skip_vars" : [ "k3" , "ti-soc" ]
+    },
+    "SUMMARY-1" : {
+        "skip_files" : [
+            "meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb"
+        ]
+    }
+}
--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -3,8 +3,6 @@
 #@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)

 require conf/machine/include/k3r5.inc
-
-TI_PREFERRED_BSP ?= "bb_org-6_1"
 require conf/machine/include/beagle-bsp.inc

 SYSFW_SOC = "j722s"
@@ -12,5 +10,6 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "j722s_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"

 UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
--- a/meta-beagle/conf/machine/beagley-ai.conf
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -3,11 +3,10 @@
 #@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)

 require conf/machine/include/j722s.inc
-
-TI_PREFERRED_BSP ?= "bb_org-6_1"
 require conf/machine/include/beagle-bsp.inc

 UBOOT_MACHINE = "j722s_evm_a53_config"
+UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig"

 UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config"

@@ -22,4 +21,9 @@ ti/k3-j722s-evm.dtb \
 ti/k3-am67a-beagley-ai.dtb \
 "

+KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
+ti/k3-j722s-evm.dtb \
+ti/k3-am67a-beagley-ai.dtb \
+"
+
 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-beagle/conf/machine/include/beagle-bsp.inc
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -1,30 +1,30 @@
 # Use meta-ti-bsp "multi-BSP" facility to create a custom "bb_org" BSP profile
 # with default preferences for Beagle platforms

-# Default is bb_org-6_6, but can override with any of the existing options
-TI_PREFERRED_BSP ?= "bb_org-6_6"
+# Default is bb_org-6_12, but can override with any of the existing options
+TI_PREFERRED_BSP ?= "bb_org-6_12"

 # ==========
-# bb_org-6_1
-# BeagleBoard.org kernel 6.1, u-boot 2023.04
+# bb_org-6_12
+# BeagleBoard.org kernel 6.12, Upstream u-boot 2025.04
 # based on TI staging trees with extra Beagle-specific features
 # but may not be up-to-date with TI version
 # ==========
-BSP_KERNEL_PROVIDER:bsp-bb_org-6_1 = "linux-bb.org"
-BSP_KERNEL_VERSION:bsp-bb_org-6_1 = "6.1.%"
-BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_1 = "u-boot-bb.org"
-BSP_BOOTLOADER_VERSION:bsp-bb_org-6_1 = "2023.%"
+BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org"
+BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%"
+BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org"
+BSP_BOOTLOADER_VERSION:bsp-bb_org-6_12 = "2025.%"

-BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_1 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_1 = "1.17%"
-BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%"
-BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%"
+BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_12 = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%"
+BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%"

-# GC320 support requires out-of-tree drivers not yet available in bb.org 6.1
-MACHINE_FEATURES:remove:bsp-bb_org-6_1 = "gc320"
+# GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
+MACHINE_FEATURES:remove:bsp-bb_org-6_12 = "gc320"

 # ==========
 # bb_org-6_6
@@ -47,3 +47,25 @@ BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"

 # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
 MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320"
+
+# ==========
+# bb_org-6_1
+# BeagleBoard.org kernel 6.1, u-boot 2023.04
+# based on TI staging trees with extra Beagle-specific features
+# but may not be up-to-date with TI version
+# ==========
+BSP_KERNEL_PROVIDER:bsp-bb_org-6_1 = "linux-bb.org"
+BSP_KERNEL_VERSION:bsp-bb_org-6_1 = "6.1.%"
+BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_1 = "u-boot-bb.org"
+BSP_BOOTLOADER_VERSION:bsp-bb_org-6_1 = "2023.%"
+
+BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_1 = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_1 = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%"
+BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%"
+
+# GC320 support requires out-of-tree drivers not yet available in bb.org 6.1
+MACHINE_FEATURES:remove:bsp-bb_org-6_1 = "gc320"
--- a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
+++ b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: PocketBeagle2 (R5F)
+#@DESCRIPTION: Machine configuration for the PocketBeagle2 (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/beagle-bsp.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am6232_pocketbeagle2_r5_defconfig"
--- a/meta-beagle/conf/machine/pocketbeagle2.conf
+++ b/meta-beagle/conf/machine/pocketbeagle2.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: PocketBeagle2 (A53)
+#@DESCRIPTION: Machine configuration for the PocketBeagle2 board (A53 core)
+
+require conf/machine/include/k3.inc
+require conf/machine/include/mc_k3r5.inc
+
+require conf/machine/include/beagle-bsp.inc
+
+SOC_FAMILY:append = ":am62xx"
+
+SERIAL_CONSOLES = "115200;ttyS2"
+
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+UBOOT_MACHINE = "am6232_pocketbeagle2_a53_defconfig"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am6232 \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am6232-pocketbeagle2.dtb \
+    ti/k3-am6232-pocketbeagle2-techlab-cape.dtbo \
+"
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
@@ -0,0 +1 @@
+CONFIG_BOOTCOMMAND="run bootcmd_ti_mmc"
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
@@ -0,0 +1,26 @@
+require recipes-bsp/u-boot/u-boot-ti.inc
+
+SUMMARY = "BeagleBoard.org U-Boot"
+
+COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
+
+PV = "2025.04"
+
+UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
+UBOOT_GIT_PROTOCOL = "https"
+BRANCH = "v2025.04-Beagle"
+SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
+
+BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"
+BRANCH:beagley-ai-k3r5 = "v2025.04-rc3-BeagleY-AI"
+SRCREV:beagley-ai = "cc376f9faef201670c7bb1734f42f5475c73f85d"
+SRCREV:beagley-ai-k3r5 = "cc376f9faef201670c7bb1734f42f5475c73f85d"
+
+SRC_URI:append:beagley-ai = " file://bootcmd-ti-mmc.cfg"
+
+BRANCH:pocketbeagle2 = "v2025.04-pocketbeagle2"
+BRANCH:pocketbeagle2-k3r5 = "v2025.04-pocketbeagle2"
+SRCREV:pocketbeagle2 = "f7439516453b7728bda496ff6496ef6f1411aae3"
+SRCREV:pocketbeagle2-k3r5 = "f7439516453b7728bda496ff6496ef6f1411aae3"
+
+SRC_URI:append:pocketbeagle2 = " file://bootcmd-ti-mmc.cfg"
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.12/defconfig
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.12/defconfig
@@ -0,0 +1 @@
+use-kernel-config=bb.org_defconfig
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
@@ -0,0 +1,68 @@
+# Look in the generic major.minor directory for files
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
+
+SECTION = "kernel"
+SUMMARY = "BeagleBoard.org Linux kernel"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
+
+inherit kernel
+
+require recipes-kernel/linux/setup-defconfig.inc
+require recipes-kernel/linux/ti-kernel.inc
+
+DEPENDS += "gmp-native libmpc-native"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
+
+# Extra DT overlays/capes
+KERNEL_DEVICETREE:append:armv7a = " \
+${DT_VENDOR_PREFIX}AM335X-PRU-UIO-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-ADC-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-BBBW-WL1835-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-BBGG-WL1835-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-BBGW-WL1835-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-BONE-4D5R-01-00A1.dtbo \
+${DT_VENDOR_PREFIX}BB-BONE-eMMC1-01-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-BONE-LCD4-01-00A1.dtbo \
+${DT_VENDOR_PREFIX}BB-BONE-NH7C-01-A0.dtbo \
+${DT_VENDOR_PREFIX}BB-CAPE-DISP-CT4-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-HDMI-TDA998x-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-I2C1-MCP7940X-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-I2C1-RTC-DS3231.dtbo \
+${DT_VENDOR_PREFIX}BB-I2C1-RTC-PCF8563.dtbo \
+${DT_VENDOR_PREFIX}BB-I2C2-BME680.dtbo \
+${DT_VENDOR_PREFIX}BB-I2C2-MPU6050.dtbo \
+${DT_VENDOR_PREFIX}BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-NHDMI-TDA998x-00A0.dtbo \
+${DT_VENDOR_PREFIX}BBORG_COMMS-00A2.dtbo \
+${DT_VENDOR_PREFIX}BBORG_FAN-A000.dtbo \
+${DT_VENDOR_PREFIX}BBORG_RELAY-00A2.dtbo \
+${DT_VENDOR_PREFIX}BB-SPIDEV0-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-SPIDEV1-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-UART1-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-UART2-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-UART4-00A0.dtbo \
+${DT_VENDOR_PREFIX}BB-W1-P9.12-00A0.dtbo \
+${DT_VENDOR_PREFIX}BONE-ADC.dtbo \
+${DT_VENDOR_PREFIX}M-BB-BBG-00A0.dtbo \
+${DT_VENDOR_PREFIX}M-BB-BBGG-00A0.dtbo \
+${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \
+${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \
+"
+
+S = "${WORKDIR}/git"
+
+# 6.12.22 version for 32-bit
+SRCREV:armv7a = "d7f560ef48a867b94959f040b4c3c57053f4e32d"
+PV:armv7a = "6.12.22+git"
+BRANCH:armv7a = "v6.12.22-ti-arm32-r10"
+
+# 6.12.22 version for 64-bit
+SRCREV:aarch64 = "9e43fd19ece3affb9406e87ec3df733b91b77a4f"
+PV:aarch64 = "6.12.22+git"
+BRANCH:aarch64 = "v6.12.22-ti-arm64-r35"
+
+KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb
@@ -55,15 +55,15 @@ ${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \

 S = "${WORKDIR}/git"

-# 6.6.32 version for 32-bit
-SRCREV:armv7a = "525684d28fadc2bdae5424f28b219377bd5d4639"
-PV:armv7a = "6.6.32+git"
-BRANCH:armv7a = "v6.6.32-ti-arm32-r7"
+# 6.6.58 version for 32-bit
+SRCREV:armv7a = "0d043a88f69f48789e43526d7a807ab744708071"
+PV:armv7a = "6.6.58+git"
+BRANCH:armv7a = "v6.6.58-ti-arm32-r10"

 # 6.6.58 version for 64-bit
-SRCREV:aarch64 = "9beffa9162f6a0f5de7e25bbb66026a579376428"
+SRCREV:aarch64 = "0987ef737c9812374607475972f0868b8fecbbf7"
 PV:aarch64 = "6.6.58+git"
-BRANCH:aarch64 = "v6.6.58-ti-arm64-r16"
+BRANCH:aarch64 = "v6.6.58-ti-arm64-r23"

 KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"

--- a/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass
+++ b/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass
@@ -316,6 +316,7 @@ EOF
 # $4 ... ramdisk ID
 # $5 ... config ID
 # $6 ... tee ID/name
+# $7 ... default DTB ID
 fitimage_emit_section_config() {

 	conf_csum=${FITIMAGE_HASH_ALGO}
@@ -370,6 +371,16 @@ fitimage_emit_section_config() {
 		final_conf_desc="${conf_desc}"
 	fi

+	default_dtb_count=${7}
+	if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then
+		default_conf_name="${FIT_CONF_DEFAULT_DTB}"
+	else
+		default_conf_name="conf-${default_dtb_count}"
+	fi
+	cat << EOF >> ${1}
+        default = "${default_conf_name}";
+EOF
+
 	dtbcount=1
 	for DTB in ${KERNEL_DEVICETREE}; do
 		DTB=$(basename "${DTB}")
@@ -386,12 +397,6 @@ fitimage_emit_section_config() {
 			fdt_line="fdt = \"fdt-${dtbcount}\";"
 		fi

-		if [ "x${dtbcount}" = "x1" ]; then
-			cat << EOF >> ${1}
-                default = "${conf_name}";
-EOF
-		fi
-
 # Generate a single configuration section
 			cat << EOF >> ${1}
                ${conf_name} {
@@ -524,6 +529,7 @@ fitimage_assemble() {
 	ramdiskcount=${3}
 	setupcount=""
 	teecount=1
+	default_dtb_count=1
 	rm -f ${1} arch/${ARCH}/boot/${2}

 	fitimage_emit_fit_header ${1}
@@ -544,6 +550,9 @@ fitimage_assemble() {
 		dtbcount=1
 		dtboaddress="${UBOOT_DTBO_LOADADDRESS}"
 		for DTB in ${KERNEL_DEVICETREE}; do
+			if [ "${DTB}" = "${FIT_CONF_DEFAULT_DTB}" ]; then
+				default_dtb_count=${dtbcount}
+			fi
 			if echo ${DTB} | grep -q '/dts/'; then
 				bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
 				DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
@@ -660,7 +669,7 @@ fitimage_assemble() {
 	else
 		teeref="${teecount}"
 	fi
-	fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}"
+	fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}" "${default_dtb_count}"

 	fitimage_emit_section_maint ${1} sectend

--- a/meta-ti-bsp/conf/machine/am335x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-evm.conf
@@ -22,7 +22,7 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 13000"
+MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 16000"

 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
--- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
@@ -10,11 +10,6 @@ UBOOT_CONFIG ??= "uart mmc"
 UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
 UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"

-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
 # FIT image for legacy secure devices
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
--- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/am437x-evm.conf

 UBOOT_MACHINE = "am43xx_hs_evm_config"

-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
 OPTEEMACHINE = "ti-am43xx"
 OPTEEFLAVOR = "am43xx"

--- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/am57xx-evm.conf

 UBOOT_MACHINE = "am57xx_hs_evm_config"

-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
 OPTEEMACHINE = "ti-am57xx"
 OPTEEFLAVOR = "am57xx"
 OPTEEPAGER = "y"
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -9,3 +9,5 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM62D HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62D EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am62dx"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62dx_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am62dxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: AM62DXX EVM
+#@DESCRIPTION: Machine configuration for the TI AM62DXX EVM
+
+require conf/machine/include/am62dxx.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am62d2 \
+    ti/k3-am62a7-sk-edgeai \
+"
+
+KERNEL_DEVICETREE = ""
+
+FIT_CONF_DEFAULT_DTB = "ti/k3-am62d2-evm.dtb"
+
+UBOOT_MACHINE = "am62dx_evm_a53_defconfig"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-dac-fw"
--- a/meta-ti-bsp/conf/machine/am62lxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62lxx-evm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/ti-extras.inc

 IMAGE_FSTYPES += "ubifs ubi"

-MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8000"
+MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"

 UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"

--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -10,3 +10,5 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62px_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -10,3 +10,5 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -10,3 +10,5 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -9,6 +9,7 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62-lp \
    ti/k3-am625-sk \
    ti/k3-am62x-sk-dmtimer-pwm \
+    ti/k3-am62x-sk-eqep \
    ti/k3-am62x-sk-hdmi \
    ti/k3-am62x-sk-lpm \
    ti/k3-am62x-sk-mcan \
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -8,7 +8,9 @@ SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

-UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig"
+
+UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig"

 UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"

--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -4,6 +4,18 @@

 require conf/machine/include/am62xx.inc

+TFA_K3_BL32_BASE = "0x80080000"
+TFA_K3_BL32_BASE:bsp-ti-6_6 = ""
+TFA_K3_BL32_BASE:bsp-ti-6_1 = ""
+
+TFA_K3_PRELOADED_BL33 = "0x82000000"
+TFA_K3_PRELOADED_BL33:bsp-ti-6_6 = ""
+TFA_K3_PRELOADED_BL33:bsp-ti-6_1 = ""
+
+OPTEE_K3_TZDRAM_START = "0x80080000"
+OPTEE_K3_TZDRAM_START:bsp-ti-6_6 = ""
+OPTEE_K3_TZDRAM_START:bsp-ti-6_1 = ""
+
 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am625 \
    ti/k3-am62x-sk \
@@ -13,8 +25,10 @@ KERNEL_DEVICETREE = " \
    ti/k3-am625-sk.dtb \
 "

-FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
-
-UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
+FIT_CONF_DEFAULT_DTB = "ti/k3-am6254xxl-sk.dtb"
+FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "ti/k3-am625-sk.dtb"
+FIT_CONF_DEFAULT_DTB:bsp-ti-6_1 = "ti/k3-am625-sk.dtb"

+UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig"
 UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/dra7xx-evm.conf

 UBOOT_MACHINE = "dra7xx_hs_evm_config"

-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
 OPTEEMACHINE = "ti-dra7xx"
 OPTEEFLAVOR = "dra7xx"
 OPTEEPAGER = "y"
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -10,9 +10,6 @@ TFA_K3_SYSTEM_SUSPEND = "1"
 # Default tiboot3.bin on AM62A is for HS-FS
 IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"

-# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
-
 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
 IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"

--- a/meta-ti-bsp/conf/machine/include/am62dxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62dxx.inc
@@ -0,0 +1,15 @@
+require conf/machine/include/k3.inc
+require conf/machine/include/mc_k3r5.inc
+
+SOC_FAMILY:append = ":am62dxx"
+
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+# Default tiboot3.bin on AM62D is for HS-FS
+IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on AM62D is for HS-FS, add a version for HS-SE
+IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-evm.bin"
+
+TFA_BOARD = "lite"
+OPTEEMACHINE = "k3-am62x"
--- a/meta-ti-bsp/conf/machine/include/am62lxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62lxx.inc
@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62lxx"

 MACHINE_FEATURES += "screen"

-# Default tiboot3.bin on AM62L is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62lx-hs-fs-evm.bin"
-
 TFA_BOARD = "am62l"
 TFA_K3_SYSTEM_SUSPEND = "1"

--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -11,6 +11,9 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 # Default tiboot3.bin on AM62Px is for HS-FS
 IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"

+# Since default tiboot3.bin on AM62Px is for HS-FS, add a version for HS-SE
+IMAGE_BOOT_FILES += "tiboot3-am62px-hs-evm.bin"
+
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"

--- a/meta-ti-bsp/conf/machine/include/am69.inc
+++ b/meta-ti-bsp/conf/machine/include/am69.inc
@@ -18,4 +18,4 @@ TFA_BOARD = "j784s4"

 OPTEEMACHINE = "k3-j784s4"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -26,4 +26,4 @@ TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-j721e"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw-j7200"
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -40,4 +40,4 @@ TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver"
 TI_VXE_VXD_DRIVER:bsp-ti-6_6 = ""
 TI_VXE_VXD_DRIVER:bsp-ti-6_1 = ""

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw ${TI_VXE_VXD_DRIVER}"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}"
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -21,4 +21,4 @@ TFA_BOARD = "j784s4"

 OPTEEMACHINE = "k3-j784s4"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -13,18 +13,18 @@ KERNEL_IMAGETYPES = "Image fitImage"
 KERNEL_CLASSES += "kernel-fitimage"

 UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x81000000"
-UBOOT_LOADADDRESS = "0x81000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
+UBOOT_DTB_LOADADDRESS = "0x88000000"
+UBOOT_DTBO_LOADADDRESS = "0x88080000"
 UBOOT_DTBO_OFFSET = "0x00010000"

 SPL_BINARY = "tispl.bin"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_SUFFIX = "img"

+UBOOT_SIGN_ENABLE = "1"
+UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
+UBOOT_SIGN_KEYNAME ?= "custMpk"
+UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
 FIT_HASH_ALG ?= "sha512"
 FIT_SIGN_ALG ?= "rsa4096"

@@ -39,7 +39,7 @@ TFA_PLATFORM = "k3"
 UBI_VOLNAME = "rootfs"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm"

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"

@@ -56,3 +56,8 @@ TI_WKS_BOOTLOADER_APPEND ?= ""
 do_image_wic[depends] += "virtual/bootloader:do_deploy"

 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+
+FALCON_INCLUDE = ""
+FALCON_INCLUDE:ti-falcon = "conf/machine/include/ti-falcon.inc"
+
+require ${FALCON_INCLUDE}
--- a/meta-ti-bsp/conf/machine/include/ti-falcon.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
@@ -0,0 +1,4 @@
+IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
+KERNEL_CLASSES:remove = "kernel-fitimage"
+KERNEL_CLASSES += "kernel-fitimage-legacyhs"
+FIT_KERNEL_COMP_ALG = "none"
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -3,6 +3,12 @@
 SOC_FAMILY = "ti-soc"
 require conf/machine/include/soc-family.inc

+# kernel, initrd load addresses for the fitImage in all TI platforms
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
 # TI platforms all use devicetrees with overlays
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
 KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
--- a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
+SUMMARY = "Cortex-M3 binary blob for suspend-resume"

 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
@@ -14,7 +14,7 @@ SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;p
 S = "${WORKDIR}/git"

 do_compile() {
-	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}"
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc -std=gnu11 ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}"
 }

 do_install() {
--- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -5,7 +5,7 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 inherit update-alternatives

 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0"
+LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=df3992006621b797e36de43f36336e36"

 PV = "${CNM_WAVE521_FW_VERSION}"
 PR = "${INC_PR}.1"
--- a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs"
+SUMMARY = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs"
 HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver"
 LICENSE = "MIT | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"
--- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Goodix GT9271 config firmware"
+SUMMARY = "Goodix GT9271 config firmware"

 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc

--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
@@ -1,4 +1,4 @@
-DESCRIPTION =  "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
+SUMMARY =  "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
 HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver"
 LICENSE = "MIT | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2"
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb
@@ -1,4 +1,4 @@
-DESCRIPTION =  "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
+SUMMARY =  "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
 HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver"
 LICENSE = "MIT | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2"
@@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;

 S = "${WORKDIR}/git"

-SRCREV = "3bcbba9708fe6a882cd0f4820469d026fff7aee5"
+SRCREV = "8eaff654a8871118c08cfafe53795f57e3b6b396"

 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -1,4 +1,4 @@
-DESCRIPTION =  "Kernel drivers for the PowerVR SGX chipset found in the TI SoCs"
+SUMMARY =  "Kernel drivers for the PowerVR SGX chipset found in the TI SoCs"
 HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux"
 LICENSE = "MIT | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e"
--- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
+++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
@@ -23,6 +23,12 @@ TARGET = " \
    am65x-sr2-rtu1-prueth-fw.elf \
    am65x-sr2-txpru0-prueth-fw.elf \
    am65x-sr2-txpru1-prueth-fw.elf \
+    am64x-sr2-pru0-prueth-fw.elf \
+    am64x-sr2-pru1-prueth-fw.elf \
+    am64x-sr2-rtu0-prueth-fw.elf \
+    am64x-sr2-rtu1-prueth-fw.elf \
+    am64x-sr2-txpru0-prueth-fw.elf \
+    am64x-sr2-txpru1-prueth-fw.elf \
 "

 do_install() {
--- a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb
+++ b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb
@@ -20,6 +20,12 @@ TARGET = " \
    am65x-sr2-rtu1-pruhsr-fw.elf \
    am65x-sr2-txpru0-pruhsr-fw.elf \
    am65x-sr2-txpru1-pruhsr-fw.elf \
+    am64x-sr2-pru0-pruhsr-fw.elf \
+    am64x-sr2-pru1-pruhsr-fw.elf \
+    am64x-sr2-rtu0-pruhsr-fw.elf \
+    am64x-sr2-rtu1-pruhsr-fw.elf \
+    am64x-sr2-txpru0-pruhsr-fw.elf \
+    am64x-sr2-txpru1-pruhsr-fw.elf \
 "

 do_install() {
--- a/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb
+++ b/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb
@@ -5,7 +5,7 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 PE = "1"
 PR = "${INC_PR}.0"

-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am64xx"

 TARGET = " \
 	am335x-pru0-pruprp-fw.elf \
@@ -14,6 +14,12 @@ TARGET = " \
 	am437x-pru1-pruprp-fw.elf \
 	am57xx-pru0-pruprp-fw.elf \
 	am57xx-pru1-pruprp-fw.elf \
+	am64x-sr2-pru0-pruprp-fw.elf \
+	am64x-sr2-pru1-pruprp-fw.elf \
+	am64x-sr2-rtu0-pruprp-fw.elf \
+	am64x-sr2-rtu1-pruprp-fw.elf \
+	am64x-sr2-txpru0-pruprp-fw.elf \
+	am64x-sr2-txpru1-pruprp-fw.elf \
 "

 do_install() {
--- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb
+++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb
@@ -19,6 +19,12 @@ TARGET = " \
 	am65x-sr2-rtu1-prusw-fw.elf \
 	am65x-sr2-txpru0-prusw-fw.elf \
 	am65x-sr2-txpru1-prusw-fw.elf \
+	am64x-sr2-pru0-prusw-fw.elf \
+	am64x-sr2-pru1-prusw-fw.elf \
+	am64x-sr2-rtu0-prusw-fw.elf \
+	am64x-sr2-rtu1-prusw-fw.elf \
+	am64x-sr2-txpru0-prusw-fw.elf \
+	am64x-sr2-txpru1-prusw-fw.elf \
 "

 do_install() {
--- a/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "TI DAC TAD5212 config prebuild binary firmware"
+
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+
+PV = "${TAD5212_FW_VERSION}"
+PR = "${INC_PR}.0"
+
+COMPATIBLE_MACHINE = "am62dxx"
+
+TAD5212_1DEV = "tad5212_01.bin"
+TAD5212_4DEV = "tad5212_04.bin"
+
+do_install() {
+	install -d ${D}${nonarch_base_libdir}/firmware
+	install -m 0644 ${S}/ti/tad5212/${TAD5212_1DEV} ${D}${nonarch_base_libdir}/firmware/
+	install -m 0644 ${S}/ti/tad5212/${TAD5212_4DEV} ${D}${nonarch_base_libdir}/firmware/
+}
--- a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
@@ -7,8 +7,6 @@ COMPATIBLE_MACHINE = "k3"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-INHIBIT_DEFAULT_DEPS = "1"
-
 inherit deploy
 inherit update-alternatives

@@ -31,6 +29,7 @@ PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
 PLAT_SFX:am62axx = "am62axx"
+PLAT_SFX:am62dxx = "am62axx"
 PLAT_SFX:am62lxx = "am62lxx"
 PLAT_SFX:am62pxx = "am62pxx"

@@ -39,6 +38,8 @@ DM_FW_DIR = "ti-dm/${PLAT_SFX}"
 INSTALL_DM_FW_DIR  = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}"

 DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
+DM_FIRMWARE:am62axx = "dm_edgeai_mcu1_0_release_strip.out"
+DM_FIRMWARE:am62pxx = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'dss_display_share.wkup-r5f0_0.release.strip.out', 'ipc_echo_testb_mcu1_0_release_strip.xer5f', d)}"

 DM_FW_LIST = ""
 DM_FW_LIST:j721e =   "${DM_FIRMWARE}"
@@ -51,6 +52,7 @@ DM_FW_LIST:am65xx =  ""
 DM_FW_LIST:am64xx =  ""
 DM_FW_LIST:am62xx =  "${DM_FIRMWARE}"
 DM_FW_LIST:am62axx = "${DM_FIRMWARE}"
+DM_FW_LIST:am62dxx = "${DM_FIRMWARE}"
 DM_FW_LIST:am62lxx = ""
 DM_FW_LIST:am62pxx = "${DM_FIRMWARE}"

@@ -85,6 +87,7 @@ do_deploy() {
 ALTERNATIVE:${PN}:am62xx  = "am62-main-r5f0_0-fw"
 ALTERNATIVE:${PN}:am62pxx  = "am62p-main-r5f0_0-fw"
 ALTERNATIVE:${PN}:am62axx = "am62a-main-r5f0_0-fw"
+ALTERNATIVE:${PN}:am62dxx = "am62a-main-r5f0_0-fw"
 ALTERNATIVE:${PN}:j721e   = "j7-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j7200   = "j7200-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j721s2  = "j721s2-mcu-r5f0_0-fw"
--- a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
@@ -3,11 +3,7 @@ SUMMARY = "TI Ethernet prebuilt binary firmware images"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"

-COMPATIBLE_MACHINE = "k3"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-INHIBIT_DEFAULT_DEPS = "1"
+COMPATIBLE_MACHINE = "j721e|j7200|j784s4"

 inherit update-alternatives

@@ -19,66 +15,60 @@ PR = "${INC_PR}.0"
 # Secure Build
 inherit ti-secdev

-PLAT_SFX = ""
-PLAT_SFX:j721e = "j721e"
-PLAT_SFX:j7200 = "j7200"
-PLAT_SFX:j721s2 = "j721s2"
-PLAT_SFX:j784s4 = "j784s4"
-PLAT_SFX:j722s = "j722s"
-PLAT_SFX:j742s2 = "j742s2"
-PLAT_SFX:am65xx = "am65xx"
-PLAT_SFX:am64xx = "am64xx"
-PLAT_SFX:am62xx = "am62xx"
-PLAT_SFX:am62pxx = "am62pxx"
-PLAT_SFX:am62axx = "am62axx"
+PACKAGES += " \
+    ${PN}-j721e \
+    ${PN}-j7200 \
+    ${PN}-j784s4 \
+"
+# Disable arch checking as firmware is likely to be a different arch from the Yocto build
+INSANE_SKIP:${PN}-j721e += "arch"
+INSANE_SKIP:${PN}-j7200 += "arch"
+INSANE_SKIP:${PN}-j784s4 += "arch"

-ETH_FW_DIR = "ti-eth/${PLAT_SFX}"
+RDEPENDS:${PN} += " \
+    ${PN}-j721e \
+    ${PN}-j7200 \
+    ${PN}-j784s4 \
+"

-INSTALL_ETH_FW_DIR = "${nonarch_base_libdir}/firmware/${ETH_FW_DIR}"
+PLATS = "\
+    j721e \
+    j7200 \
+    j784s4 \
+"

 ETH_FW = "app_remoteswitchcfg_server_strip.xer5f"

-ETH_FW_LIST = ""
-ETH_FW_LIST:j721e =   "${ETH_FW}"
-ETH_FW_LIST:j7200 =   "${ETH_FW}"
-ETH_FW_LIST:j721s2 =  ""
-ETH_FW_LIST:j784s4 =  "${ETH_FW}"
-ETH_FW_LIST:j722s =   ""
-ETH_FW_LIST:j742s2 =  ""
-ETH_FW_LIST:am65xx =  ""
-ETH_FW_LIST:am64xx =  ""
-ETH_FW_LIST:am62xx =  ""
-ETH_FW_LIST:am62pxx = ""
-ETH_FW_LIST:am62axx = ""
-
 do_install() {
-    # ETH firmware
-    for FW_NAME in ${ETH_FW_LIST}
+    for PLAT in ${PLATS}
    do
-        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${ETH_FW_DIR}/${FW_NAME} ${S}/${ETH_FW_DIR}/${FW_NAME}.signed
-    done
+        # Sign ETH firmware
+        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/ti-eth/${PLAT}/${ETH_FW} ${S}/ti-eth/${PLAT}/${ETH_FW}.signed

-    # ETH firmware
-    install -d ${D}${INSTALL_ETH_FW_DIR}
-    for FW_NAME in ${ETH_FW_LIST}
-    do
-        install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}        ${D}${INSTALL_ETH_FW_DIR}
-        install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_ETH_FW_DIR}
+        # Install ETH firmware
+        install -d ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
+        install -m 0644 ${S}/ti-eth/${PLAT}/${ETH_FW}        ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
+        install -m 0644 ${S}/ti-eth/${PLAT}/${ETH_FW}.signed ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
    done
 }

+FILES:${PN} = ""
+FILES:${PN}-j721e = "${nonarch_base_libdir}/firmware/ti-eth/j721e"
+FILES:${PN}-j7200 = "${nonarch_base_libdir}/firmware/ti-eth/j7200"
+FILES:${PN}-j784s4 = "${nonarch_base_libdir}/firmware/ti-eth/j784s4"
+
 # Set up names for the firmwares
-ALTERNATIVE:${PN}:j721e = "\
+ALTERNATIVE:${PN}-j721e = "\
                    j7-main-r5f0_0-fw \
                    j7-main-r5f0_0-fw-sec \
                    "

-ALTERNATIVE:${PN}:j7200 = "\
+ALTERNATIVE:${PN}-j7200 = "\
                    j7200-main-r5f0_0-fw \
                    j7200-main-r5f0_0-fw-sec \
                    "

-ALTERNATIVE:${PN}:j784s4 = "\
+ALTERNATIVE:${PN}-j784s4 = "\
                    j784s4-main-r5f0_0-fw \
                    j784s4-main-r5f0_0-fw-sec \
                    "
@@ -94,13 +84,13 @@ ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmw
 ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw-sec"

 # Create the firmware alternatives
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw]        = "${INSTALL_ETH_FW_DIR}/${ETH_FW}"
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec]    = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed"
+ALTERNATIVE_TARGET[j7-main-r5f0_0-fw]        = "${nonarch_base_libdir}/firmware/ti-eth/j721e/${ETH_FW}"
+ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec]    = "${nonarch_base_libdir}/firmware/ti-eth/j721e/${ETH_FW}.signed"

-ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw]     = "${INSTALL_ETH_FW_DIR}/${ETH_FW}"
-ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed"
+ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/ti-eth/j7200/${ETH_FW}"
+ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j7200/${ETH_FW}.signed"

-ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw]     = "${INSTALL_ETH_FW_DIR}/${ETH_FW}"
-ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed"
+ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/ti-eth/j784s4/${ETH_FW}"
+ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j784s4/${ETH_FW}.signed"

 ALTERNATIVE_PRIORITY = "5"
--- a/meta-ti-bsp/recipes-bsp/ti-hsm-fw/ti-hsm-demo-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-hsm-fw/ti-hsm-demo-fw_git.bb
@@ -0,0 +1,24 @@
+SUMMARY = "TI HSM demo Firmware"
+
+inherit deploy
+
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PV = "${TI_HSM_DEMO_FW_VERSION}"
+PR = "${INC_PR}.0"
+
+COMPATIBLE_MACHINE = "j721s2|j784s4"
+
+HSM_FW_SOC:j721s2 = "j721s2"
+HSM_FW_SOC:j784s4 = "j784s4"
+
+HSM_BINARY = "hsm-demo-firmware-${HSM_FW_SOC}*.bin"
+
+do_deploy() {
+	install -d ${DEPLOYDIR}/ti-hsm
+	install -m 644 ${S}/ti-hsm/${HSM_BINARY} ${DEPLOYDIR}/ti-hsm
+}
+
+addtask deploy before do_build after do_compile
--- 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
@@ -13,11 +13,13 @@ PRUETH_FW_AM65X_SR2_VERSION = "02.02.15.04"
 GOODIX_FW_VERSION = "1.0.0.0"
 CADENCE_MHDP_FW_VERSION = "2.1.0"
 IMG_DEC_FW_VERSION = "1.0"
-CNM_WAVE521_FW_VERSION = "1.0.7"
+CNM_WAVE521_FW_VERSION = "1.0.8"
 TI_DM_FW_VERSION = "11.00.09"
-TI_SYSFW_VERSION = "11.00.07"
+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 ?= "27003b6bff61a55dd1fff2cc777e5e07b092b1f7"
+TI_LINUX_FW_SRCREV ?= "33bec0e2ea9a25362c0c8243b2f1ed392dbc5b02"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"
@@ -42,6 +44,9 @@ 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"

--- 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
@@ -7,8 +7,6 @@ COMPATIBLE_MACHINE = "k3"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-INHIBIT_DEFAULT_DEPS = "1"
-
 inherit update-alternatives

 PLAT_SFX = ""
@@ -22,6 +20,7 @@ PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
 PLAT_SFX:am62axx = "am62axx"
+PLAT_SFX:am62dxx = "am62dxx"
 PLAT_SFX:am62pxx = "am62pxx"

 FILESEXTRAPATHS:prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"
@@ -37,20 +36,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}"
@@ -58,6 +58,7 @@ IPC_FW_LIST:am64xx =  "${MCU_1_0_FW} ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} $
 IPC_FW_LIST:am62xx =  "                            ${MCU_2_0_FW}"
 IPC_FW_LIST:am62pxx = "                            ${MCU_2_0_FW}"
 IPC_FW_LIST:am62axx = "                            ${MCU_2_0_FW}                                                                                               ${C7X_1_FW}"
+IPC_FW_LIST:am62dxx = "                            ${MCU_2_0_FW}                                                                                               ${C7X_1_FW}"
 IPC_FW_LIST:j721e =   "              ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW}                             ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}"
 IPC_FW_LIST:j7200 =   "              ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}"
 IPC_FW_LIST:j721s2 =  "              ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW}                                                     ${C7X_1_FW} ${C7X_2_FW}"
@@ -97,6 +98,14 @@ do_install:prepend:am62axx() {
        )
 }

+# Update the am62dxx ipc binaries to be consistent with other platforms
+do_install:prepend:am62dxx() {
+        ( cd ${S}/${IPC_FW_DIR}; \
+                ln -sf ipc_rpmsg_echo.mcu-r5f0_0.release.strip.out ${MCU_2_0_FW}; \
+                ln -sf ipc_rpmsg_echo.c75ss0-0.release.strip.out ${C7X_1_FW}; \
+        )
+}
+
 do_install() {
    # IPC Firmware
    for FW_NAME in ${IPC_FW_LIST}
@@ -140,6 +149,11 @@ ALTERNATIVE:${PN}:am62axx = "\
                    am62a-c71_0-fw        am62a-c71_0-fw-sec \
                    "

+ALTERNATIVE:${PN}:am62dxx = "\
+                    am62d-mcu-r5f0_0-fw   am62d-mcu-r5f0_0-fw-sec \
+                    am62d-c71_0-fw        am62d-c71_0-fw-sec \
+                    "
+
 ALTERNATIVE:${PN}:j721e = "\
                    j7-mcu-r5f0_1-fw    j7-mcu-r5f0_1-fw-sec \
                    j7-main-r5f0_0-fw   j7-main-r5f0_0-fw-sec \
@@ -230,6 +244,11 @@ ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmwar
 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_LINK_NAME[am62d-mcu-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/am62d-mcu-r5f0_0-fw"
+ALTERNATIVE_LINK_NAME[am62d-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62d-mcu-r5f0_0-fw-sec"
+ALTERNATIVE_LINK_NAME[am62d-c71_0-fw]     = "${nonarch_base_libdir}/firmware/am62d-c71_0-fw"
+ALTERNATIVE_LINK_NAME[am62d-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62d-c71_0-fw-sec"
+
 ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw]     = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw"
 ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw-sec"
 ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw"
@@ -351,6 +370,11 @@ ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_F
 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_TARGET[am62d-mcu-r5f0_0-fw]     = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
+ALTERNATIVE_TARGET[am62d-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed"
+ALTERNATIVE_TARGET[am62d-c71_0-fw]     = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}"
+ALTERNATIVE_TARGET[am62d-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed"
+
 ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw]     = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}"
 ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed"
 ALTERNATIVE_TARGET[j7-main-r5f0_0-fw]     = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
--- 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
@@ -1,12 +1,19 @@
 # NOTE: This .inc file with customizations only gets included for K3 platforms

-PV = "2.12+git"
-SRCREV_tfa = "b11beb2b6bd30b75c4bfb0e9925c0e72f16ca53f"
-SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
-SRCBRANCH = "ti-master"
+PV = "2.13+git"
+
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+SRCREV_tfa = "d90bb650fe4cb3784f62214ab5829f4051c38d0a"
+SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
+SRCBRANCH = "master"
+
+LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+SRCREV_tfa:am62lxx = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
+SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+SRCBRANCH:am62lxx = "ti-master"
+
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"

-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
 COMPATIBLE_MACHINE = "k3"

 TFA_BUILD_TARGET = "all"
@@ -18,4 +25,7 @@ TFA_INSTALL_TARGET:am62lxx = "bl31 bl1"
 TFA_SPD:am62lxx = ""

 EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
+EXTRA_OEMAKE += "${@ 'BL32_BASE=' + d.getVar('TFA_K3_BL32_BASE') if d.getVar('TFA_K3_BL32_BASE') else ''}"
+EXTRA_OEMAKE += "${@ 'PRELOADED_BL33_BASE=' + d.getVar('TFA_K3_PRELOADED_BL33') if d.getVar('TFA_K3_PRELOADED_BL33') else ''}"
 EXTRA_OEMAKE += "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
+EXTRA_OEMAKE:append:ti-falcon = " PRELOADED_BL33_BASE=0x82000000 K3_HW_CONFIG_BASE=0x88000000"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc

 SUMMARY = "Mainline U-Boot for TI devices"

-PV = "2025.01"
+PV = "2025.04"

 UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"

-SRCREV = "6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72"
+SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a"
--- 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 = "cd91d73601810374d16a1f17505ab2e72e31f75d"
+SRCREV = "d2a72467939e169210bcd8e57de4b3e6ce2ef149"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -14,6 +14,8 @@ require u-boot-mergeconfig.inc

 FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"

+FILES:${PN}-falcon = "boot/tispl_falcon.bin"
+
 SUMMARY = "u-boot bootloader for TI devices"

 LICENSE = "GPL-2.0-or-later"
@@ -40,7 +42,13 @@ DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-n
 DEPENDS:append:k3 = " ti-sci-fw"
 DEPENDS:append:k3r5 = " ti-sci-fw"

+# HSM Demo Firmware is only applicable for J721S2 & J784S4 devices
+DEPENDS:append:j721s2 = " ti-hsm-demo-fw"
+DEPENDS:append:j784s4 = " ti-hsm-demo-fw"
+
 DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
+DM_FIRMWARE:am62axx = "dm_edgeai_mcu1_0_release_strip.out"
+DM_FIRMWARE:am62pxx = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'dss_display_share.wkup-r5f0_0.release.strip.out', 'ipc_echo_testb_mcu1_0_release_strip.xer5f', d)}"

 PLAT_SFX = ""
 PLAT_SFX:j721e = "j721e"
@@ -53,13 +61,14 @@ PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
 PLAT_SFX:am62axx = "am62axx"
+PLAT_SFX:am62dxx = "am62axx"
 PLAT_SFX:am62lxx = "am62lxx"
 PLAT_SFX:am62pxx = "am62pxx"

 PACKAGECONFIG[ap-trusted-rom] = "BL1=${STAGING_DIR_HOST}/firmware/bl1.bin,,trusted-firmware-a"
 PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a"
 PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os"
-PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw"
+PACKAGECONFIG[dm] = "TI_DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw"

 PACKAGECONFIG:append:aarch64 = " atf optee"
 PACKAGECONFIG:append:j721e = " dm"
@@ -70,12 +79,13 @@ PACKAGECONFIG:append:j722s = " dm"
 PACKAGECONFIG:append:j742s2 = " dm"
 PACKAGECONFIG:append:am62xx = " dm"
 PACKAGECONFIG:append:am62axx = " dm"
+PACKAGECONFIG:append:am62dxx = " dm"
 PACKAGECONFIG:append:am62lxx = " ap-trusted-rom"
 PACKAGECONFIG:append:am62pxx = " dm"

 COMPATIBLE_MACHINE = "(ti-soc)"

-BINMAN_INDIRS="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware"
+BINMAN_INDIRS = "${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware"

 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS} BINMAN_INDIRS=${BINMAN_INDIRS}"

@@ -353,24 +363,26 @@ uboot_deploy:append () {
    fi
 }

-do_install:append:am62xx() {
-	install -d ${D}/boot
-	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
-}
-
 do_deploy:append:am62xx() {
 	install -d ${DEPLOYDIR}
 	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
 }

-do_install:append:am62pxx() {
-	install -d ${D}/boot
-	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
-}
-
 do_deploy:append:am62pxx() {
 	install -d ${DEPLOYDIR}
 	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
 }

+do_install:append:ti-falcon() {
+	install -m 0644 ${B}/tispl_falcon.bin ${D}/boot
+}
+
+FALCON_PKG = ""
+FALCON_PKG:ti-falcon = "${PN}-falcon "
+
+PACKAGES:prepend:am62xx-evm = "${FALCON_PKG} "
+PACKAGES:prepend:am62axx-evm = "${FALCON_PKG} "
+PACKAGES:prepend:am62pxx-evm = "${FALCON_PKG} "
+PACKAGES:prepend:am62xx-lp-evm = "${FALCON_PKG} "
+
 TOOLCHAIN = "gcc"
--- a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
+++ b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Radio Application Firmware"
+SUMMARY = "Radio Application Firmware"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3"

--- a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
+++ b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "VPDMA firmware for Video Input Port and Video Processing Engine"
+SUMMARY = "VPDMA firmware for Video Input Port and Video Processing Engine"

 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c"
--- a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
+++ b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "VPE test program"
+SUMMARY = "VPE test program"

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=74d2f71d8898c54e3d1c9d0058c484aa"
--- 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 = "30a1d5b2d08c0da39d4e62b3ebee591a9882fa21"
+SRCREV = "e6abc1b87f1d5bc4c2ab5f1ebfbf5a70e437dcb4"

 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"

--- a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Userspace libraries for GC320 chipset on TI SoCs"
+SUMMARY = "Userspace libraries for GC320 chipset on TI SoCs"
 HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-libs"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://Manifest.html;md5=a9121e8936ace09820d23f7626daaca5"
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
@@ -4,7 +4,7 @@

 require recipes-graphics/mesa/mesa.inc

-SUMMARY += " (with PowerVR support for TI platforms)"
+SUMMARY += " (with PowerVR for TI parts)"

 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10"

--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
@@ -4,7 +4,7 @@

 require recipes-graphics/mesa/mesa.inc

-SUMMARY += " (with PowerVR support for TI platforms)"
+SUMMARY += " (with PowerVR for TI parts)"

 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10"

--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Userspace libraries for PowerVR Rogue GPU on TI SoCs"
+SUMMARY = "Userspace libraries for PowerVR Rogue GPU on TI SoCs"
 HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Userspace libraries for PowerVR Rogue GPU on TI SoCs"
+SUMMARY = "Userspace libraries for PowerVR Rogue GPU on TI SoCs"
 HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Userspace libraries for PowerVR SGX chipset on TI SoCs"
+SUMMARY = "Userspace libraries for PowerVR SGX chipset on TI SoCs"
 HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
@@ -17,14 +17,23 @@ SRCREV = "84a396a4fb379f10931421e489ac8a199d6a9f2c"

 INITSCRIPT_NAME = "rc.pvr"
 INITSCRIPT_PARAMS = "defaults 8"
+SYSTEMD_SERVICE:${PN} = "pvrsrvctl.service"

+# Prefer udev rules over everything, but we do have init services if necessary
 PACKAGECONFIG ??= "udev"
-PACKAGECONFIG[udev] = "UDEV=true,,,udev"
+PACKAGECONFIG[udev] = "UDEV=true,UDEV=false,,udev,,sysvinit systemd"
+PACKAGECONFIG[systemd] = "SYSTEMD=true,SYSTEMD=false,,,,udev sysvinit"
+PACKAGECONFIG[sysvinit] = ",,,,,udev systemd"

-def use_sysvinit(d):
-    return d.getVar('VIRTUAL-RUNTIME_init_manager') == 'sysvinit'
+def pick_init(d):
+    packageconfig = d.getVar('PACKAGECONFIG').split()
+    if 'udev' not in packageconfig:
+        if d.getVar('VIRTUAL-RUNTIME_init_manager') == 'sysvinit':
+            return "update-rc.d"
+        return "systemd"
+    return ""

-inherit ${@oe.utils.ifelse(use_sysvinit(d), 'update-rc.d', '')}
+inherit ${@pick_init(d)}

 TARGET_PRODUCT:ti33x = "ti335x_linux"
 TARGET_PRODUCT:ti43x = "ti437x_linux"
@@ -39,6 +48,8 @@ S = "${WORKDIR}/git"

 EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} ${PACKAGECONFIG_CONFARGS}"

+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
 do_install() {
    oe_runmake install
 }
--- 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 ?= "c85877d40f8e70e1e201eca2ae1648781f238a37"
-PV = "6.12.17+git"
+SRCREV ?= "e3e551586dfad357550da433969d6d9f458e06ce"
+PV = "6.12.35+git"

 # Special configuration for remoteproc/rpmsg IPC modules
 module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
--- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.4.0+git"
-SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
+PV = "4.6.0+git"
+SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
--- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.4.0+git"
-SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
+PV = "4.6.0+git"
+SRCREV = "5306d2c7c618bb4a91df17a2d5d79ae4701af4a3"
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
@@ -3,12 +3,14 @@ inherit ti-secdev

 EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y"

-EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
+EXTRA_OEMAKE:append:k3 = " ${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
+EXTRA_OEMAKE:append:k3 = " ${@ 'CFG_TZDRAM_START='+ d.getVar('OPTEE_K3_TZDRAM_START') if d.getVar('OPTEE_K3_TZDRAM_START') else ''}"

 EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
 EXTRA_OEMAKE:append:am62lxx = " CFG_TEE_CORE_LOG_LEVEL=1"
 EXTRA_OEMAKE:append:am62pxx = " CFG_TEE_CORE_LOG_LEVEL=1"
 EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1"
+EXTRA_OEMAKE:append:am62dxx = " CFG_TEE_CORE_LOG_LEVEL=1"
 EXTRA_OEMAKE:append:j722s = " CFG_TEE_CORE_LOG_LEVEL=1"

 do_compile:append:k3() {
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
@@ -1,5 +1,5 @@
-PV = "4.5.0+git"
-SRCREV = "ef1ebdc23034a804a72da2207f1a825ce96a1464"
+PV = "4.6.0+git"
+SRCREV = "71785645fa6ce42db40dbf5a54e0eaedc4f61591"

 SRC_URI:remove = " \
    file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \
--- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
@@ -1,7 +1,7 @@
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"

-PV = "4.4.0+git"
-SRCREV = "695231ef8987866663a9ed5afd8f77d1bae3dc08"
+PV = "4.6.0+git"
+SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d"

 SRC_URI:remove = " \
    file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc
@@ -1,5 +1,6 @@
+SUMMARY = "TI Inter Process Communication (IPC) Mechanisms"
 DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)"
-HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC"
+HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:IPC"

 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255"
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
@@ -1,5 +1,6 @@
+SUMMARY = "TI Inter Process Communication (IPC) Mechanisms"
 DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)"
-HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC"
+HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:IPC"

 require ti-ipc.inc
 require ti-ipc-common.inc
--- a/meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "RPMsg DMA shared library"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=744e63d2bb8c6151dcdd97f49aa02c53"
+
+SRC_URI = "git://github.com/TexasInstruments/rpmsg-dma.git;protocol=https;branch=main"
+SRCREV = "609fd72f458ba56f80d06810509ef88d010d2c03"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+DEPENDS = "ti-rpmsg-char"
+
+EXTRA_OECMAKE += "-DBUILD_LIB=ON -DBUILD_EXAMPLE=OFF"
--- a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb
+++ b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Security development tools for High-Security(HS) TI K3 processors."
+SUMMARY = "Security development tools for High-Security(HS) TI K3 processors."
 HOMEPAGE = "https://git.ti.com/cgit/security-development-tools/core-secdev-k3"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
--- 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"

--- 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,4 +1,4 @@
-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"

--- 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"

--- a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
@@ -11,7 +11,7 @@ PR = "${INC_PR}.0"

 S = "${WORKDIR}/git/dsptop/ulm"

-DEVICE=""
+DEVICE = ""
 DEVICE:dra7xx = "DRA7xx"

 EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
@@ -42,7 +42,7 @@ 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.
--- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -26,18 +26,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 BIOSTOOLSROOT="${STAGING_DIR_TARGET}/usr/share/ti"
+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 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 TMS470CGTOOLPATH="${M4_TOOLCHAIN_INSTALL_DIR}"
-export IPCSRC="${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
+export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}"
+export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"

 EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}"

--- 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"

--- 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,4 +1,4 @@
-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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git/gdbc6x"
 inherit update-rc.d
 inherit gettext

-CFLAGS += "-fcommon"
+CFLAGS += "-fcommon -std=gnu11"

 do_configure () {
    cd ${S}
--- 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"

--- 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,4 +1,4 @@
-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"

--- 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"
--- 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"
@@ -10,8 +10,8 @@ require ../includes/ti-eula-unpack.inc
 S = "${WORKDIR}/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"
-TI_BIN_UNPK_CMDS="Y: q:workdir:Y"
+BINFILE = "bios_${PV}.bin"
+TI_BIN_UNPK_CMDS = "Y: q:workdir:Y"

 do_install() {
    CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
--- 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"
--- a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb
+++ b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb
@@ -15,7 +15,7 @@ PR = "r0"

 S = "${WORKDIR}/git/aet"

-DEVICE=""
+DEVICE = ""
 DEVICE:dra7xx = "DRA7xx"

 EXTRA_OEMAKE = "C6X_C_DIR=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x/include"
--- 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"
--- 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"
@@ -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"
-TI_BIN_UNPK_CMDS=""
-TI_BIN_UNPK_ARGS="--prefix ${S} --mode unattended"
+BINFILE = "cgxml-${PV}-linux-installer.run"
+TI_BIN_UNPK_CMDS = ""
+TI_BIN_UNPK_ARGS = "--prefix ${S} --mode unattended"

 do_install() {
    CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
--- a/Show More
+++ b/Show More