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

Updated the value(s) for: ti-linux-fw: PRUETH_FW_AM65X_SR2_VERSION,TI_LINUX_FW_SRCREV u-boot-ti-staging_2024.04: SRCREV linux-ti-staging-rt_6.6: SRCREV linux-ti-staging_6.6: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
ti-img-rogue-driver_24.1: gcc 14 compat
2026-04-18 10:42:32 +00:00 · 2024-06-28 04:00:51 -05:00 · 2024-06-26 19:29:05 -05:00 · 2024-06-26 19:29:05 -05:00 · 2024-06-26 19:29:05 -05:00 · 2024-06-26 19:29:05 -05:00
198 changed files with 2229 additions and 1985 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.pyc
+*.pyo
+*.swp
+*.orig
+*.rej
+*~
--- a/meta-ti-bsp/README
+++ b/meta-ti-bsp/README
@@ -8,11 +8,11 @@ This layer depends on:

 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: master
+branch: scarthgap

 URI: git://git.yoctoproject.org/meta-arm
 layers: meta-arm
-branch: master
+branch: scarthgap


 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
--- a/meta-ti-bsp/classes/kernel-fitimage-ti-u-boot.bbclass
+++ b/meta-ti-bsp/classes/kernel-fitimage-ti-u-boot.bbclass
@@ -1,214 +0,0 @@
-
-inherit ti-secdev
-
-# The TI u-boot requires that the kernel image is signed.  To not overload the
-# entire kernel-fitimage.bbclass from oe-core, we just overwrite one function
-# and do the signing in there.
-
-#
-# Assemble fitImage
-#
-# $1 ... .its filename
-# $2 ... fitImage name
-# $3 ... include ramdisk
-fitimage_assemble() {
-	kernelcount=1
-	dtbcount=""
-	DTBS=""
-	ramdiskcount=$3
-	setupcount=""
-	bootscr_id=""
-	rm -f $1 arch/${ARCH}/boot/$2
-
-	if [ -n "${UBOOT_SIGN_IMG_KEYNAME}" -a "${UBOOT_SIGN_KEYNAME}" = "${UBOOT_SIGN_IMG_KEYNAME}" ]; then
-		bbfatal "Keys used to sign images and configuration nodes must be different."
-	fi
-
-	fitimage_emit_fit_header $1
-
-	#
-	# Step 1: Prepare a kernel image section.
-	#
-	fitimage_emit_section_maint $1 imagestart
-
-	uboot_prep_kimage
-	fitimage_ti_secure linux.bin linux.bin.sec
-	fitimage_emit_section_kernel $1 $kernelcount linux.bin.sec "$linux_comp"
-
-	#
-	# Step 2: Prepare a DTB image section
-	#
-
-	if [ -n "${KERNEL_DEVICETREE}" ]; then
-		dtbcount=1
-		for DTB in ${KERNEL_DEVICETREE}; do
-			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'`
-			fi
-
-			# Skip ${DTB} if it's also provided in ${EXTERNAL_KERNEL_DEVICETREE}
-			if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ] && [ -s ${EXTERNAL_KERNEL_DEVICETREE}/${DTB} ]; then
-				continue
-			fi
-
-			DTB_PATH="arch/${ARCH}/boot/dts/$DTB"
-			if [ ! -e "$DTB_PATH" ]; then
-				DTB_PATH="arch/${ARCH}/boot/$DTB"
-			fi
-
-			DTB=$(echo "$DTB" | tr '/' '_')
-
-			# Skip DTB if we've picked it up previously
-			echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
-
-			fitimage_ti_secure ${DTB_PATH} ${DTB_PATH}.sec
-
-            DTBS="$DTBS $DTB"
-			fitimage_emit_section_dtb $1 $DTB ${DTB_PATH}.sec
-		done
-	fi
-
-	if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
-		dtbcount=1
-		for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtb' -printf '%P\n' | sort) \
-		$(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' -printf '%P\n' | sort); do
-			DTB=$(echo "$DTB" | tr '/' '_')
-
-			# Skip DTB/DTBO if we've picked it up previously
-			echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
-
-			fitimage_ti_secure ${EXTERNAL_KERNEL_DEVICETREE}/${DTB} ${EXTERNAL_KERNEL_DEVICETREE}/${DTB}.sec
-
-			DTBS="$DTBS $DTB"
-			fitimage_emit_section_dtb $1 $DTB "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}.sec"
-		done
-	fi
-
-	#
-	# Step 3: Prepare a u-boot script section
-	#
-
-	if [ -n "${UBOOT_ENV}" ] && [ -d "${STAGING_DIR_HOST}/boot" ]; then
-		if [ -e "${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY}" ]; then
-			cp ${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY} ${B}
-			bootscr_id="${UBOOT_ENV_BINARY}"
-			fitimage_emit_section_boot_script $1 "$bootscr_id" ${UBOOT_ENV_BINARY}
-		else
-			bbwarn "${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY} not found."
-		fi
-	fi
-
-	#
-	# Step 4: Prepare a setup section. (For x86)
-	#
-	if [ -e arch/${ARCH}/boot/setup.bin ]; then
-		setupcount=1
-		fitimage_emit_section_setup $1 $setupcount arch/${ARCH}/boot/setup.bin
-	fi
-
-	#
-	# Step 5: Prepare a ramdisk section.
-	#
-	if [ "x${ramdiskcount}" = "x1" ] && [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
-		# Find and use the first initramfs image archive type we find
-		found=
-		for img in ${FIT_SUPPORTED_INITRAMFS_FSTYPES}; do
-			initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img"
-			initramfs_local="usr/${INITRAMFS_IMAGE_NAME}.$img"
-			if [ -e "$initramfs_path" ]; then
-				bbnote "Found initramfs image: $initramfs_path"
-				found=true
-				fitimage_ti_secure ${initramfs_path} ${initramfs_local}.sec
-
-				fitimage_emit_section_ramdisk $1 "$ramdiskcount" "${initramfs_local}.sec"
-				break
-			else
-				bbnote "Did not find initramfs image: $initramfs_path"
-			fi
-		done
-
-		if [ -z "$found" ]; then
-			bbfatal "Could not find a valid initramfs type for ${INITRAMFS_IMAGE_NAME}, the supported types are: ${FIT_SUPPORTED_INITRAMFS_FSTYPES}"
-		fi
-	fi
-
-	fitimage_emit_section_maint $1 sectend
-
-	# Force the first Kernel and DTB in the default config
-	kernelcount=1
-	if [ -n "$dtbcount" ]; then
-		dtbcount=1
-	fi
-
-	#
-	# Step 6: Prepare a configurations section
-	#
-	fitimage_emit_section_maint $1 confstart
-
-	# kernel-fitimage.bbclass currently only supports a single kernel (no less or
-	# more) to be added to the FIT image along with 0 or more device trees and
-	# 0 or 1 ramdisk.
-        # It is also possible to include an initramfs bundle (kernel and rootfs in one binary)
-        # When the initramfs bundle is used ramdisk is disabled.
-	# If a device tree is to be part of the FIT image, then select
-	# the default configuration to be used is based on the dtbcount. If there is
-	# no dtb present than select the default configuation to be based on
-	# the kernelcount.
-	if [ -n "$DTBS" ]; then
-		i=1
-		for DTB in ${DTBS}; do
-			dtb_ext=${DTB##*.}
-			if [ "$dtb_ext" = "dtbo" ]; then
-				fitimage_emit_section_config $1 "" "$DTB" "" "$bootscr_id" "" "`expr $i = $dtbcount`"
-			else
-				fitimage_emit_section_config $1 $kernelcount "$DTB" "$ramdiskcount" "$bootscr_id" "$setupcount" "`expr $i = $dtbcount`"
-			fi
-			i=`expr $i + 1`
-		done
-	else
-		defaultconfigcount=1
-		fitimage_emit_section_config $1 $kernelcount "" "$ramdiskcount" "$bootscr_id"  "$setupcount" $defaultconfigcount
-	fi
-
-	fitimage_emit_section_maint $1 sectend
-
-	fitimage_emit_section_maint $1 fitend
-
-	#
-	# Step 7: Assemble the image
-	#
-	${UBOOT_MKIMAGE} \
-		${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-		-f $1 \
-		arch/${ARCH}/boot/$2
-
-	#
-	# Step 8: Sign the image and add public key to U-Boot dtb
-	#
-	if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
-		add_key_to_u_boot=""
-		if [ -n "${UBOOT_DTB_BINARY}" ]; then
-			# The u-boot.dtb is a symlink to UBOOT_DTB_IMAGE, so we need copy
-			# both of them, and don't dereference the symlink.
-			cp -P ${STAGING_DATADIR}/u-boot*.dtb ${B}
-			add_key_to_u_boot="-K ${B}/${UBOOT_DTB_BINARY}"
-		fi
-		${UBOOT_MKIMAGE_SIGN} \
-			${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-			-F -k "${UBOOT_SIGN_KEYDIR}" \
-			$add_key_to_u_boot \
-			-r arch/${ARCH}/boot/$2 \
-			${UBOOT_MKIMAGE_SIGN_ARGS}
-	fi
-}
-
-fitimage_ti_secure() {
-	if test -n "${TI_SECURE_DEV_PKG}"; then
-		export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh $1 $2
-	else
-		cp $1 $2
-	fi
-}
-
--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-bsp"
 BBFILE_PATTERN_meta-ti-bsp := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti-bsp = "6"

-LAYERSERIES_COMPAT_meta-ti-bsp = "kirkstone langdale mickledore"
+LAYERSERIES_COMPAT_meta-ti-bsp = "scarthgap"

 LICENSE_PATH += "${LAYERDIR}/licenses"

@@ -18,8 +18,17 @@ LAYERDEPENDS_meta-ti-bsp = " \
    meta-arm \
 "

+BBFILES_DYNAMIC += " \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes*/*/*.bbappend \
+"
+
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
    mesa-pvr \
 "

 HOSTTOOLS_NONFATAL += "truncate xxd comm"
+
+TI_COMMON_DEPLOY ?= "${TOPDIR}/deploy-ti"
+DEPLOY_DIR_IMAGE:ti-soc = "${TI_COMMON_DEPLOY}/images/${MACHINE}"
+SDK_DEPLOY:ti-soc = "${TI_COMMON_DEPLOY}/sdk"
+PSEUDO_IGNORE_PATHS:append:ti-soc = ",${TI_COMMON_DEPLOY}"
--- a/meta-ti-bsp/conf/machine/am335x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-evm.conf
@@ -10,7 +10,6 @@ IMAGE_FSTYPES += "ubifs ubi"

 # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -23,7 +22,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 12000"
+MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 13000"

 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
--- a/meta-ti-bsp/conf/machine/am437x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-evm.conf
@@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyS0"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 5500"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 8000"

 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:
--- a/meta-ti-bsp/conf/machine/am57xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf
@@ -10,24 +10,28 @@ SERIAL_CONSOLES = "115200;ttyS2"

 KERNEL_DEVICETREE_PREFIX = " \
    am57 \
+    ov10635 \
    ti/am57 \
    ti/lcd \
    ti/ov10635 \
+    ti/omap/am57 \
 "

 KERNEL_DEVICETREE_DTBMERGE = " \
    am57xx-evm.dtb \
    am57xx-evm-reva3.dtb \
+    ti/omap/am57xx-evm.dtb \
+    ti/omap/am57xx-evm-reva3.dtb \
 "

 KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
-    am5729-beagleboneai.dtb \
-    am571x-idk.dtb \
-    am572x-idk.dtb \
-    am574x-idk.dtb \
+    ti/omap/am57xx-beagle-x15.dtb \
+    ti/omap/am57xx-beagle-x15-revb1.dtb \
+    ti/omap/am57xx-beagle-x15-revc.dtb \
+    ti/omap/am5729-beagleboneai.dtb \
+    ti/omap/am571x-idk.dtb \
+    ti/omap/am572x-idk.dtb \
+    ti/omap/am574x-idk.dtb \
 "

 UBOOT_MACHINE = "am57xx_evm_config"
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -6,7 +6,9 @@ require conf/machine/include/am62axx.inc

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62a7 \
+    ti/k3-am62x-sk \
    ti/k3-fpdlink \
+    ti/k3-v3link \
 "

 KERNEL_DEVICETREE = " \
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: AM62PX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62Px EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
+
+SYSFW_SOC = "am62px"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62px_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@NAME: AM62PX EVM
+#@DESCRIPTION: Machine configuration for the TI AM62PX EVM
+
+require conf/machine/include/am62pxx.inc
+require conf/machine/include/ti-extras.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am62p5 \
+    ti/k3-am62x-sk-csi2 \
+    ti/k3-am62x-sk-hdmi \
+    ti/k3-am62x-sk-lpm \
+"
+
+KERNEL_DEVICETREE = " \
+    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
+# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
+# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
+# For AM62P tisdk-display-cluster image, splash screen is handled by SBL.
+# Hence, disable the A53 based splash screen using the am62px_evm_prune_splashscreen.config fragment present in ti-u-boot tree
+UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -5,7 +5,10 @@
 require conf/machine/include/am62xx.inc
 require conf/machine/include/ti-extras.inc

-KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"

 KERNEL_DEVICETREE = " \
    ti/k3-am625-sk.dtb \
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)

 require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc

 SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -3,10 +3,14 @@
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM

 require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62-lp \
    ti/k3-am625-sk \
+    ti/k3-am62x-sk-hdmi \
+    ti/k3-am62x-sk-lpm \
+    ti/k3-am62x-sk-mcan \
 "

 KERNEL_DEVICETREE = " \
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: AM62XX SIP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+
+UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: AM62XX SIP EVM
+#@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
+
+require conf/machine/include/am62xx.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am625-sk.dtb \
+"
+
+UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
+
+UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am65xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-evm.conf
@@ -5,3 +5,5 @@
 require conf/machine/include/am65xx.inc

 UBOOT_MACHINE = "am65x_evm_a53_defconfig"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw"
--- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
@@ -8,4 +8,4 @@ SYSFW_SOC = "am65x_sr2"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"

-UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
+UBOOT_MACHINE = "am65x_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
@@ -4,4 +4,4 @@

 require conf/machine/include/am65xx.inc

-UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
+UBOOT_MACHINE = "am65x_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM68 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM68 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am68_sk_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am68-sk.conf
+++ b/meta-ti-bsp/conf/machine/am68-sk.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM68 SK
+#@DESCRIPTION: Machine configuration for the TI AM68 SK
+
+require conf/machine/include/am68.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am68-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am68-sk-base-board.dtb \
+"
+
+UBOOT_MACHINE = "am68_sk_a72_defconfig"
--- a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am69-sk.conf
+++ b/meta-ti-bsp/conf/machine/am69-sk.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/am69.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
@@ -2,16 +2,25 @@
 #@NAME: BeagleBoard X15
 #@DESCRIPTION: Machine configuration for the BeagleBoard X15

+TI_PREFERRED_BSP ?= "bb_org"
+
 require conf/machine/include/am57xx.inc

-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
+DT_VENDOR_PREFIX = "ti/omap/"
+DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
+DT_VENDOR_PREFIX:bsp-bb_org = ""

-KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
+KERNEL_DEVICETREE_PREFIX = " \
+${DT_VENDOR_PREFIX}am57xx-beagle-x15 \
+${DT_VENDOR_PREFIX}am57xx-idk-lcd \
+"

 KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
+${DT_VENDOR_PREFIX}am57xx-beagle-x15.dtb \
+${DT_VENDOR_PREFIX}am57xx-beagle-x15-revb1.dtb \
+${DT_VENDOR_PREFIX}am57xx-beagle-x15-revc.dtb \
+${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2045.dtbo \
+${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2587.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
@@ -2,6 +2,8 @@
 #@NAME: BeagleBone AI-64 (R5F)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core)

+TI_PREFERRED_BSP ?= "bb_org"
+
 require conf/machine/include/k3r5.inc

 SYSFW_SOC = "j721e"
@@ -15,3 +17,7 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"

 UBOOT_MACHINE = "j721e_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -2,71 +2,45 @@
 #@NAME: BeagleBone AI-64 (A72)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)

+TI_PREFERRED_BSP ?= "bb_org"
+
 require conf/machine/include/j721e.inc

-UBOOT_MACHINE = "j721e_evm_a72_config"
+IMAGE_SR1_1_HS_FS_FILES:bsp-bb_org = ""
+IMAGE_SR2_HS_SE_FILES:bsp-bb_org = ""

-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
+UBOOT_MACHINE = "j721e_evm_a72_config"
+UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config"
+
+SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
+SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-j721e \
+"

 KERNEL_DEVICETREE = " \
 ti/k3-j721e-beagleboneai64.dtb \
-ti/k3-j721e-beagleboneai64-no-shared-mem.dtb \
 ti/k3-j721e-common-proc-board.dtb \
-ti/k3-j721e-common-proc-board-infotainment.dtbo \
-ti/k3-j721e-common-proc-board-uarts.dtbo \
-ti/k3-j721e-cpb-csi2-ov5640.dtbo \
-ti/k3-j721e-fpdlink-cpb-fusion.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
-ti/k3-j721e-fpdlink-sk-fusion.dtbo \
-ti/k3-j721e-gesi-exp-board.dtbo \
-ti/k3-j721e-proc-board-tps65917.dtb \
-ti/k3-j721e-quad-port-eth-exp.dtbo \
-ti/k3-j721e-sk-csi2-ov5640.dtbo \
+ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
 ti/k3-j721e-sk.dtb \
-ti/k3-j721e-sk-rpi-cam-imx219.dtbo \
+"
+
+KERNEL_DEVICETREE:append:bsp-bb_org = " \
+ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
+ti/k3-j721e-common-proc-board-infotainment.dtbo \
+ti/k3-j721e-evm-csi2-ov5640.dtbo \
+ti/k3-j721e-evm-fusion.dtbo \
+ti/k3-j721e-evm-pcie0-ep.dtbo \
+ti/k3-j721e-evm-virt-mac-client.dtbo \
+ti/k3-j721e-sk-csi2-ov5640.dtbo \
+ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
+ti/k3-j721e-sk-fusion.dtbo \
 ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
-ti/overlays/BBAI64-CSI0-imx219.dtbo \
-ti/overlays/BBAI64-CSI1-imx219.dtbo \
-ti/overlays/BBAI64-DSI-RPi-7inch-panel.dtbo \
-ti/overlays/BBAI64-P8_37-ehrpwm5_a.dtbo \
-ti/overlays/BBAI64-P9_25-ehrpwm4_b.dtbo \
-ti/overlays/BB-I2C2-MPU6050.dtbo \
-ti/overlays/BBORG_LOAD-00A2.dtbo \
-ti/overlays/BBORG_RELAY-00A2.dtbo \
-ti/overlays/BBORG_SERVO-00A2.dtbo \
-ti/overlays/BONE-FAN.dtbo \
-ti/overlays/BONE-I2C1.dtbo \
-ti/overlays/BONE-I2C2.dtbo \
-ti/overlays/BONE-I2C3.dtbo \
-ti/overlays/BONE-LED_P8_03.dtbo \
-ti/overlays/BONE-LED_P9_11.dtbo \
-ti/overlays/BONE-PWM0.dtbo \
-ti/overlays/BONE-PWM1.dtbo \
-ti/overlays/BONE-PWM2.dtbo \
-ti/overlays/BONE-SPI0_0.dtbo \
-ti/overlays/BONE-SPI0_1.dtbo \
-ti/overlays/BONE-SPI1_0.dtbo \
-ti/overlays/BONE-UART1.dtbo \
-ti/overlays/BONE-USB0-host.dtbo \
-ti/overlays/J721E-PRU-UIO-00A0.dtbo \
-ti/overlays/k3-j721e-beagleboneai64-RPi-7inch-panel.dtbo \
-ti/overlays/robotics-cape.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
@@ -2,24 +2,34 @@
 #@NAME: BeagleBone machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board

+TI_PREFERRED_BSP ?= "bb_org"
+
 require conf/machine/include/ti33x.inc

-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
+DT_VENDOR_PREFIX = "ti/omap/"
+DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
+DT_VENDOR_PREFIX:bsp-bb_org = ""

-KERNEL_DEVICETREE_PREFIX = "am335x-bone"
+KERNEL_DEVICETREE_PREFIX = " \
+${DT_VENDOR_PREFIX}am335x-bone \
+${DT_VENDOR_PREFIX}am335x-pocketbeagle \
+${DT_VENDOR_PREFIX}am335x-sancloud-bbe \
+"

 KERNEL_DEVICETREE = " \
-    am335x-bone.dtb \
-    am335x-boneblue.dtb \
-    am335x-boneblack.dtb \
-    am335x-boneblack-wireless.dtb \
-    am335x-bonegreen.dtb \
-    am335x-bonegreen-wireless.dtb \
+${DT_VENDOR_PREFIX}am335x-bone.dtb \
+${DT_VENDOR_PREFIX}am335x-boneblack.dtb \
+${DT_VENDOR_PREFIX}am335x-boneblack-wireless.dtb \
+${DT_VENDOR_PREFIX}am335x-boneblue.dtb \
+${DT_VENDOR_PREFIX}am335x-bonegreen.dtb \
+${DT_VENDOR_PREFIX}am335x-bonegreen-wireless.dtb \
+${DT_VENDOR_PREFIX}am335x-pocketbeagle.dtb \
+${DT_VENDOR_PREFIX}am335x-sancloud-bbe.dtb \
+${DT_VENDOR_PREFIX}am335x-sancloud-bbe-extended-wifi.dtb \
+${DT_VENDOR_PREFIX}am335x-sancloud-bbe-lite.dtb \
 "

 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_FEATURES += "screen"

 SERIAL_CONSOLES = "115200;ttyS0"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
--- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
@@ -9,3 +9,8 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"

 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -8,10 +8,9 @@ SOC_FAMILY:append = ":am62xx"
 MACHINE_FEATURES += "screen gpu"

 SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
@@ -19,51 +18,61 @@ TFA_K3_SYSTEM_SUSPEND = "1"
 OPTEEMACHINE = "k3-am62x"

 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig"

-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_a53.config"
+
+SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
+SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"

 KERNEL_DEVICETREE = " \
 ti/k3-am625-beagleplay.dtb \
-ti/k3-am625-sk-csi2-ov5640.dtbo \
-ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \
 ti/k3-am625-sk.dtb \
+ti/k3-am62x-sk-hdmi-audio.dtbo \
+"
+
+KERNEL_DEVICETREE:append:bsp-bb_org = " \
+ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-beaglemod.dtb \
+ti/k3-am625-beaglemod-audio.dtbo \
+ti/k3-am625-beaglemod-can0.dtbo \
+ti/k3-am625-beaglemod-can1.dtbo \
+ti/k3-am625-beaglemod-csi0-ov5640.dtbo \
+ti/k3-am625-beaglemod-eeprom.dtbo \
+ti/k3-am625-beaglemod-eth.dtbo \
+ti/k3-am625-beaglemod-hdmi.dtbo \
+ti/k3-am625-beaglemod-io-expand.dtbo \
+ti/k3-am625-beaglemod-lt-lcd185.dtbo \
+ti/k3-am625-beaglemod-ospi-flash.dtbo \
+ti/k3-am625-beaglemod-rs485-1.dtbo \
+ti/k3-am625-beaglemod-rs485-2.dtbo \
+ti/k3-am625-beaglemod-rtc.dtbo \
+ti/k3-am625-beaglemod-wl1835.dtbo \
+ti/k3-am625-sk-dmtimer-pwm.dtbo \
 ti/k3-am625-sk-ecap-capture.dtbo \
-ti/k3-am625-skeleton.dtb \
-ti/k3-am625-sk-hdmi-audio.dtbo \
-ti/k3-am625-sk-lpmdemo.dtb \
-ti/k3-am625-sk-mcan.dtbo \
-ti/k3-am625-sk-oldi-panel.dtbo \
-ti/k3-am625-sk-qspi-flash.dtbo \
-ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
-ti/k3-am625-sk-rpi-hdr-spi.dtbo \
-ti/overlays/BBAI64-CSI0-imx219.dtbo \
-ti/overlays/BBAI64-CSI1-imx219.dtbo \
-ti/overlays/BBAI64-DSI-RPi-7inch-panel.dtbo \
-ti/overlays/BBAI64-P8_37-ehrpwm5_a.dtbo \
-ti/overlays/BBAI64-P9_25-ehrpwm4_b.dtbo \
-ti/overlays/BB-I2C2-MPU6050.dtbo \
-ti/overlays/BBORG_LOAD-00A2.dtbo \
-ti/overlays/BBORG_RELAY-00A2.dtbo \
-ti/overlays/BBORG_SERVO-00A2.dtbo \
-ti/overlays/BONE-FAN.dtbo \
-ti/overlays/BONE-I2C1.dtbo \
-ti/overlays/BONE-I2C2.dtbo \
-ti/overlays/BONE-I2C3.dtbo \
-ti/overlays/BONE-LED_P8_03.dtbo \
-ti/overlays/BONE-LED_P9_11.dtbo \
-ti/overlays/BONE-PWM0.dtbo \
-ti/overlays/BONE-PWM1.dtbo \
-ti/overlays/BONE-PWM2.dtbo \
-ti/overlays/BONE-SPI0_0.dtbo \
-ti/overlays/BONE-SPI0_1.dtbo \
-ti/overlays/BONE-SPI1_0.dtbo \
-ti/overlays/BONE-UART1.dtbo \
-ti/overlays/BONE-USB0-host.dtbo \
-ti/overlays/k3-am625-beagleplay-bcfserial-no-firmware.dtbo \
-ti/overlays/k3-am625-beagleplay-csi2-ov5640.dtbo \
-ti/overlays/k3-am625-beagleplay-lt-lcd185.dtbo \
-ti/overlays/robotics-cape.dtbo \
+ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-sk-mcspi-loopback.dtbo \
+ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
+ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
+ti/k3-am625-sk-pwm.dtbo \
+ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
+ti/k3-am62x-sk-csi2-imx219.dtbo \
+ti/k3-am62x-sk-csi2-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
+ti/k3-am62x-sk-eqep.dtbo \
+ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \
+ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
+ti/k3-am62x-sk-mcan.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
--- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
@@ -12,14 +12,15 @@ KERNEL_DEVICETREE_PREFIX = " \
    dra7 \
    ti/dra7 \
    ti/lcd \
+    ti/omap/dra7 \
 "

 KERNEL_DEVICETREE = " \
-    dra7-evm.dtb \
-    dra71-evm.dtb \
-    dra72-evm.dtb \
-    dra72-evm-revc.dtb \
-    dra76-evm.dtb \
+    ti/omap/dra7-evm.dtb \
+    ti/omap/dra71-evm.dtb \
+    ti/omap/dra72-evm.dtb \
+    ti/omap/dra72-evm-revc.dtb \
+    ti/omap/dra76-evm.dtb \
 "

 UBOOT_MACHINE = "dra7xx_evm_config"
--- a/meta-ti-bsp/conf/machine/include/am57xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am57xx.inc
@@ -3,3 +3,5 @@ SOC_FAMILY:append = ":dra7xx"
 SOC_FAMILY:append = ":am57xx"

 MACHINE_FEATURES += "pci"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw"
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -16,3 +16,5 @@ IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"

 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -0,0 +1,22 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":am62pxx"
+
+MACHINE_FEATURES += "screen gpu"
+
+require conf/machine/include/mesa-pvr.inc
+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"
+
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
+
+SERIAL_CONSOLES = "115200;ttyS2"
+
+# Bitmap image tarball for early splashscreen
+IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am62xx"
 MACHINE_FEATURES += "screen gpu"

 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 # Default tiboot3.bin on AM62x is for HS-FS
 IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -20,3 +20,5 @@ IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 TFA_BOARD = "lite"

 OPTEEMACHINE = "k3-am64x"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw"
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am65xx"
 MACHINE_FEATURES += "screen touchscreen gpu"

 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= ""
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"

 KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"

@@ -25,3 +25,5 @@ IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
 TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-am65x"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw"
--- a/meta-ti-bsp/conf/machine/include/am68.inc
+++ b/meta-ti-bsp/conf/machine/include/am68.inc
@@ -0,0 +1,19 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":j721s2"
+
+MACHINE_FEATURES += "screen gpu"
+
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
+
+# Default tiboot3.bin on AM68 is for SR1.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
+
+TFA_BOARD = "generic"
+
+OPTEEMACHINE = "k3-j784s4"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw"
--- a/meta-ti-bsp/conf/machine/include/am69.inc
+++ b/meta-ti-bsp/conf/machine/include/am69.inc
@@ -0,0 +1,19 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":j784s4"
+
+MACHINE_FEATURES += "screen gpu"
+
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
+
+# Default tiboot3.bin on AM69 is for SR1.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
+
+TFA_BOARD = "j784s4"
+
+OPTEEMACHINE = "k3-j784s4"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -1,6 +1,27 @@
 require conf/machine/include/k3.inc
 SOC_FAMILY:append = ":j7200"

+# Default tiboot3.bin on J7200 is for GP
+IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
+
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS
+IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
+IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
+
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
+IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
+IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"
+
 TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-j721e"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw"
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721e"
 MACHINE_FEATURES += "screen gpu"

 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 IMAGE_BOOT_FILES += "sysfw.itb"

@@ -12,14 +12,26 @@ IMAGE_BOOT_FILES += "sysfw.itb"
 IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
 IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"

-# Since default on J721e is for GP, add a version for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb"
+# Since default on J721e is for GP, add a version for SR1.1 HS-FS
+IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
+IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"

-# Since default on J721e is for GP, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
+# Since default on J721e is for GP, add a version for SR1.1 HS-SE
+IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
+IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
+
+# Since default on J721e is for GP, add a version for SR2.0 HS-FS
+IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
+IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
+
+# Since default on J721e is for GP, add a version for SR2.0 HS-SE
+IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
+IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"

 TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-j721e"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -4,8 +4,19 @@ SOC_FAMILY:append = ":j721s2"
 MACHINE_FEATURES += "screen gpu"

 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
+
+# Default tiboot3.bin on J721S2 is for GP
+IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"

 TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-j784s4"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw"
--- a/meta-ti-bsp/conf/machine/include/j722s.inc
+++ b/meta-ti-bsp/conf/machine/include/j722s.inc
@@ -0,0 +1,24 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":j722s"
+
+MACHINE_FEATURES += "screen gpu"
+
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
+
+# Default tiboot3.bin on J722S is for HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE
+IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
+IMAGE_SR1_HS_SE_FILES:bsp-next = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
+
+SERIAL_CONSOLES = "115200;ttyS2"
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -4,8 +4,19 @@ SOC_FAMILY:append = ":j784s4"
 MACHINE_FEATURES += "screen gpu"

 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
+
+# Default tiboot3.bin on J784S4 is for GP
+IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
+
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"

 TFA_BOARD = "j784s4"

 OPTEEMACHINE = "k3-j784s4"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -7,12 +7,7 @@ require conf/machine/include/arm/arch-arm64.inc

 BBMULTICONFIG += "k3r5"

-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r0"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+require conf/machine/include/ti-bsp.inc

 KERNEL_IMAGETYPE = "Image"
 KERNEL_IMAGETYPES = "Image fitImage"
@@ -40,6 +35,8 @@ FIT_SIGN_ALG ?= "rsa4096"

 EXTRA_IMAGEDEPENDS += "virtual/bootloader"

+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image"
+
 TFA_PLATFORM = "k3"

 # Use the expected value of the ubifs filesystem's volume name in the kernel
@@ -60,7 +57,6 @@ MACHINE_FEATURES += "efi"
 WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"

 do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
+do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"

 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
--- a/meta-ti-bsp/conf/machine/include/k3r5.inc
+++ b/meta-ti-bsp/conf/machine/include/k3r5.inc
@@ -11,17 +11,17 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc
 # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst
 # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst
 # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+
+require conf/machine/include/ti-bsp.inc
+PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"

 SPL_SUFFIX = "bin"
 SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
 SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}"
 UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "u-boot-r5spl.${UBOOT_SUFFIX}"
 UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-${MAINMACHINE}.${UBOOT_SUFFIX}"

 PACKAGECONFIG:pn-u-boot-ti-staging = ""
 PACKAGECONFIG:pn-u-boot-ti-mainline = ""
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -4,16 +4,11 @@ SOC_FAMILY:append = ":omap-a15"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/arm/armv7a/tune-cortexa15.inc

-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r7"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+require conf/machine/include/ti-bsp.inc

 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= ""
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
 PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"

 KERNEL_IMAGETYPE = "zImage"
@@ -24,7 +19,7 @@ UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","").replace("ti/","")}"

 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
@@ -40,6 +35,10 @@ UBOOT_SUFFIX = "img"

 EXTRA_IMAGEDEPENDS += "virtual/bootloader"

+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw"
+
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
--- a/meta-ti-bsp/conf/machine/include/omapl138.inc
+++ b/meta-ti-bsp/conf/machine/include/omapl138.inc
@@ -5,10 +5,10 @@ require conf/machine/include/arm/armv5/tune-arm926ejs.inc

 KERNEL_IMAGETYPE = "zImage"

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+require conf/machine/include/ti-bsp.inc

 EXTRA_IMAGEDEPENDS += "virtual/bootloader"

+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
+
 MACHINE_FEATURES = "serial usbhost usbgadget alsa"
--- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
@@ -0,0 +1,122 @@
+# Support multiple BSP providers
+# The main input is TI_PREFERRED_BSP, which translates into default
+# preferences for kernel, bootloader and graphics components, as
+# well as a dedicated machine override.
+
+# Supported options are: mainline, next, ti-6_6, ti-6_1, bb_org
+TI_PREFERRED_BSP ??= "ti-6_6"
+
+# Use bsp-* namespace for overrides
+MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:"
+
+# ==========
+# mainline
+# latest upstream/mainline kernel, u-boot
+# ==========
+BSP_KERNEL_PROVIDER:bsp-mainline = "linux-ti-mainline"
+BSP_KERNEL_VERSION:bsp-mainline = "%"
+BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline"
+BSP_BOOTLOADER_VERSION:bsp-mainline = "%"
+
+# GPU support requires out-of-tree SGX and Rogue drivers not available
+# in mainline, usually present in TI staging or derivative like BB.org
+MACHINE_FEATURES:remove:bsp-mainline = "gpu"
+
+# ==========
+# next
+# upcoming upstream/mainline kernel, u-boot
+# ==========
+BSP_KERNEL_PROVIDER:bsp-next = "linux-ti-next"
+BSP_KERNEL_VERSION:bsp-next = "%"
+BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-mainline"
+BSP_BOOTLOADER_VERSION:bsp-next = "%"
+
+# GPU support requires out-of-tree SGX and Rogue drivers not available
+# in next, usually present in TI staging or derivative like BB.org
+MACHINE_FEATURES:remove:bsp-next = "gpu"
+
+# ==========
+# ti-6_6
+# TI staging kernel 6.6, u-boot 2024.04
+# ==========
+BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging"
+BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%"
+BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging"
+BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024%"
+
+# Only Rogue is enabled so far, SGX falls back to SW rendering
+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%"
+
+# ==========
+# ti-6_1
+# TI staging kernel 6.1, u-boot 2023.04
+# ==========
+BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging"
+BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1%"
+BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging"
+BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023%"
+
+BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-ti-6_1 = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%"
+BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%"
+
+# ==========
+# bb_org
+# 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 = "linux-bb.org"
+BSP_KERNEL_VERSION:bsp-bb_org = "%"
+BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org"
+BSP_BOOTLOADER_VERSION:bsp-bb_org = "%"
+
+BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%"
+BSP_MESA_PVR_VERSION:bsp-bb_org = "22%"
+
+# ==========
+# sane fallback defaults
+# if specific values are not defined or bsp is set incorrectly
+# use default preference TI staging and SW-rendering graphics
+# ==========
+BSP_KERNEL_PROVIDER ?= "linux-ti-staging"
+BSP_KERNEL_VERSION ?= "%"
+BSP_BOOTLOADER_PROVIDER ?= "u-boot-ti-staging"
+BSP_BOOTLOADER_VERSION ?= "%"
+
+BSP_SGX_DRIVER_PROVIDER ?= ""
+BSP_SGX_DRIVER_VERSION ?= ""
+BSP_ROGUE_DRIVER_PROVIDER ?= ""
+BSP_ROGUE_DRIVER_VERSION ?= ""
+BSP_SGX_UMLIBS_VERSION ?= ""
+BSP_ROGUE_UMLIBS_VERSION ?= ""
+BSP_MESA_PVR_VERSION ?= ""
+
+# ==========
+# global preferences
+# ==========
+PREFERRED_PROVIDER_virtual/kernel ?= "${BSP_KERNEL_PROVIDER}"
+PREFERRED_VERSION_${BSP_KERNEL_PROVIDER} ?= "${BSP_KERNEL_VERSION}"
+PREFERRED_PROVIDER_virtual/bootloader ?= "${BSP_BOOTLOADER_PROVIDER}"
+PREFERRED_PROVIDER_u-boot ?= "${BSP_BOOTLOADER_PROVIDER}"
+PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
+
+# GPU provider gets set in machine configs, as some machines are headless
+# Select default preferred versions here
+PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}"
+PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}"
+PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}"
+PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}"
+PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}"
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -1,5 +1,8 @@
 # This is a generic TI SOC family. It is a superset of all other SOCs
 # and platforms defined in meta-ti to allow BSP-level overrides.
 SOC_FAMILY = "ti-soc"
-KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
 require conf/machine/include/soc-family.inc
+
+# TI platforms all use devicetrees with overlays
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
+KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -4,35 +4,32 @@ SOC_FAMILY:append = ":ti33x"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/arm/armv7a/tune-cortexa8.inc

-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r22"
-
-# Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+require conf/machine/include/ti-bsp.inc

 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= ""
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
 PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"

 KERNEL_IMAGETYPE = "zImage"

-KERNEL_DEVICETREE_PREFIX = "am335x"
+KERNEL_DEVICETREE_PREFIX = " \
+    am335x \
+    ti/omap/am335x \
+"

 KERNEL_DEVICETREE = " \
-    am335x-evm.dtb \
-    am335x-evmsk.dtb \
-    am335x-icev2.dtb \
-    am335x-pocketbeagle.dtb \
-    am335x-bone.dtb \
-    am335x-boneblue.dtb \
-    am335x-bonegreen.dtb \
-    am335x-bonegreen-wireless.dtb \
-    am335x-boneblack.dtb \
-    am335x-boneblack-wireless.dtb \
-    am335x-sancloud-bbe.dtb \
+    ti/omap/am335x-evm.dtb \
+    ti/omap/am335x-evmsk.dtb \
+    ti/omap/am335x-icev2.dtb \
+    ti/omap/am335x-pocketbeagle.dtb \
+    ti/omap/am335x-bone.dtb \
+    ti/omap/am335x-boneblue.dtb \
+    ti/omap/am335x-bonegreen.dtb \
+    ti/omap/am335x-bonegreen-wireless.dtb \
+    ti/omap/am335x-boneblack.dtb \
+    ti/omap/am335x-boneblack-wireless.dtb \
+    ti/omap/am335x-sancloud-bbe.dtb \
 "

 UBOOT_ARCH = "arm"
@@ -41,13 +38,16 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
+
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
+UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon"
 UBOOT_EXTLINUX_BOOT_FILES = " \
    extlinux.conf;extlinux/extlinux.conf \
    ${KERNEL_IMAGETYPE} \
-    ${KERNEL_DEVICETREE} \
+    ${DEVICETREE_FILE} \
 "

 SPL_BINARY = "MLO"
@@ -59,6 +59,10 @@ UBI_VOLNAME = "rootfs"

 EXTRA_IMAGEDEPENDS += "virtual/bootloader"

+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"
+
 # List common SoC features, may need to add touchscreen for specific machines
 MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"

--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -4,17 +4,11 @@ SOC_FAMILY:append = ":ti43x"
 DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc

-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r3"
-
-# Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
+require conf/machine/include/ti-bsp.inc

 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= ""
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
 PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"

 KERNEL_IMAGETYPE = "zImage"
@@ -22,13 +16,15 @@ KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE_PREFIX = " \
    am437x \
    am43x \
+    ti/omap/am437x \
+    ti/omap/am43x \
 "

 KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb \
-    am437x-sk-evm.dtb \
-    am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb \
+    ti/omap/am437x-gp-evm.dtb \
+    ti/omap/am437x-sk-evm.dtb \
+    ti/omap/am437x-idk-evm.dtb \
+    ti/omap/am43x-epos-evm.dtb \
 "

 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
@@ -39,13 +35,15 @@ UBOOT_MACHINE = "am43xx_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
+
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
 UBOOT_EXTLINUX_BOOT_FILES = " \
    extlinux.conf;extlinux/extlinux.conf \
    ${KERNEL_IMAGETYPE} \
-    ${KERNEL_DEVICETREE} \
+    ${DEVICETREE_FILE} \
 "

 SPL_BINARY = "MLO"
@@ -55,7 +53,11 @@ UBOOT_SUFFIX = "img"
 # and u-boot.
 UBI_VOLNAME = "rootfs"

-EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"

 # List common SoC features, may need to add touchscreen for specific machines
 MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
--- a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: J721e SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721e SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j721e"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
+UBOOT_MACHINE = "j721e_sk_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j721e-sk.conf
+++ b/meta-ti-bsp/conf/machine/j721e-sk.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: J721e SK
+#@DESCRIPTION: Machine configuration for the TI J721e SK
+
+require conf/machine/include/j721e.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-j721e-sk \
+    ti/k3-fpdlink \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-j721e-sk.dtb \
+"
+
+UBOOT_MACHINE = "j721e_sk_a72_config"
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -12,6 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-fpdlink \
    ti/k3-j7200-evm-mcspi-loopback \
    ti/k3-am68-sk \
+    ti/k3-v3link \
 "

 KERNEL_DEVICETREE = " \
@@ -19,9 +20,3 @@ KERNEL_DEVICETREE = " \
 "

 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-# Default tiboot3.bin on J721S2 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
-
-# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
--- a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: J722S EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J722S EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j722s"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "j722s_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j722s-evm.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: J722S EVM
+#@DESCRIPTION: Machine configuration for the TI J722S EVM
+
+require conf/machine/include/j722s.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-j722s \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = ""
+
+UBOOT_MACHINE = "j722s_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -12,6 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-fpdlink \
    ti/k3-j7200-evm-mcspi-loopback \
    ti/k3-am69-sk \
+    ti/k3-v3link \
 "

 KERNEL_DEVICETREE = " \
@@ -19,9 +20,3 @@ KERNEL_DEVICETREE = " \
 "

 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-# Default tiboot3.bin on J784S4 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
-
-# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
--- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
+++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
@@ -15,7 +15,10 @@ IMAGE_FSTYPES += "tar.xz"

 SERIAL_CONSOLES = "115200;ttyS2"

-KERNEL_DEVICETREE_PREFIX = "da850"
+KERNEL_DEVICETREE_PREFIX = " \
+    da850 \
+    ti/davinci/da850 \
+"

 KERNEL_DEVICETREE = " \
    da850-evm.dtb \
--- a/meta-ti-bsp/conf/multiconfig/k3r5.conf
+++ b/meta-ti-bsp/conf/multiconfig/k3r5.conf
@@ -1,5 +1,10 @@
 MAINMACHINE := "${MACHINE}"

-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MAINMACHINE}"
+DEPLOY_DIR_IMAGE:k3r5 = "${TI_COMMON_DEPLOY}/images/${MAINMACHINE}"

 MACHINE:append = "-k3r5"
+TCLIBC = "baremetal"
+TI_TMPDIR_APPEND ?= "-k3r5"
+TMPDIR:append = "${TI_TMPDIR_APPEND}"
+
+SDKPKGSUFFIX = "k3r5-nativesdk"
--- a/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend
+++ b/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend
@@ -0,0 +1,14 @@
+# This is a copy of meta-clang/recipes-graphics/mesa/mesa_%.bbappend required
+# for llvmpipe when using pvr-mesa since we aren't caught by that glob.
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+LDFLAGS:append:toolchain-clang = " -latomic -lm"
+DEPENDS:append:toolchain-clang = " libatomic-ops"
+
+EXTRA_OEMASON:append:toolchain-clang:x86 = " -Dasm=false"
+EXTRA_OEMASON:append:toolchain-clang:x86-64 = " -Dasm=false"
+
+export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
+
+PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true -Ddraw-use-llvm=true,-Dllvm=false,clang clang-native elfutils"
--- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -8,18 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0"
 PV = "${CADENCE_MHDP_FW_VERSION}"
 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
-
 COMPATIBLE_MACHINE = "j721e|j721s2|j784s4"

-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
 TARGET = "mhdp8546.bin"

 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/cadence
 	install -m 0644 ${S}/cadence/${TARGET} ${D}${nonarch_base_libdir}/firmware/cadence/${TARGET}
 }
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
--- 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
@@ -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}"
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}"
 }

 do_install() {
--- a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
+++ b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
@@ -7,7 +7,7 @@ BRANCH = "master"
 # This corresponds to version 4.20.00.01
 SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393"

-PV = "4.20.00.01+git${SRCPV}"
+PV = "4.20.00.01+git"

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

--- 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
@@ -2,7 +2,6 @@ SUMMARY = "Chips&Media codec firmware files"

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

-inherit deploy
 inherit update-alternatives

 LICENSE = "BSD-3-Clause"
@@ -11,14 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0"
 PV = "${CNM_WAVE521_FW_VERSION}"
 PR = "${INC_PR}.1"

-CLEANBROKEN = "1"
+COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|am62axx|am62pxx"

-COMPATIBLE_MACHINE = "j721s2|j784s4|am62axx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-TARGET_WAVE521C = "wave521c_codec_fw.bin"
+TARGET_WAVE521C = "wave521c_k3_codec_fw.bin"

 SOURCE_WAVE521C = "wave521c_k3_codec_fw.bin"

@@ -33,10 +27,3 @@ do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/cnm
 	install -m 0644 ${S}/cnm/${SOURCE_WAVE521C} ${D}${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}
 }
-
-# make sure that lib/firmware, and all its contents are part of the package
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-# we don't want to configure and build the source code
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
--- a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
@@ -3,10 +3,8 @@ SUMMARY = "R5 PSDK CPSW9G Ethernet Switch Firmware"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db"

-PV = "6.2+git${SRCPV}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PV = "6.2+git"

-inherit deploy
 inherit update-alternatives

 PROTOCOL = "https"
--- 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
@@ -7,9 +7,6 @@ inherit module features_check

 REQUIRED_MACHINE_FEATURES = "gc320"

-MACHINE_KERNEL_PR:append = "i"
-PR = "${MACHINE_KERNEL_PR}"
-
 # Need to branch out with ${PV} var
 BRANCH = "ti-${PV}-k5.10"

--- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -8,13 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENCE.Spectrum-GT9271;md5=2a6de6be7af1fe46370c684da
 PV = "${GOODIX_FW_VERSION}"
 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
-
 COMPATIBLE_MACHINE = "dra7xx"

-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
 ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin"
 TARGET = "goodix_9271_cfg.bin"

@@ -22,5 +17,3 @@ do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware
 	install -m 0644 ${S}/ti-evm/${ORIGIN} ${D}${nonarch_base_libdir}/firmware/${TARGET}
 }
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
--- 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
@@ -7,12 +7,9 @@ inherit module

 PROVIDES = "virtual/gpudriver"

-MACHINE_KERNEL_PR:append = "b"
-PR = "${MACHINE_KERNEL_PR}"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx"
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"

 DEPENDS = "virtual/kernel"

@@ -22,12 +19,14 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;

 S = "${WORKDIR}/git"

-SRCREV = "c0adc3c36f4a0b2f590abfe0609b03096d58c648"
+SRCREV = "174eb331a61e89184342fa57a935226f4e952bc9"

 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
 TARGET_PRODUCT:j784s4 = "j784s4_linux"
 TARGET_PRODUCT:am62xx = "am62_linux"
+TARGET_PRODUCT:am62pxx = "am62p_linux"
+TARGET_PRODUCT:j722s = "j722s_linux"
 PVR_BUILD = "release"
 PVR_WS = "lws-generic"

--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb
@@ -0,0 +1,39 @@
+DESCRIPTION =  "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"
+
+inherit module
+
+PROVIDES = "virtual/gpudriver"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
+
+DEPENDS = "virtual/kernel"
+
+BRANCH = "linuxws/scarthgap/k6.6/${PV}"
+
+SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+SRCREV = "81e189096ef2f2479ccfb50d8b2fb24097188de3"
+
+TARGET_PRODUCT:j721e = "j721e_linux"
+TARGET_PRODUCT:j721s2 = "j721s2_linux"
+TARGET_PRODUCT:j784s4 = "j784s4_linux"
+TARGET_PRODUCT:am62xx = "am62_linux"
+TARGET_PRODUCT:am62pxx = "am62p_linux"
+TARGET_PRODUCT:j722s = "j722s_linux"
+PVR_BUILD = "release"
+PVR_WS = "lws-generic"
+
+EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
+
+do_install() {
+    make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
+}
+
+RRECOMMENDS:${PN} += "ti-img-rogue-umlibs"
--- 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,7 +1,7 @@
 DESCRIPTION =  "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://eurasia_km/README;beginline=13;endline=22;md5=74506d9b8e5edbce66c2747c50fcef12"
+LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e"

 inherit module

@@ -9,40 +9,34 @@ PROVIDES = "virtual/gpudriver"

 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"

-MACHINE_KERNEL_PR:append = "x"
-PR = "${MACHINE_KERNEL_PR}"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 DEPENDS = "virtual/kernel"

-BRANCH = "ti-img-sgx/${PV}/k5.10"
+BRANCH = "${PV}/mesa/k6.1"

 SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}"

 S = "${WORKDIR}/git"

-SRCREV = "eda7780bfd5277e16913c9bc0b0e6892b4e79063"
+SRCREV = "2cb2c9609b7740cb2c348e669a96f26e1cc858da"

-TARGET_PRODUCT:omap-a15 = "jacinto6evm"
-TARGET_PRODUCT:ti33x = "ti335x"
-TARGET_PRODUCT:ti43x = "ti437x"
-TARGET_PRODUCT:am65xx = "ti654x"
+TARGET_PRODUCT:omap-a15 = "ti572x_linux"
+TARGET_PRODUCT:ti33x = "ti335x_linux"
+TARGET_PRODUCT:ti43x = "ti437x_linux"
+TARGET_PRODUCT:am65xx = "ti654x_linux"
 PVR_BUILD = "release"
-PVR_WS = "nulldrmws"
+PVR_WS = "lws-generic"

-EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
-
-do_compile:prepend() {
-    cd ${S}/eurasia_km/eurasiacon/build/linux2/omap_linux
-}
+EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} \
+WINDOW_SYSTEM=${PVR_WS} PVR_BUILD_DIR=${TARGET_PRODUCT}'

 do_install() {
-    make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
+    make -C ${STAGING_KERNEL_DIR} M=${B}/eurasiacon/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
 }

 do_install:am65xx() {
-    make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
+    make -C ${STAGING_KERNEL_DIR} M=${B}/eurasiacon/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
 }

 RRECOMMENDS:${PN} += "ti-sgx-ddk-um"
--- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
+++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
@@ -1,34 +0,0 @@
-SUMMARY = "PRU Ethernet firmware for AM65xx SR2.0"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-PV = "${PRUETH_FW_AM65X_SR2_VERSION}"
-PR = "${INC_PR}.0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "am65xx-evm|am64xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = " \
-    am65x-sr2-pru0-prueth-fw.elf \
-    am65x-sr2-pru1-prueth-fw.elf \
-    am65x-sr2-rtu0-prueth-fw.elf \
-    am65x-sr2-rtu1-prueth-fw.elf \
-    am65x-sr2-txpru0-prueth-fw.elf \
-    am65x-sr2-txpru1-prueth-fw.elf \
-"
-
-do_install() {
-	install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-INSANE_SKIP:${PN} = "arch"
--- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb
+++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb
@@ -1,32 +0,0 @@
-SUMMARY = "PRU Ethernet firmware for AM65x SR1.0"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-PV = "${PRUETH_FW_AM65X_VERSION}"
-PR = "${INC_PR}.0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "am65xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = " \
-    am65x-pru0-prueth-fw.elf \
-    am65x-pru1-prueth-fw.elf \
-    am65x-rtu0-prueth-fw.elf \
-    am65x-rtu1-prueth-fw.elf \
-"
-
-do_install() {
-	install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-INSANE_SKIP:${PN} = "arch"
--- 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
@@ -1,21 +1,29 @@
-SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x and AM335x"
+SUMMARY = "PRU Ethernet firmware"

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

 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx|am64xx"

-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = ""
-TARGET:ti33x = "am335x-pru0-prueth-fw.elf am335x-pru1-prueth-fw.elf"
-TARGET:ti43x = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf"
-TARGET:am57xx = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
+TARGET = " \
+    am335x-pru0-prueth-fw.elf \
+    am335x-pru1-prueth-fw.elf \
+    am437x-pru0-prueth-fw.elf \
+    am437x-pru1-prueth-fw.elf \
+    am57xx-pru0-prueth-fw.elf \
+    am57xx-pru1-prueth-fw.elf \
+    am65x-pru0-prueth-fw.elf \
+    am65x-pru1-prueth-fw.elf \
+    am65x-rtu0-prueth-fw.elf \
+    am65x-rtu1-prueth-fw.elf \
+    am65x-sr2-pru0-prueth-fw.elf \
+    am65x-sr2-pru1-prueth-fw.elf \
+    am65x-sr2-rtu0-prueth-fw.elf \
+    am65x-sr2-rtu1-prueth-fw.elf \
+    am65x-sr2-txpru0-prueth-fw.elf \
+    am65x-sr2-txpru1-prueth-fw.elf \
+"

 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
@@ -23,8 +31,3 @@ do_install() {
 		install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
 	done
 }
-
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-INSANE_SKIP:${PN} = "arch"
--- a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb
+++ b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb
@@ -1,34 +0,0 @@
-SUMMARY = "PRU HSR firmware for AM65xx SR2.0"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-PV = "${PRUETH_FW_AM65X_SR2_VERSION}"
-PR = "${INC_PR}.0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "am65xx-evm|am64xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = " \
-    am65x-sr2-pru0-pruhsr-fw.elf \
-    am65x-sr2-pru1-pruhsr-fw.elf \
-    am65x-sr2-rtu0-pruhsr-fw.elf \
-    am65x-sr2-rtu1-pruhsr-fw.elf \
-    am65x-sr2-txpru0-pruhsr-fw.elf \
-    am65x-sr2-txpru1-pruhsr-fw.elf \
-"
-
-do_install() {
-	install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-INSANE_SKIP:${PN} = "arch"
--- 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
@@ -1,22 +1,26 @@
-SUMMARY = "PRU HSR firmware for AM335x/AM437x/AM57xx"
+SUMMARY = "PRU HSR firmware"

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

 PE = "1"
 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx|am64xx"

-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = ""
-TARGET:ti33x = "am335x-pru0-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf"
-TARGET:ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf"
-TARGET:am57xx = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf"
+TARGET = " \
+    am335x-pru0-pruhsr-fw.elf \
+    am335x-pru1-pruhsr-fw.elf \
+    am437x-pru0-pruhsr-fw.elf \
+    am437x-pru1-pruhsr-fw.elf \
+    am57xx-pru0-pruhsr-fw.elf \
+    am57xx-pru1-pruhsr-fw.elf \
+    am65x-sr2-pru0-pruhsr-fw.elf \
+    am65x-sr2-pru1-pruhsr-fw.elf \
+    am65x-sr2-rtu0-pruhsr-fw.elf \
+    am65x-sr2-rtu1-pruhsr-fw.elf \
+    am65x-sr2-txpru0-pruhsr-fw.elf \
+    am65x-sr2-txpru1-pruhsr-fw.elf \
+"

 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
@@ -24,7 +28,3 @@ do_install() {
 		install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
 	done
 }
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-INSANE_SKIP:${PN} = "arch"
--- 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,18 +5,16 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 PE = "1"
 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
-
 COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx"

-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = ""
-TARGET:ti33x = "am335x-pru0-pruprp-fw.elf am335x-pru1-pruprp-fw.elf"
-TARGET:ti43x = "am437x-pru0-pruprp-fw.elf am437x-pru1-pruprp-fw.elf"
-TARGET:am57xx = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf"
+TARGET = " \
+	am335x-pru0-pruprp-fw.elf \
+	am335x-pru1-pruprp-fw.elf \
+	am437x-pru0-pruprp-fw.elf \
+	am437x-pru1-pruprp-fw.elf \
+	am57xx-pru0-pruprp-fw.elf \
+	am57xx-pru1-pruprp-fw.elf \
+"

 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
@@ -24,7 +22,3 @@ do_install() {
 		install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
 	done
 }
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-INSANE_SKIP:${PN} = "arch"
--- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb
+++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb
@@ -1,34 +0,0 @@
-SUMMARY = "PRU Ethernet Switch firmware for AM65xx SR2.0"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-PV = "${PRUETH_FW_AM65X_SR2_VERSION}"
-PR = "${INC_PR}.0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "am65xx-evm|am64xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = " \
-    am65x-sr2-pru0-prusw-fw.elf \
-    am65x-sr2-pru1-prusw-fw.elf \
-    am65x-sr2-rtu0-prusw-fw.elf \
-    am65x-sr2-rtu1-prusw-fw.elf \
-    am65x-sr2-txpru0-prusw-fw.elf \
-    am65x-sr2-txpru1-prusw-fw.elf \
-"
-
-do_install() {
-	install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-INSANE_SKIP:${PN} = "arch"
--- 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
@@ -1,21 +1,25 @@
-SUMMARY = "PRU Switch firmware for AM57xx, AM437x and AM335x"
+SUMMARY = "PRU Switch firmware"

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

 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx|am64xx"

-COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = ""
-TARGET:ti33x = "am335x-pru0-prusw-fw.elf am335x-pru1-prusw-fw.elf"
-TARGET:ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf"
-TARGET:am57xx = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf"
+TARGET = " \
+	am335x-pru0-prusw-fw.elf \
+	am335x-pru1-prusw-fw.elf \
+	am437x-pru0-prusw-fw.elf \
+	am437x-pru1-prusw-fw.elf \
+	am57xx-pru0-prusw-fw.elf \
+	am57xx-pru1-prusw-fw.elf \
+	am65x-sr2-pru0-prusw-fw.elf \
+	am65x-sr2-pru1-prusw-fw.elf \
+	am65x-sr2-rtu0-prusw-fw.elf \
+	am65x-sr2-rtu1-prusw-fw.elf \
+	am65x-sr2-txpru0-prusw-fw.elf \
+	am65x-sr2-txpru1-prusw-fw.elf \
+"

 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss
@@ -23,8 +27,3 @@ do_install() {
 		install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f
 	done
 }
-
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
-
-INSANE_SKIP:${PN} = "arch"
--- 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
@@ -1,7 +1,7 @@
 SUMMARY = "TI DM prebuilt binary firmware images"

 LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-ti/licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
+LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"

 COMPATIBLE_MACHINE = "k3"

@@ -17,8 +17,6 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 PV = "${TI_DM_FW_VERSION}"
 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
-
 # Secure Build
 inherit ti-secdev

@@ -27,10 +25,12 @@ PLAT_SFX:j721e = "j721e"
 PLAT_SFX:j7200 = "j7200"
 PLAT_SFX:j721s2 = "j721s2"
 PLAT_SFX:j784s4 = "j784s4"
+PLAT_SFX:j722s = "j722s"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
 PLAT_SFX:am62axx = "am62axx"
+PLAT_SFX:am62pxx = "am62pxx"

 DM_FW_DIR = "ti-dm/${PLAT_SFX}"

@@ -43,10 +43,12 @@ DM_FW_LIST:j721e =   "${DM_FIRMWARE}"
 DM_FW_LIST:j7200 =   "${DM_FIRMWARE}"
 DM_FW_LIST:j721s2 =  "${DM_FIRMWARE}"
 DM_FW_LIST:j784s4 =  "${DM_FIRMWARE}"
+DM_FW_LIST:j722s =   "${DM_FIRMWARE}"
 DM_FW_LIST:am65xx =  ""
 DM_FW_LIST:am64xx =  ""
 DM_FW_LIST:am62xx =  "${DM_FIRMWARE}"
 DM_FW_LIST:am62axx = "${DM_FIRMWARE}"
+DM_FW_LIST:am62pxx = "${DM_FIRMWARE}"

 do_install() {
    # Sign the firmware
@@ -67,53 +69,44 @@ do_install() {

 do_deploy() {
    # DM Firmware is needed for rebuilding U-Boot
-    install -d ${DEPLOYDIR}
+    install -d ${DEPLOYDIR}/${DM_FW_DIR}
    for FW_NAME in ${DM_FW_LIST}
    do
-        install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}        ${DEPLOYDIR}/
-        install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}.signed ${DEPLOYDIR}/
+        install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}        ${DEPLOYDIR}/${DM_FW_DIR}
+        install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}.signed ${DEPLOYDIR}/${DM_FW_DIR}
    done
 }

 # Set up names for the firmwares
 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}:j721e   = "j7-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j7200   = "j7200-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j721s2  = "j721s2-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j784s4  = "j784s4-mcu-r5f0_0-fw"
+ALTERNATIVE:${PN}:j722s   = "j722s-wkup-r5f0_0-fw"

 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw"
+ALTERNATIVE_LINK_NAME[am62p-main-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/am62p-main-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[am62a-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62a-main-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw"
+ALTERNATIVE_LINK_NAME[j722s-wkup-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j722s-wkup-r5f0_0-fw"

 # Create the firmware alternatives
 ALTERNATIVE_TARGET[am62-main-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
+ALTERNATIVE_TARGET[am62p-main-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[am62a-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw]     = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
+ALTERNATIVE_TARGET[j722s-wkup-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"

 ALTERNATIVE_PRIORITY = "10"

-# make sure that lib/firmware, and all its contents are part of the package
-FILES:${PN} += "${nonarch_base_libdir}/firmware"
-
-# This is used to prevent the build system to_strip the executables
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-# This is used to prevent the build system to split the debug info in a separate file
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP
-INSANE_SKIP:${PN} += "arch"
-
-# we don't want to configure and build the source code
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
-
 addtask deploy after do_install
--- 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
@@ -1,7 +1,7 @@
 SUMMARY = "TI Ethernet prebuilt binary firmware images"

 LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-ti/licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
+LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"

 COMPATIBLE_MACHINE = "k3"

@@ -9,7 +9,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 INHIBIT_DEFAULT_DEPS = "1"

-inherit deploy
 inherit update-alternatives

 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -17,8 +16,6 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 PV = "${CORESDK_RTOS_VERSION}"
 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
-
 # Secure Build
 inherit ti-secdev

@@ -27,9 +24,11 @@ PLAT_SFX:j721e = "j721e"
 PLAT_SFX:j7200 = "j7200"
 PLAT_SFX:j721s2 = "j721s2"
 PLAT_SFX:j784s4 = "j784s4"
+PLAT_SFX:j722s = "j722s"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
+PLAT_SFX:am62pxx = "am62pxx"
 PLAT_SFX:am62axx = "am62axx"

 ETH_FW_DIR = "ti-eth/${PLAT_SFX}"
@@ -43,9 +42,11 @@ 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:am65xx =  ""
 ETH_FW_LIST:am64xx =  ""
 ETH_FW_LIST:am62xx =  ""
+ETH_FW_LIST:am62pxx = ""
 ETH_FW_LIST:am62axx = ""

 do_install() {
@@ -76,8 +77,8 @@ ALTERNATIVE:${PN}:j7200 = "\
                    "

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

 # Set up link names for the firmwares
@@ -87,8 +88,8 @@ ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw-sec]    = "${nonarch_base_libdir}/firmwa
 ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-fw-sec"

-ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw"
-ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw-sec"
+ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw"
+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}"
@@ -97,22 +98,7 @@ ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec]    = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.
 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[j784s4-mcu-r5f0_0-fw]     = "${INSTALL_ETH_FW_DIR}/${ETH_FW}"
-ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${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_PRIORITY = "20"
-
-# make sure that lib/firmware, and all its contents are part of the package
-FILES:${PN} += "${nonarch_base_libdir}/firmware"
-
-# This is used to prevent the build system to_strip the executables
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-# This is used to prevent the build system to split the debug info in a separate file
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP
-INSANE_SKIP:${PN} += "arch"
-
-# we don't want to configure and build the source code
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
+ALTERNATIVE_PRIORITY = "5"
--- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
@@ -7,18 +7,11 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 PV = "${IMG_DEC_FW_VERSION}"
 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
-
 COMPATIBLE_MACHINE = "j721e"

-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
 TARGET = "pvdec_full_bin.fw"

 do_install() {
        install -d ${D}${nonarch_base_libdir}/firmware
        install -m 0644 ${S}/ti-img/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}
 }
-
-FILES:${PN} = "${nonarch_base_libdir}/firmware"
--- 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
@@ -9,15 +9,15 @@ 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.11.02"
+PRUETH_FW_AM65X_SR2_VERSION = "02.02.14.00"
 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.00"
-TI_DM_FW_VERSION = "08.06.04"
-TI_SYSFW_VERSION = "08.06.04"
+CNM_WAVE521_FW_VERSION = "1.0.4"
+TI_DM_FW_VERSION = "10.00.01"
+TI_SYSFW_VERSION = "10.00.02"

-TI_LINUX_FW_SRCREV ?= "905eb58564581d951d148f45828e8c8a142a5938"
+TI_LINUX_FW_SRCREV ?= "bce9bafb6efeb8ac539bd9858d474a55fe88cd46"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"
@@ -25,3 +25,22 @@ BRANCH ?= "ti-linux-firmware"
 SRC_URI = "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH}"

 S = "${WORKDIR}/git"
+
+CLEANBROKEN = "1"
+
+# Make sure that lib/firmware, and all its contents are part of the package
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
+
+# This is used to prevent the build system from stripping the firmwares
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+# This is used to prevent the build system from splitting out the firmware debug info into a separate file
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+# Disable arch checking as firmware is likely to be a different arch from the Yocto build
+INSANE_SKIP:${PN} += "arch"
+
+# Firmware in Linux Firmware has no configure nor build steps
+do_compile[noexec] = "1"
+do_configure[noexec] = "1"
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -1,19 +1,14 @@
 SUMMARY = "TI SYSFW/TIFS Firmware"

+inherit deploy
+
 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-CFLAGS[unexport] = "1"
-LDFLAGS[unexport] = "1"
-AS[unexport] = "1"
-LD[unexport] = "1"
-
 PV = "${TI_SYSFW_VERSION}"
 PR = "${INC_PR}.0"

-CLEANBROKEN = "1"
-
 do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw
 	install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw
@@ -21,4 +16,14 @@ do_install() {
 	install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw
 }

-FILES:${PN} = "${nonarch_base_libdir}/firmware"
+do_deploy(){
+}
+
+do_deploy:k3r5() {
+	install -d ${DEPLOYDIR}/ti-sysfw
+	install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw
+	install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw
+	install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${DEPLOYDIR}/ti-sysfw
+}
+
+addtask deploy before do_build after do_compile
--- 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,5 +1,5 @@
-PV:k3 = "2.9+git${SRCPV}"
-SRCREV_tfa:k3 = "d3e71ead6ea5bc3555ac90a446efec84ef6c6122"
+PV:k3 = "2.10+git"
+SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b"
 SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
 COMPATIBLE_MACHINE:k3 = "k3"
 TFA_BUILD_TARGET:k3 = "all"
--- a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
+++ b/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"
+COMPATIBLE_MACHINE = "am62xx|am62pxx"

 BRANCH = "ti-u-boot-2023.04"
 BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse"

-SRCREV = "010afc1fe7a1412f92363c8af69c848d76a53e42"
-SRCREV:tie-jailhouse = "79615e1c99b9aa73948f811f5f866cff2e34dc37"
+SRCREV = "b0d868ee086eb5c96a3d32f72a7cb9670abf5b90"
+SRCREV:tie-jailhouse = "765cab112d16fcf68a3266738073663dae67a55d"

 UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
@@ -0,0 +1,17 @@
+require u-boot-ti.inc
+
+SUMMARY = "BeagleBoard.org U-Boot"
+
+COMPATIBLE_MACHINE = "beagle.*"
+
+PV = "2023.04"
+
+UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
+UBOOT_GIT_PROTOCOL = "https"
+BRANCH = "v2023.04-ti-09.01.00.008"
+SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb"
+
+BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay"
+BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay"
+SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
+SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
@@ -0,0 +1,7 @@
+do_configure:append () {
+   if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ]
+   then
+       oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS}
+       oe_runmake -C ${S} O=${B} olddefconfig
+   fi
+}
--- 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
@@ -1,10 +1,8 @@
 require u-boot-ti.inc

-LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
-
 PR = "r0"

-PV = "2022.10"
+PV = "2024.01"

 # For the un-initiated:
 # The actual URL you'd use with a git clone for example would be:
@@ -15,4 +13,4 @@ PV = "2022.10"
 # b) and we want git fetcher to use https protocol, hence GIT_PROTOCOL as https
 UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"
 UBOOT_GIT_PROTOCOL = "https"
-SRCREV = "4debc57a3da6c3f4d3f89a637e99206f4cea0a96"
+SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
@@ -2,20 +2,8 @@ require u-boot-ti.inc

 include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}

-LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
-
 PR = "r0"

 BRANCH = "ti-u-boot-2023.04"

-SRCREV = "e80134b56ded30edfa1b44095f4db062d3a701c9"
-
-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}
-}
+SRCREV = "83660642085462346fbeb410f83bc99448ec7042"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
@@ -0,0 +1,9 @@
+require u-boot-ti.inc
+
+include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+PR = "r0"
+
+BRANCH = "ti-u-boot-2024.04"
+
+SRCREV = "b3c10f333acccef49ebaf4abc575616ea7326d50"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -1,32 +1,36 @@
-# UBOOT_LOCALVERSION can be set to add a tag to the end of the
-# U-boot version string.  such as the commit id
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"
+do_compile:prepend () {
+    scm_version=$(printf '%s%s' -ti-g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12))
+
+    echo ${scm_version} > ${B}/.scmversion
+    echo ${scm_version} > ${S}/.scmversion
+}

 UBOOT_SUFFIX ?= "img"
 SPL_BINARY ?= "MLO"

 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+require u-boot-mergeconfig.inc

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

 SUMMARY = "u-boot bootloader for TI devices"

 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"

 BRANCH ?= "master"
 UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
 UBOOT_GIT_PROTOCOL = "https"
 SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"

-PV:append = "+git${SRCPV}"
+PV:append = "+git"

 # u-boot needs devtree compiler to parse dts files
 DEPENDS += "dtc-native bc-native flex-native bison-native python3-setuptools-native"

 # u-boot needs these for binman
-DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-native"
+DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-native python3-yamllint-native"

 # SYSFW/TIFS Firmware
 DEPENDS:append:k3 = " ti-sci-fw"
@@ -39,10 +43,12 @@ PLAT_SFX:j721e = "j721e"
 PLAT_SFX:j7200 = "j7200"
 PLAT_SFX:j721s2 = "j721s2"
 PLAT_SFX:j784s4 = "j784s4"
+PLAT_SFX:j722s = "j722s"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
 PLAT_SFX:am62axx = "am62axx"
+PLAT_SFX:am62pxx = "am62pxx"

 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"
@@ -53,8 +59,10 @@ PACKAGECONFIG:append:j721e = " dm"
 PACKAGECONFIG:append:j7200 = " dm"
 PACKAGECONFIG:append:j721s2 = " dm"
 PACKAGECONFIG:append:j784s4 = " dm"
+PACKAGECONFIG:append:j722s = " dm"
 PACKAGECONFIG:append:am62xx = " dm"
 PACKAGECONFIG:append:am62axx = " dm"
+PACKAGECONFIG:append:am62pxx = " dm"

 COMPATIBLE_MACHINE = "(ti-soc)"

@@ -81,18 +89,9 @@ SPL_UART_BINARY:k3r5 = ""
 SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
 SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"

-# SPI NOR Flash binaries
-UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin"
-UBOOT_SPI_BINARY = "u-boot.img"
-UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph"
-
-# SPI NOR Flash deployed images
-UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin"
-UBOOT_SPI_SPL_SYMLINK = "u-boot-spl-${MACHINE}.bin"
-UBOOT_SPI_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
-UBOOT_SPI_SYMLINK = "u-boot-${MACHINE}.img"
-UBOOT_SPI_GPH_IMAGE = "u-boot-spi-${MACHINE}-${PV}-${PR}.gph"
-UBOOT_SPI_GPH_SYMLINK = "u-boot-spi-${MACHINE}.gph"
+SPL_HS_MLO_BINARY = "u-boot-spl_HS_MLO"
+SPL_HS_MLO_IMAGE = "u-boot-spl_HS_MLO-${MACHINE}-${PV}-${PR}"
+SPL_HS_MLO_SYMLINK = "u-boot-spl_HS_MLO-${MACHINE}"

 # HS XLD
 UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER"
@@ -115,8 +114,26 @@ UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}"
 UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}"

 do_compile:append:k3r5 () {
-	if ! [ -f ${B}/${UBOOT_BINARY} ]; then
-		ln -s spl/${UBOOT_BINARY} ${B}/${UBOOT_BINARY}
+	if [ -n "${UBOOT_CONFIG}" ];
+	then
+		for config in ${UBOOT_MACHINE}; do
+			i=$(expr $i + 1);
+			for type in ${UBOOT_CONFIG}; do
+				j=$(expr $j + 1);
+				if [ $j -eq $i ];
+				then
+					if ! [ -L ${B}/${config}/${UBOOT_BINARY} ] && ! [ -f ${B}/${config}/${UBOOT_BINARY} ]; then
+						ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARY}
+					fi
+				fi
+			done
+			unset  j
+		done
+		unset  i
+	else
+		if ! [ -f ${B}/${UBOOT_BINARY} ]; then
+			ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY}
+		fi
 	fi
 }

@@ -134,6 +151,11 @@ do_install:append () {
 						ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type}
 						ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}
 					fi
+					if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
+						install ${B}/${config}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type}
+						ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type}
+						ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}
+					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
 						install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type}
 						ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type}
@@ -164,6 +186,10 @@ do_install:append () {
 			install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
 			ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
 		fi
+		if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
+			install ${B}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}
+			ln -sf ${SPL_HS_MLO_IMAGE} ${D}/boot/${SPL_HS_MLO_BINARY}
+		fi
 		if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
 			install ${B}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}
 			ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
@@ -195,6 +221,13 @@ do_deploy:append:k3r5 () {
 			install -m 644 $f ${DEPLOYDIR}/
 		fi
 	done
+
+	rm ${DEPLOYDIR}/u-boot-initial-env || true
+	rm ${DEPLOYDIR}/${PN}-initial-env || true
+	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true
+	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true
+	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true
+	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
 }

 do_deploy:append () {
@@ -215,6 +248,14 @@ do_deploy:append () {
 						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
 						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
 					fi
+					if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
+						install ${B}/${config}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type}
+						rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
+						ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type}
+						ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}
+						ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type}
+						ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}
+					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
 						install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
 						rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
@@ -260,6 +301,12 @@ do_deploy:append () {
 			ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
 			ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
 		fi
+		if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
+			install ${B}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}
+			rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
+			ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_SYMLINK}
+			ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_BINARY}
+		fi
 		if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
 			install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}
 			rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
@@ -285,13 +332,26 @@ do_deploy:append () {
 			ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
 		fi
 	fi
+}

-	rm ${DEPLOYDIR}/u-boot-initial-env || true
-	rm ${DEPLOYDIR}/${PN}-initial-env || true
-	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true
-	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true
-	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true
-	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
+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}
 }

 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
@@ -3,7 +3,6 @@ LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3"

 COMPATIBLE_MACHINE = "dra7xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"

 PR = "r1"

--- 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
@@ -4,9 +4,6 @@ LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c"

 COMPATIBLE_MACHINE = "dra7xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS += "virtual/kernel"

 SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vpdma-fw/03-2012/exports/vpdma-fw_03-2012.tar.gz;protocol=http;name=dra7xx-evm"
 SRC_URI[dra7xx-evm.md5sum] = "80176df1350c21d9efa90171789c546e"
--- a/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb
@@ -0,0 +1,83 @@
+SUMMARY = "Precompiled Zephyr OpenAMP example firmware for TI K3 devices"
+
+# Name of this demo's firmware
+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"
+
+# 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
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+COMPATIBLE_MACHINE = "k3"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRC_URI = "git://github.com/glneo/zephyr-firmware.git;protocol=https;branch=main"
+SRCREV = "146d4f9b3930722d73685d600958f0b10ea97de2"
+PV = "3.6.0"
+#PR = "r1"
+
+S = "${WORKDIR}/git"
+
+FW_PLAT = ""
+FW_PLAT:am62xx = "am62"
+
+FW_INSTALL_DIR = "${nonarch_base_libdir}/firmware/zephyr/${FW_PLAT}"
+
+do_install() {
+    for FW_CORE in ${FW_CORES}
+    do
+        install -d ${D}${FW_INSTALL_DIR}/${FW_CORE}
+        install -m 0644 ${S}/${FW_PLAT}/${FW_CORE}/${FW_NAME} ${D}${FW_INSTALL_DIR}/${FW_CORE}
+    done
+}
+
+# Make sure that lib/firmware, and all its contents are part of the package
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
+
+# This is used to prevent the build system from stripping the firmwares
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+# This is used to prevent the build system from splitting out the firmware debug info into a separate file
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+# This is a prebuilt with no external dependencies
+INHIBIT_DEFAULT_DEPS = "1"
+
+# Disable arch checking as firmware is likely to be a different arch from the Yocto build
+INSANE_SKIP:${PN} += "arch"
+
+# Zephyr-Firmware has no configure, compile, nor clean steps
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+CLEANBROKEN = "1"
+
+inherit update-alternatives
+
+python fw_generate_alternatives() {
+    for fw_core_name in d.getVar('FW_CORES').split():
+        fw_plat = d.getVar('FW_PLAT')
+        fw_pkg_name = d.getVar('PN')
+        fw_core_name_full = (fw_plat + "-" + fw_core_name + "-fw")
+
+        # Create the firmware alternatives
+        d.appendVar('ALTERNATIVE:%s' % fw_pkg_name, (fw_core_name_full + " "))
+
+        # Set up firmware alternatives link names
+        fw_alt_link = ("${nonarch_base_libdir}/firmware/" + fw_core_name_full)
+        d.setVarFlag('ALTERNATIVE_LINK_NAME', fw_core_name_full, fw_alt_link)
+
+        # Set up firmware alternatives link targets
+        fw_alt_target_rename = "${FW_INSTALL_DIR}/" + fw_core_name + "/${FW_NAME}"
+        d.setVarFlag('ALTERNATIVE_TARGET_%s' % fw_pkg_name, fw_core_name_full, fw_alt_target_rename)
+}
+
+do_package[prefuncs] += "fw_generate_alternatives"
+
+ALTERNATIVE_PRIORITY = "20"
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -1,24 +1,17 @@
 SUMMARY = "Diagnostic tool for TI K3 processors"

 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://common/k3conf.c;beginline=1;endline=34;md5=7154c0ffcd418064ffa528e34e70ca9d"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a56bddef00b39fb0f45488fdc4ce108f"

-PV = "0.2+git${SRCPV}"
+inherit cmake
+
+PV = "0.3+git"

 COMPATIBLE_MACHINE = "k3"

 BRANCH ?= "master"
-SRCREV = "81581afb405085755aea7744c1d196533e8094c4"
+SRCREV = "85a7433202aafafbccea8a7b2491f4df8b1ecd80"

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

 S = "${WORKDIR}/git"
-
-do_compile () {
-    oe_runmake CC="${CC}" CROSS_COMPILE=${TARGET_PREFIX} all
-}
-
-do_install () {
-    install -d ${D}${bindir}
-    install ${S}/k3conf ${D}${bindir}
-}
--- a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend
@@ -1 +0,0 @@
-require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)}
--- a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
+++ b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
@@ -1,5 +0,0 @@
-# This is required since cairo expects the opengl distro feature to refer to
-# the desktop version of OpenGL. Imagination drivers only provide OpenGLES.
-
-PACKAGECONFIG:remove = "opengl"
-PACKAGECONFIG:append = " glesv2"
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch
@@ -0,0 +1,128 @@
+From 1a894699354f5f984f31e5d3418b651edf486df9 Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Fri, 22 Sep 2023 22:32:41 -0500
+Subject: [PATCH] fix: gallivm: limit usage of LLVMContextSetOpaquePointers()
+ to LLVM 15
+
+LLVMContextSetOpaquePointers() was a temporary workaround offered to
+allow transitioning to opaque pointers. Mesa is ready for this now with
+recent versions of LLVM (16+). Therefore we limit the workaround of
+using LLVMContextSetOpaquePointers() to LLVM 15 now, that this C
+interface was removed in LLVM 17.
+
+Reference: https://github.com/llvm/llvm-project/commit/1270879376025457e266572c7cccc51eb5de9276
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21124]
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ src/gallium/auxiliary/draw/draw_llvm.c        | 2 +-
+ src/gallium/drivers/llvmpipe/lp_context.c     | 2 +-
+ src/gallium/drivers/llvmpipe/lp_test_arit.c   | 2 +-
+ src/gallium/drivers/llvmpipe/lp_test_blend.c  | 2 +-
+ src/gallium/drivers/llvmpipe/lp_test_conv.c   | 2 +-
+ src/gallium/drivers/llvmpipe/lp_test_format.c | 4 ++--
+ src/gallium/drivers/llvmpipe/lp_test_printf.c | 2 +-
+ 7 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
+index 50c157bc3cc..8b3a1522725 100644
+--- a/src/gallium/auxiliary/draw/draw_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_llvm.c
+@@ -784,7 +784,7 @@ draw_llvm_create(struct draw_context *draw, LLVMContextRef context)
+    if (!llvm->context) {
+       llvm->context = LLVMContextCreate();
+
+-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR == 15
+       LLVMContextSetOpaquePointers(llvm->context, false);
+ #endif
+
+diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c
+index 8309335aebc..0ef4317fc76 100644
+--- a/src/gallium/drivers/llvmpipe/lp_context.c
+++ b/src/gallium/drivers/llvmpipe/lp_context.c
+@@ -263,7 +263,7 @@ llvmpipe_create_context(struct pipe_screen *screen, void *priv,
+    if (!llvmpipe->context)
+       goto fail;
+
+-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR == 15
+    LLVMContextSetOpaquePointers(llvmpipe->context, false);
+ #endif
+
+diff --git a/src/gallium/drivers/llvmpipe/lp_test_arit.c b/src/gallium/drivers/llvmpipe/lp_test_arit.c
+index 4118928d52e..565b1c47753 100644
+--- a/src/gallium/drivers/llvmpipe/lp_test_arit.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_arit.c
+@@ -434,7 +434,7 @@ test_unary(unsigned verbose, FILE *fp, const struct unary_test_t *test, unsigned
+    }
+
+    context = LLVMContextCreate();
+-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR == 15
+    LLVMContextSetOpaquePointers(context, false);
+ #endif
+    gallivm = gallivm_create("test_module", context, NULL);
+diff --git a/src/gallium/drivers/llvmpipe/lp_test_blend.c b/src/gallium/drivers/llvmpipe/lp_test_blend.c
+index 37c3f731eaf..3d2899a78d4 100644
+--- a/src/gallium/drivers/llvmpipe/lp_test_blend.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_blend.c
+@@ -452,7 +452,7 @@ test_one(unsigned verbose,
+       dump_blend_type(stdout, blend, type);
+
+    context = LLVMContextCreate();
+-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR == 15
+    LLVMContextSetOpaquePointers(context, false);
+ #endif
+    gallivm = gallivm_create("test_module", context, NULL);
+diff --git a/src/gallium/drivers/llvmpipe/lp_test_conv.c b/src/gallium/drivers/llvmpipe/lp_test_conv.c
+index c7ea9efc12d..83236f0c0ba 100644
+--- a/src/gallium/drivers/llvmpipe/lp_test_conv.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_conv.c
+@@ -223,7 +223,7 @@ test_one(unsigned verbose,
+    }
+
+    context = LLVMContextCreate();
+-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR == 15
+    LLVMContextSetOpaquePointers(context, false);
+ #endif
+    gallivm = gallivm_create("test_module", context, NULL);
+diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c
+index 0a2a1e449e8..89f7d5dec1a 100644
+--- a/src/gallium/drivers/llvmpipe/lp_test_format.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_format.c
+@@ -150,7 +150,7 @@ test_format_float(unsigned verbose, FILE *fp,
+    unsigned i, j, k, l;
+
+    context = LLVMContextCreate();
+-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR == 15
+    LLVMContextSetOpaquePointers(context, false);
+ #endif
+    gallivm = gallivm_create("test_module_float", context, NULL);
+@@ -254,7 +254,7 @@ test_format_unorm8(unsigned verbose, FILE *fp,
+    unsigned i, j, k, l;
+
+    context = LLVMContextCreate();
+-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR == 15
+    LLVMContextSetOpaquePointers(context, false);
+ #endif
+    gallivm = gallivm_create("test_module_unorm8", context, NULL);
+diff --git a/src/gallium/drivers/llvmpipe/lp_test_printf.c b/src/gallium/drivers/llvmpipe/lp_test_printf.c
+index b3de9cb9e8b..850c0abfe22 100644
+--- a/src/gallium/drivers/llvmpipe/lp_test_printf.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_printf.c
+@@ -96,7 +96,7 @@ test_printf(unsigned verbose, FILE *fp,
+    boolean success = TRUE;
+
+    context = LLVMContextCreate();
+-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR == 15
+    LLVMContextSetOpaquePointers(context, false);
+ #endif
+    gallivm = gallivm_create("test_module", context, NULL);
+--
+2.17.1
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
@@ -0,0 +1,58 @@
+From 2dfe0f899aeb415a5491b8c67e208673d2a2914f Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Fri, 22 Sep 2023 21:50:08 -0500
+Subject: [PATCH] gallium: Fix build with llvm 17
+
+These headers are not available for C files in llvm 17+
+and they seem to be not needed to compile after all with llvm 17
+so add conditions to exclude them for llvm >= 17
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21262]
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22980]
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_init.c   | 8 ++++----
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+index 584ea738668..fe8bb2b11af 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+@@ -42,14 +42,14 @@
+
+ #include <llvm/Config/llvm-config.h>
+ #include <llvm-c/Analysis.h>
+-#include <llvm-c/Transforms/Scalar.h>
+-#if LLVM_VERSION_MAJOR >= 7
+-#include <llvm-c/Transforms/Utils.h>
+-#endif
+ #include <llvm-c/BitWriter.h>
+ #if GALLIVM_USE_NEW_PASS == 1
+ #include <llvm-c/Transforms/PassBuilder.h>
+ #elif GALLIVM_HAVE_CORO == 1
+#include <llvm-c/Transforms/Scalar.h>
+#if LLVM_VERSION_MAJOR >= 7
+#include <llvm-c/Transforms/Utils.h>
+#endif
+ #if LLVM_VERSION_MAJOR <= 8 && (defined(PIPE_ARCH_AARCH64) || defined (PIPE_ARCH_ARM) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_MIPS64))
+ #include <llvm-c/Transforms/IPO.h>
+ #endif
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 2279e5acb28..0caeaf94263 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -56,7 +56,11 @@
+ #include <llvm-c/ExecutionEngine.h>
+ #include <llvm/Target/TargetOptions.h>
+ #include <llvm/ExecutionEngine/ExecutionEngine.h>
+#if LLVM_VERSION_MAJOR >= 17
+#include <llvm/TargetParser/Triple.h>
+#else
+ #include <llvm/ADT/Triple.h>
+#endif
+ #include <llvm/Analysis/TargetLibraryInfo.h>
+ #include <llvm/ExecutionEngine/SectionMemoryManager.h>
+ #include <llvm/Support/CommandLine.h>
+--
+2.17.1
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-17.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-17.patch
@@ -0,0 +1,40 @@
+From 6d07f6aa7f92f40d78a2db645f16f0f3e7d3c2e8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 23 Jun 2023 01:20:38 -0700
+Subject: [PATCH] gallium: Fix build with llvm 17
+
+These headers are not available for C files in llvm 17+
+and they seem to be not needed to compile after all with llvm 17
+so add conditions to exclude them for llvm >= 17
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+---
+ src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+index cd2108f..b1a4d03 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+@@ -46,15 +46,19 @@
+ #if GALLIVM_USE_NEW_PASS == 1
+ #include <llvm-c/Transforms/PassBuilder.h>
+ #elif GALLIVM_HAVE_CORO == 1
+#if LLVM_VERSION_MAJOR < 17
+ #include <llvm-c/Transforms/Scalar.h>
+-#if LLVM_VERSION_MAJOR >= 7
+#endif
+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17
+ #include <llvm-c/Transforms/Utils.h>
+ #endif
+ #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
+ #include <llvm-c/Transforms/IPO.h>
+ #endif
+#if LLVM_VERSION_MAJOR < 17
+ #include <llvm-c/Transforms/Coroutines.h>
+ #endif
+#endif
+
+ unsigned gallivm_perf = 0;
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
@@ -0,0 +1,42 @@
+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,
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)}`