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

Updated the value(s) for:
  ti-linux-fw: TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION
  u-boot-ti-staging_2025.01: 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=1ea29f4b3ec17bdc1a3431a014ea5224962dc779..a37c82f0e25e0e3c99fdf03f1d57f7b08314a2bc
  u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=c9c21ce31fc557c2f43c4991fcc0a11b1fd90a12..da601a5231bf1b053a35c94c5d57a5658ce2e4e7
  linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=20778f6c125dc24e62767dc4837d793a0f18c319..251ed68a96e3f85a5db174c9c39dc334c0f0ba5f

Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>

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"
+        ]
+    }
+}

meta-beagle/conf/machine/beaglebone-ai64.conf

@@ -46,3 +46,9 @@ ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
 "
 
 MACHINE_GUI_CLASS = "bigscreen"
+
+# TI has moved a driver out of its kernel tree and into an out of tree module.
+# We need to not include that for older kernels since the module is still in
+# the kernel.
+TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = ""
+TI_VXE_VXD_DRIVER:bsp-bb_org-6_1 = ""

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"

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"

meta-beagle/conf/machine/include/beagle-bsp.inc

@@ -1,8 +1,52 @@
 # 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_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_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_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.6
+MACHINE_FEATURES:remove:bsp-bb_org-6_12 = "gc320"
+
+# ==========
+# bb_org-6_6
+# BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07
+# 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_6 = "linux-bb.org"
+BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
+BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
+BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
+
+BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
+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
@@ -25,25 +69,3 @@ 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"
-
-# ==========
-# bb_org-6_6
-# BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07
-# 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_6 = "linux-bb.org"
-BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
-BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
-BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
-
-BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
-BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
-BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "23%"
-
-# GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
-MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320"

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"

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

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"

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"

meta-beagle/recipes-kernel/linux/linux-bb.org-6.12/defconfig

@@ -0,0 +1 @@
+use-kernel-config=bb.org_defconfig

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"

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"
 

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
 

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:

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"

meta-ti-bsp/conf/machine/am62axx-evm.conf

@@ -20,4 +20,6 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
+FIT_CONF_DEFAULT_DTB = "ti/k3-am62a7-sk.dtb"
+
 UBOOT_MACHINE = "am62ax_evm_a53_defconfig"

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"

meta-ti-bsp/conf/machine/am62dxx-evm.conf

@@ -0,0 +1,16 @@
+#@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"

meta-ti-bsp/conf/machine/am62lxx-evm.conf

@@ -3,10 +3,11 @@
 #@DESCRIPTION: Machine configuration for the TI AM62L EVM
 
 require conf/machine/include/am62lxx.inc
+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"
 

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"

meta-ti-bsp/conf/machine/am62pxx-evm.conf

@@ -21,6 +21,8 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
+FIT_CONF_DEFAULT_DTB = "ti/k3-am62p5-sk.dtb"
+
 UBOOT_MACHINE = "am62px_evm_a53_defconfig"
 
 # UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build

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"

meta-ti-bsp/conf/machine/am62xx-evm.conf

@@ -31,4 +31,6 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
+FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
+
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"

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"

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 \
@@ -22,4 +23,6 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
+FIT_CONF_DEFAULT_DTB = "ti/k3-am62-lp-sk.dtb"
+
 UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"

meta-ti-bsp/conf/machine/am62xxsip-evm.conf

@@ -13,6 +13,8 @@ KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
 "
 
+FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
+
 UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
 
 UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"

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"
 

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"

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"
 

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"
 

meta-ti-bsp/conf/machine/include/am64xx.inc

@@ -34,3 +34,5 @@ TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am64x"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw"
+
+TI_WKS_BOOTLOADER_APPEND="console=ttyS2,115200n8"

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"

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"

meta-ti-bsp/conf/machine/include/j721e.inc

@@ -36,4 +36,8 @@ TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"
+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-j721e ${TI_VXE_VXD_DRIVER}"

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"

meta-ti-bsp/conf/machine/include/k3.inc

@@ -25,10 +25,6 @@ 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"
 
@@ -43,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"
 
@@ -55,6 +51,13 @@ MACHINE_FEATURES += "efi"
 
 WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"
 
+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}

meta-ti-bsp/conf/machine/include/ti-bsp.inc

@@ -50,12 +50,13 @@ BSP_KERNEL_VERSION:bsp-ti-6_12 = "6.12%"
 BSP_BOOTLOADER_PROVIDER:bsp-ti-6_12 = "u-boot-ti-staging"
 BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%"
 
-# GPU support requires out-of-tree SGX and Rogue drivers not available
-# in 6.12 yet
-MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu"
-
-# GC320 support requires out-of-tree drivers not yet available in 6.12
-MACHINE_FEATURES:remove:bsp-ti-6_12 = "gc320"
+BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-ti-6_12 = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_12 = "24%"
+BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"
 
 # ==========
 # ti-6_6
@@ -72,7 +73,7 @@ BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
 BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%"
-BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%"
+BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"
 
 # GC320 support requires out-of-tree drivers not yet available in 6.6
 MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320"

meta-ti-bsp/conf/machine/include/ti-falcon.inc

@@ -0,0 +1,6 @@
+IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
+KERNEL_CLASSES:remove = "kernel-fitimage"
+KERNEL_CLASSES += "kernel-fitimage-legacyhs"
+UBOOT_DTB_LOADADDRESS = "0x88000000"
+UBOOT_LOADADDRESS = "0x82000000"
+FIT_KERNEL_COMP_ALG = "none"

meta-ti-bsp/conf/machine/j722s-evm.conf

@@ -7,7 +7,7 @@ require conf/machine/include/j722s.inc
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-j722s \
     ti/k3-fpdlink \
-    ti/k3-j7200-evm-mcspi-loopback \
+    ti/k3-am625-sk-mcspi-loopback \
     ti/k3-v3link \
 "
 

meta-ti-bsp/conf/machine/j784s4-evm.conf

@@ -13,6 +13,7 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-j7200-evm-mcspi-loopback \
     ti/k3-j721s2-evm-csi2-ov5640 \
     ti/k3-j721s2-evm-fusion \
+    ti/k3-j721s2-evm-ub954 \
     ti/k3-am69-sk \
     ti/k3-v3link \
 "

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() {

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"

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"
@@ -8,9 +8,9 @@ inherit module features_check
 REQUIRED_MACHINE_FEATURES = "gc320"
 
 # Need to branch out with ${PV} var
-BRANCH = "ti-${PV}-k5.10"
+BRANCH = "ti-${PV}-k6.12"
 
-SRCREV = "e2a10f31e255a65ec30a6e10b890e77d7e9cb107"
+SRCREV = "83afddf9dbf6a8458267b4dae21ee35bfb11f3d1"
 
 SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}"
 

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
 

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"

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"
@@ -13,13 +13,13 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
 
 DEPENDS = "virtual/kernel"
 
-BRANCH = "linuxws/scarthgap/k6.6/${PV}"
+BRANCH = "linuxws/scarthgap/k6.12/${PV}"
 
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "707bb373902babf9ced5fd2f99139209ca0f605a"
+SRCREV = "8eaff654a8871118c08cfafe53795f57e3b6b396"
 
 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"

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"
@@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;
 
 S = "${WORKDIR}/git"
 
-SRCREV = "3005cf8145a6720daa47e4e273f9e421ff77cb58"
+SRCREV = "9ae0fa4998b1c624408945e062bf8fb0ea7efb9d"
 
 TARGET_PRODUCT:omap-a15 = "ti572x_linux"
 TARGET_PRODUCT:ti33x = "ti335x_linux"

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"

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"

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

meta-ti-bsp/recipes-bsp/ti-img-encode-decode/ti-vxe-vxd-driver_6.12.bb

@@ -0,0 +1,23 @@
+SUMMARY =  "Kernel drivers for Video Accelerators found in the J721E TI SoC"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://README;beginline=11;endline=12;md5=ad10b552e357ac443ec5dd2e02912b1b"
+
+inherit module
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+COMPATIBLE_MACHINE = "j721e"
+
+DEPENDS += "virtual/kernel"
+
+BRANCH = "scarthgap/k${PV}"
+
+SRC_URI = "git://git.ti.com/git/multimedia/img-vxe-vxd.git;protocol=https;branch=${BRANCH}"
+
+SRCREV = "038d9263c67900ea4eff631820b088a3dc3a6ad5"
+
+TARGET_PRODUCT:j721e = "j721e_linux"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE += 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'

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

@@ -9,20 +9,25 @@ INC_PR = "r4"
 # Firmware versions
 CORESDK_RTOS_VERSION = "08.02.00.04"
 PRUETH_FW_AM65X_VERSION = "08.00.00.20"
-PRUETH_FW_AM65X_SR2_VERSION = "02.02.15.00"
+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"
-TI_DM_FW_VERSION = "10.01.03"
-TI_SYSFW_VERSION = "10.01.08"
+CNM_WAVE521_FW_VERSION = "1.0.8"
+TI_DM_FW_VERSION = "11.00.09"
+TI_SYSFW_VERSION = "11.01.00"
+TI_HSM_DEMO_FW_VERSION = "11.00.09"
 
-TI_LINUX_FW_SRCREV ?= "5eb6ab596437555386df84e031887963e5e3a3b7"
+TI_LINUX_FW_SRCREV ?= "a37c82f0e25e0e3c99fdf03f1d57f7b08314a2bc"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
 
-SRC_URI = "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH}"
+TI_LINUX_FW_GIT_URI ?= "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git"
+TI_LINUX_FW_GIT_PROTOCOL ?= "https"
+TI_LINUX_FW_GIT_BRANCH ?= "branch=${BRANCH}"
+
+SRC_URI = "${TI_LINUX_FW_GIT_URI};protocol=${TI_LINUX_FW_GIT_PROTOCOL};${TI_LINUX_FW_GIT_BRANCH}"
 
 S = "${WORKDIR}/git"
 
@@ -38,6 +43,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"
 

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 = "am62axx"
 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,13 @@ 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 am62a-mcu-r5f0_0-fw ${MCU_2_0_FW}; \
+        )
+}
+
 do_install() {
     # IPC Firmware
     for FW_NAME in ${IPC_FW_LIST}
@@ -140,6 +148,11 @@ ALTERNATIVE:${PN}:am62axx = "\
                     am62a-c71_0-fw        am62a-c71_0-fw-sec \
                     "
 
+ALTERNATIVE:${PN}:am62dxx = "\
+                    am62a-mcu-r5f0_0-fw   am62a-mcu-r5f0_0-fw-sec \
+                    am62a-c71_0-fw        am62a-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 \

meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc

@@ -1,14 +1,22 @@
-PV:k3 = "2.12+git"
-SRCREV_tfa:k3 = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
-LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
-SRC_URI:k3 = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https;name=tfa;branch=ti-master"
-COMPATIBLE_MACHINE:k3 = "k3"
-TFA_BUILD_TARGET:k3 = "all"
-TFA_INSTALL_TARGET:k3 = "bl31"
-TFA_SPD:k3 = "opteed"
+# NOTE: This .inc file with customizations only gets included for K3 platforms
+
+PV = "2.12+git"
+SRCREV_tfa = "39fe4a856d3576646642c2516b7a99de63eca74e"
+SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+SRCBRANCH = "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"
+TFA_INSTALL_TARGET = "bl31"
+TFA_SPD = "opteed"
 
 # For am62lxx, install bl1 & bl31 using TFA_INSTALL_TARGET
 TFA_INSTALL_TARGET:am62lxx = "bl31 bl1"
+TFA_SPD:am62lxx = ""
 
-EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
-EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
+EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') 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"

meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc

@@ -1,12 +1,12 @@
 
 # This will have priority over generic uboot path
 
-COMPATIBLE_MACHINE = "am62xx|am62pxx"
+COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
 
-BRANCH = "ti-u-boot-2024.04"
-BRANCH:tie-jailhouse = "ti-u-boot-2024.04-jailhouse"
+BRANCH = "ti-u-boot-2025.01"
+BRANCH:tie-jailhouse = "ti-u-boot-2025.01-jailhouse"
 
-SRCREV = "b3c10f333acccef49ebaf4abc575616ea7326d50"
-SRCREV:tie-jailhouse = "b3c10f333acccef49ebaf4abc575616ea7326d50"
+SRCREV = "e718bbcec3ebf663c021839753034a224be4cc53"
+SRCREV:tie-jailhouse = "e718bbcec3ebf663c021839753034a224be4cc53"
 
 UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"

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"

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 = "e718bbcec3ebf663c021839753034a224be4cc53"
+SRCREV = "da601a5231bf1b053a35c94c5d57a5658ce2e4e7"

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"

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"
 

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"

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"

meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb

@@ -6,6 +6,7 @@ FW_NAME = "zephyr_openamp_rsc_table.elf"
 # List of cores for which this demo has a build
 FW_CORES        = ""
 FW_CORES:am62xx = "mcu-m4f0_0"
+FW_CORES:am64xx = "mcu-m4f0_0"
 
 # Note: Everything below is common to all our Zephyr firmwares and can be
 #       factored out to a common include file once we have more than one demo
@@ -18,7 +19,7 @@ COMPATIBLE_MACHINE = "k3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI = "git://github.com/glneo/zephyr-firmware.git;protocol=https;branch=main"
-SRCREV = "146d4f9b3930722d73685d600958f0b10ea97de2"
+SRCREV = "ef5aec48e589902839ebae7ad753c68cf498c15f"
 PV = "3.6.0"
 #PR = "r1"
 
@@ -26,6 +27,7 @@ S = "${WORKDIR}/git"
 
 FW_PLAT = ""
 FW_PLAT:am62xx = "am62"
+FW_PLAT:am64xx = "am64"
 
 FW_INSTALL_DIR = "${nonarch_base_libdir}/firmware/zephyr/${FW_PLAT}"
 

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 = "ea9938bf9cafd9c0cb05ef060a713ab4ac72270f"
 
 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
 

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"
@@ -14,7 +14,7 @@ CLEANBROKEN = "1"
 BRANCH = "ti-${PV}"
 
 SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-libs.git;protocol=https;branch=${BRANCH}"
-SRCREV = "c0afab259de59909cfe74c01f3f7fbaa147f94b5"
+SRCREV = "85c175e8425c33dda6e272aeb45afe0f69a79096"
 
 RRECOMMENDS:${PN} = "ti-gc320-driver"
 
@@ -43,4 +43,8 @@ do_install() {
     chown -R root:root ${D}
 }
 
-INSANE_SKIP:${PN} += "ldflags"
+PACKAGES = "${PN} ${PN}-dev"
+FILES:${PN} += "${libdir}/libGAL.so"
+FILES:${PN}-dev = "/usr/include"
+
+INSANE_SKIP:${PN} += "ldflags already-stripped dev-so"

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch

@@ -1,52 +0,0 @@
-From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <reatmon@ti.com>
-Date: Mon, 4 Nov 2024 13:37:29 -0600
-Subject: [PATCH] gallium: Fix build with llvm 18 and 19
-
-- CodeGenOpt::Level changed to CodeGenOoptLevel. [1]
-- llvm::sys::getHostCPUFeatures() now returns the features instead of
-modifying the passed in argument. [2]
-
-Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179]
-Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
-
-Signed-off-by: Ryan Eatmon <reatmon@ti.com>
----
- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 5e7a30a6cc2..dbc777e3096 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -366,7 +366,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
-    builder.setEngineKind(EngineKind::JIT)
-           .setErrorStr(&Error)
-           .setTargetOptions(options)
-+#if LLVM_VERSION_MAJOR >= 18
-+          .setOptLevel((CodeGenOptLevel)OptLevel);
-+#else
-           .setOptLevel((CodeGenOpt::Level)OptLevel);
-+#endif
-
- #if DETECT_OS_WINDOWS
-     /*
-@@ -394,8 +398,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
-     * which allows us to enable/disable code generation based
-     * on the results of cpuid on these architectures.
-     */
--   llvm::StringMap<bool> features;
--   llvm::sys::getHostCPUFeatures(features);
-+   #if LLVM_VERSION_MAJOR >= 19
-+      /* llvm-19+ returns StringMap from getHostCPUFeatures.
-+      */
-+      auto features = llvm::sys::getHostCPUFeatures();
-+   #else
-+      llvm::StringMap<bool> features;
-+      llvm::sys::getHostCPUFeatures(features);
-+   #endif
-
-    for (StringMapIterator<bool> f = features.begin();
-         f != features.end();
---
-2.17.1

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch

@@ -1,42 +0,0 @@
-From 00d41cd5aa3f4b494dc276c9b4ccdc096310c91f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 28 Sep 2023 15:34:22 -0700
-Subject: [PATCH] meson: use llvm-config instead of cmake to fix linking errors with meson 1.2.1
-
-meson dependency auto dependency detection uses cmake and then
-config-tool to process dependencies, in mesa the logic to detect llvm is
-using auto detection which means if it finds cmake then it will try to
-use cmake method. Cmake method works ok except a case when llvm-dev
-package is installed on the build host then it generates its own
-native.meson file and ignores OE supplied meson.native file which has
-correct llvm-config tool specified which is pointing to llvm-config from
-native sysroot. The generated meson.native file points to one found in
-/usr/bin and there onwards detector finds native install of llvm and
-configures that into building native mesa package.
-
-Since cmake detector does not always work, disable it by default and use
-config-tool which works in all cases. This is suggested in below issues
-too
-
-A similar issue is open in meson upstream [1] and mesa [2]
-
-[1] https://github.com/mesonbuild/meson/issues/10483
-[2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/6738
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25438]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/meson.build
-+++ b/meson.build
-@@ -1659,6 +1659,7 @@ with_llvm = false
- if _llvm.allowed()
-   dep_llvm = dependency(
-     'llvm',
-+    method : host_machine.system() == 'windows' ? 'auto' : 'config-tool',
-     version : _llvm_version,
-     modules : llvm_modules,
-     optional_modules : llvm_optional_modules,

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch

@@ -0,0 +1,38 @@
+From fa9cd89a85b904615ebc11da609445b5b751e68d Mon Sep 17 00:00:00 2001
+From: Satadru Pramanik <satadru@umich.edu>
+Date: Sat, 5 Oct 2024 13:35:52 +0000
+Subject: [PATCH] Update lp_bld_misc.cpp to support llvm-19+.
+
+Fixes #11896.
+cc: mesa-stable
+
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31533>
+Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
+Signed-off-by: Randolph Sapp <rs@ti.com>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 7975fcf1ac9..5b615d627ff 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -329,8 +329,14 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
+     * which allows us to enable/disable code generation based
+     * on the results of cpuid on these architectures.
+     */
+-   llvm::StringMap<bool> features;
+-   llvm::sys::getHostCPUFeatures(features);
++   #if LLVM_VERSION_MAJOR >= 19
++      /* llvm-19+ returns StringMap from getHostCPUFeatures.
++      */
++      auto features = llvm::sys::getHostCPUFeatures();
++   #else
++      llvm::StringMap<bool> features;
++      llvm::sys::getHostCPUFeatures(features);
++   #endif
+
+    for (llvm::StringMapIterator<bool> f = features.begin();
+         f != features.end();
+--
+2.47.1

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch

@@ -0,0 +1,57 @@
+From 4bd15a419e892da843489c374c58c5b29c40b5d6 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@smile.fr>
+Date: Tue, 6 Feb 2024 09:47:09 +0100
+Subject: [PATCH 1/2] drisw: fix build without dri3
+
+commit 1887368df41 ("glx/sw: check for modifier support in the kopper path")
+added dri3_priv.h header and dri3_check_multibuffer() function in drisw that
+can be build without dri3.
+
+  i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver':
+  drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer'
+  collect2: error: ld returned 1 exit status
+
+Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using
+dri3_check_multibuffer().
+
+Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path")
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478]
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/glx/drisw_glx.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
+index 3d3f752..4b19e2d 100644
+--- a/src/glx/drisw_glx.c
++++ b/src/glx/drisw_glx.c
+@@ -32,7 +32,9 @@
+ #include <dlfcn.h>
+ #include "dri_common.h"
+ #include "drisw_priv.h"
++#ifdef HAVE_DRI3
+ #include "dri3_priv.h"
++#endif
+ #include <X11/extensions/shmproto.h>
+ #include <assert.h>
+ #include <vulkan/vulkan_core.h>
+@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
+        goto handle_error;
+    }
+
++#ifdef HAVE_DRI3
+    if (pdpyp->zink) {
+       bool err;
+       psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err);
+@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
+          goto handle_error;
+       }
+    }
++#endif
+
+    glx_config_destroy_list(psc->base.configs);
+    psc->base.configs = configs;
+--
+2.44.0

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch

@@ -0,0 +1,31 @@
+From d17338d403980e1932a42f5d11c2a1fb7b25127b Mon Sep 17 00:00:00 2001
+From: MastaG <mastag@gmail.com>
+Date: Wed, 3 Jul 2024 21:00:42 +0200
+Subject: [PATCH] gallivm: Call StringMapIterator from llvm:: scope
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11392
+Fixes: b035d9cab5a4 ("gallivm: use getHostCPUFeatures on x86/llvm-4.0+.")
+Reviewed-by: David Heidelberg <david@ixit.cz>
+Signed-off-by: David Heidelberg <david@ixit.cz>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30009>
+Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/d17338d403980e1932a42f5d11c2a1fb7b25127b]
+Signed-off-by: Randolph Sapp <rs@ti.com>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 95a8a6c6a08..f3c10652ed6 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -332,7 +332,7 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
+    llvm::StringMap<bool> features;
+    llvm::sys::getHostCPUFeatures(features);
+
+-   for (StringMapIterator<bool> f = features.begin();
++   for (llvm::StringMapIterator<bool> f = features.begin();
+         f != features.end();
+         ++f) {
+       MAttrs.push_back(((*f).second ? "+" : "-") + (*f).first().str());
+--
+2.47.1

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch

@@ -1,4 +1,4 @@
-From b251af67df5a6840d2e9cc06edae2c387f8778f1 Mon Sep 17 00:00:00 2001
+From f2fe76d506f356de055b8eca83a7c9d0744a40af Mon Sep 17 00:00:00 2001
 From: Alistair Francis <alistair@alistair23.me>
 Date: Thu, 14 Nov 2019 13:04:49 -0800
 Subject: [PATCH] meson.build: check for all linux host_os combinations
@@ -20,24 +20,24 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 22385d8..15f48a6 100644
+index 35cc5f1..9a49c0d 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -121,7 +121,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -128,7 +128,7 @@
  # Only build shared_glapi if at least one OpenGL API is enabled
  with_shared_glapi = with_shared_glapi and with_any_opengl
 
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system())
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux')
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system())
++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
 
  gallium_drivers = get_option('gallium-drivers')
  if gallium_drivers.contains('auto')
-@@ -909,7 +909,7 @@ if cc.has_function('fmemopen')
+@@ -998,7 +998,7 @@
  endif
 
  # TODO: this is very incomplete
--if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android'].contains(host_machine.system())
-+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux')
+-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system())
++if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
    pre_args += '-D_GNU_SOURCE'
  elif host_machine.system() == 'sunos'
    pre_args += '-D__EXTENSIONS__'

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch

@@ -0,0 +1,41 @@
+From 62495ebb977866c52d5bed8499a547c49f0d9bc1 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@smile.fr>
+Date: Tue, 6 Feb 2024 09:47:10 +0100
+Subject: [PATCH 2/2] glxext: don't try zink if not enabled in mesa
+
+Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers")
+added an automatic zink fallback even when the zink gallium is not
+enabled at build time.
+
+It leads to unexpected error log while loading drisw driver and
+zink is not installed on the rootfs:
+
+  MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so
+
+Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers")
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478]
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/glx/glxext.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/glx/glxext.c b/src/glx/glxext.c
+index 05c825a..7a06aa9 100644
+--- a/src/glx/glxext.c
++++ b/src/glx/glxext.c
+@@ -908,9 +908,11 @@ __glXInitialize(Display * dpy)
+ #endif /* HAVE_DRI3 */
+       if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false))
+          dpyPriv->dri2Display = dri2CreateDisplay(dpy);
++#if defined(HAVE_ZINK)
+       if (!dpyPriv->dri3Display && !dpyPriv->dri2Display)
+          try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) &&
+                     !getenv("GALLIUM_DRIVER");
++#endif /* HAVE_ZINK */
+    }
+ #endif /* GLX_USE_DRM */
+    if (glx_direct)
+--
+2.44.0

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"
 

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"
 
@@ -15,8 +15,10 @@ SRC_URI = " \
     file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
     file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
     file://0001-gallium-Fix-build-with-llvm-17.patch \
-    file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \
-    file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \
+    file://0001-drisw-fix-build-without-dri3.patch \
+    file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
+    file://0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch \
+    file://0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch \
 "
 
 S = "${WORKDIR}/git"
@@ -26,19 +28,13 @@ PACKAGECONFIG:append = " \
     ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
 "
 
-SRCREV = "0e75e7ded360ea6aee4140393b30960e152f3994"
-PV = "23.2.1"
+SRCREV = "82e6a9293c476267417c5b6b906b01fb73a34e38"
+PV = "24.0.1"
 
 PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
 PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
 PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
 
-PACKAGECONFIG:remove = "video-codecs"
-PACKAGECONFIG[video-codecs] = ""
-PACKAGECONFIG:remove = "elf-tls"
-PACKAGECONFIG[elf-tls] = ""
-PACKAGECONFIG:remove = "xvmc"
-PACKAGECONFIG[xvmc] = ""
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

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"
@@ -44,7 +44,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}"
 def get_file_list(package_list_var, d):
     file_list = []
     package_list = d.getVar(package_list_var)
-    prefix = f"{d.getVar('S')}/"
+    prefix = f"{d.getVar('D')}/"
     if package_list:
         for package in package_list.split():
             package_file_string = d.getVar(f"FILES:{package}")
@@ -53,7 +53,7 @@ def get_file_list(package_list_var, d):
                     file_list.append(f"{prefix}{package_file}")
     return " ".join(file_list)
 
-do_install:prepend() {
+do_install:append() {
     if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then
         for file in ${@get_file_list('GLES_PACKAGES',  d)}; do
             rm -rf ${file}
@@ -70,13 +70,13 @@ do_install:prepend() {
         done
     fi
     if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
-        if [ -e ${S}/lib/firmware ]; then
-            mv ${S}/lib/firmware ${S}${nonarch_base_libdir}
+        if [ -e ${D}/lib/firmware ]; then
+            mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
         fi
     fi
 
     # clean up any empty directories
-    find "${S}" -empty -type d -delete
+    find "${D}" -empty -type d -delete
 }
 
 GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"

meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb

@@ -1,21 +1,17 @@
-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"
 
-inherit bin_package
-
-INHIBIT_DEFAULT_DEPS = ""
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
 
-PR = "r3"
+PR = "r4"
 
-BRANCH = "linuxws/scarthgap/k6.6/${PV}"
+BRANCH = "linuxws/scarthgap/k6.12/${PV}"
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
-SRCREV = "ba93a3e38c683ccb03a7cf8f2e7dffe2f9cbcf1c"
-S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"
+SRCREV = "1ed9ee185cd876200e6747192854015b8e94a7b0"
+S = "${WORKDIR}/git"
 
 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
@@ -45,7 +41,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}"
 def get_file_list(package_list_var, d):
     file_list = []
     package_list = d.getVar(package_list_var)
-    prefix = f"{d.getVar('S')}/"
+    prefix = f"{d.getVar('D')}/"
     if package_list:
         for package in package_list.split():
             package_file_string = d.getVar(f"FILES:{package}")
@@ -54,7 +50,12 @@ def get_file_list(package_list_var, d):
                     file_list.append(f"{prefix}{package_file}")
     return " ".join(file_list)
 
-do_install:prepend() {
+EXTRA_OEMAKE += 'BUILD=${PVR_BUILD} TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
     if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then
         for file in ${@get_file_list('GLES_PACKAGES',  d)}; do
             rm -rf ${file}
@@ -71,13 +72,16 @@ do_install:prepend() {
         done
     fi
     if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
-        if [ -e ${S}/lib/firmware ]; then
-            mv ${S}/lib/firmware ${S}${nonarch_base_libdir}
+        if [ -e ${D}/lib/firmware ]; then
+            mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
         fi
     fi
 
     # clean up any empty directories
-    find "${S}" -empty -type d -delete
+    find "${D}" -empty -type d -delete
+
+    # fix permissions
+    chown -R root:root "${D}"
 }
 
 GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"
@@ -141,6 +145,9 @@ INSANE_SKIP:${PN}-tools = "ldflags"
 FILES:${PN}-firmware = "${base_libdir}/firmware/*"
 INSANE_SKIP:${PN}-firmware += "arch"
 
+# common libraries
+FILES:${PN} = "${libdir}"
+
 RRECOMMENDS:${PN} += " \
     ${PN}-tools \
 "

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
 }

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 ?= "c9e21a1ebd757f2b4487035382bbf65299cf8170"
-PV = "6.12.9+git"
+SRCREV ?= "251ed68a96e3f85a5db174c9c39dc334c0f0ba5f"
+PV = "6.12.33+git"
 
 # Special configuration for remoteproc/rpmsg IPC modules
 module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"

meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc

@@ -2,10 +2,10 @@
 # Use different commit, repo and branch for TI extras build
 # This will have priority over generic rt path
 
-COMPATIBLE_MACHINE = "am62xx|am62pxx"
+COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
 
-BRANCH = "ti-rt-linux-6.6.y"
-BRANCH:tie-jailhouse = "ti-rt-linux-6.6.y-jailhouse"
+BRANCH = "ti-linux-6.12.y"
+BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
 
-SRCREV = "fb89cd4d622ce6cc1b7b254ae21298570d437a08"
-SRCREV:tie-jailhouse = "ea592a872ebdb974f26f6f839596e0a79e9d408b"
+SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
+SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"

meta-ti-bsp/recipes-kernel/linux/ti-extras.inc

@@ -2,13 +2,13 @@
 # Use different commit, repo and branch for TI extras build
 # This will have priority over generic rt path
 
-COMPATIBLE_MACHINE = "am62xx|am62pxx"
+COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
 
-BRANCH = "ti-linux-6.6.y"
-BRANCH:tie-jailhouse = "ti-linux-6.6.y-jailhouse"
+BRANCH = "ti-linux-6.12.y"
+BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
 
-SRCREV = "e298dab666632b6f62ed61eac35813331341c3aa"
-SRCREV:tie-jailhouse = "b45ba5ae4b724d4a09c0c7125ffb49e9d58c04f7"
+SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
+SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
 
 KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git"
 

meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc

@@ -3,12 +3,13 @@ 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: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() {
@@ -47,10 +48,6 @@ do_install:append() {
     install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true
     install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true
     install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true
-
-    # Install embedded TAs
-    mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/
-    install -D -p -m0444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
 }
 
 optee_deploy_legacyhs() {
@@ -73,7 +70,8 @@ do_deploy:append:k3() {
     ln -sf optee/bl32.elf ${DEPLOYDIR}/
 }
 
-FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/"
+# Make the OS depend on embedded TAs
+RDEPENDS:${PN} += "${PN}-ta"
 
 # This is needed for bl32.elf
 INSANE_SKIP:${PN}:append:k3 = " textrel"

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"

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

meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc

@@ -7,12 +7,11 @@ PROTOCOL = "https"
 BRANCH = "master"
 SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"
 
-# 0.6.7 release
-SRCREV = "5100a2e4a4a951e40ea0708fa78960770ec0ac33"
+# 0.6.9 release
+SRCREV = "09b064c6663ed46e4a402291dd87c8fe96135bd7"
 
-PV = "0.6.7+git"
+PV = "0.6.9+git"
 
 S = "${WORKDIR}/git"
 
-COMPATIBLE_HOST ?= "null"
-COMPATIBLE_HOST:ti-soc = "(.*)"
+COMPATIBLE_MACHINE = "^(k3)$"

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"

meta-ti-bsp/wic/sdimage-2part-efi.wks.in

@@ -3,6 +3,6 @@
 # supports EFI.  Boot files are located in the first vfat partition with extra
 # reserved space.  We cannot use a GPT here.
 
-bootloader --timeout=3 --append="rootfstype=ext4"
+bootloader --timeout=3 --append="rootfstype=ext4 ${TI_WKS_BOOTLOADER_APPEND}"
 part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
 part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid

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"
 

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"
 

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"
 

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.

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

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"