CI/CD Auto-Merger: cicd.kirkstone.202410031110

Updated the value(s) for:
  ti-linux-fw: CNM_WAVE521_FW_VERSION,PRUETH_FW_AM65X_SR2_VERSION,TI_DM_FW_VERSION,TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION
  u-boot-ti-staging_2023.04: SRCREV
  linux-ti-staging-rt_6.1: PV,SRCREV
  linux-ti-staging_6.1: PV,SRCREV

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

meta-ti-bsp/README

@@ -8,11 +8,11 @@ This layer depends on:
 
 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: master
+branch: kirkstone
 
 URI: git://git.yoctoproject.org/meta-arm
 layers: meta-arm
-branch: master
+branch: kirkstone
 
 
 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto

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

meta-ti-bsp/conf/layer.conf

@@ -31,3 +31,4 @@ 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}"

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

@@ -10,6 +10,7 @@ SERIAL_CONSOLES = "115200;ttyS2"
 
 KERNEL_DEVICETREE_PREFIX = " \
     am57 \
+    ov10635 \
     ti/am57 \
     ti/lcd \
     ti/ov10635 \

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

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"

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

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 \

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"

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

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

@@ -4,7 +4,10 @@
 
 require conf/machine/include/am62xx.inc
 
-KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
 
 KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \

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-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2"

meta-ti-bsp/conf/machine/beagle-x15.conf

@@ -9,9 +9,11 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
 
 KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
+am57xx-beagle-x15.dtb \
+am57xx-beagle-x15-revb1.dtb \
+am57xx-beagle-x15-revc.dtb \
+am57xx-idk-lcd-osd101t2045.dtbo \
+am57xx-idk-lcd-osd101t2587.dtbo \
 "
 
 MACHINE_GUI_CLASS = "bigscreen"

meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf

@@ -15,3 +15,9 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
 
 UBOOT_MACHINE = "j721e_evm_r5_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.
+UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_r5.config"

meta-ti-bsp/conf/machine/beaglebone-ai64.conf

@@ -6,67 +6,30 @@ require conf/machine/include/j721e.inc
 
 UBOOT_MACHINE = "j721e_evm_a72_config"
 
+
+# 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.
+UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 
 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-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
 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-csi2-ov5640.dtbo \
+ti/k3-j721e-evm-fusion.dtbo \
+ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-pcie0-ep.dtbo \
+ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
+ti/k3-j721e-evm-virt-mac-client.dtbo \
 ti/k3-j721e-sk.dtb \
-ti/k3-j721e-sk-rpi-cam-imx219.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"

meta-ti-bsp/conf/machine/beaglebone.conf

@@ -9,17 +9,60 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 KERNEL_DEVICETREE_PREFIX = "am335x-bone"
 
 KERNEL_DEVICETREE = " \
-    am335x-bone.dtb \
-    am335x-boneblue.dtb \
-    am335x-boneblack.dtb \
-    am335x-boneblack-wireless.dtb \
-    am335x-bonegreen.dtb \
-    am335x-bonegreen-wireless.dtb \
+am335x-bone.dtb \
+am335x-boneblack.dtb \
+am335x-boneblack-pps.dtb \
+am335x-boneblack-uboot.dtb \
+am335x-boneblack-uboot-univ.dtb \
+am335x-boneblack-wireless.dtb \
+am335x-boneblue.dtb \
+am335x-bonegreen.dtb \
+am335x-bonegreen-gateway.dtb \
+am335x-bonegreen-wireless.dtb \
+am335x-bonegreen-wireless-uboot-univ.dtb \
+am335x-pocketbeagle.dtb \
+am335x-sancloud-bbe.dtb \
+am335x-sancloud-bbe-extended-wifi.dtb \
+am335x-sancloud-bbe-lite.dtb \
+"
+
+# Extra DT overlays/capes
+KERNEL_DEVICETREE += " \
+AM335X-PRU-UIO-00A0.dtbo \
+BB-ADC-00A0.dtbo \
+BB-BBBW-WL1835-00A0.dtbo \
+BB-BBGG-WL1835-00A0.dtbo \
+BB-BBGW-WL1835-00A0.dtbo \
+BB-BONE-4D5R-01-00A1.dtbo \
+BB-BONE-eMMC1-01-00A0.dtbo \
+BB-BONE-LCD4-01-00A1.dtbo \
+BB-BONE-NH7C-01-A0.dtbo \
+BB-CAPE-DISP-CT4-00A0.dtbo \
+BB-HDMI-TDA998x-00A0.dtbo \
+BB-I2C1-MCP7940X-00A0.dtbo \
+BB-I2C1-RTC-DS3231.dtbo \
+BB-I2C1-RTC-PCF8563.dtbo \
+BB-I2C2-BME680.dtbo \
+BB-I2C2-MPU6050.dtbo \
+BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
+BB-NHDMI-TDA998x-00A0.dtbo \
+BBORG_COMMS-00A2.dtbo \
+BBORG_FAN-A000.dtbo \
+BBORG_RELAY-00A2.dtbo \
+BB-SPIDEV0-00A0.dtbo \
+BB-SPIDEV1-00A0.dtbo \
+BB-UART1-00A0.dtbo \
+BB-UART2-00A0.dtbo \
+BB-UART4-00A0.dtbo \
+BB-W1-P9.12-00A0.dtbo \
+BONE-ADC.dtbo \
+M-BB-BBG-00A0.dtbo \
+M-BB-BBGG-00A0.dtbo \
+PB-MIKROBUS-0.dtbo \
+PB-MIKROBUS-1.dtbo \
 "
 
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_FEATURES += "screen"
 
 SERIAL_CONSOLES = "115200;ttyS0"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"

meta-ti-bsp/conf/machine/beagleplay-k3r5.conf

@@ -4,8 +4,16 @@
 
 require conf/machine/include/k3r5.inc
 
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
+PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
+
 SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"
 
 UBOOT_MACHINE = "am62x_evm_r5_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.
+UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config"

meta-ti-bsp/conf/machine/beagleplay.conf

@@ -20,50 +20,53 @@ OPTEEMACHINE = "k3-am62x"
 
 UBOOT_MACHINE = "am62x_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.
+UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
+PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
 
 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-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.dtb \
+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-audio.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"

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"

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"

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 ?= "ti-img-rogue-driver"
+
+# 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"

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-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2"

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 ?= "ti-sgx-ddk-km"
 
 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-am65x"

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

@@ -1,6 +1,23 @@
 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_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin"
+
+# 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"

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

@@ -12,14 +12,24 @@ 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
+# Since default on J721e is for GP, add a version for SR1.1 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb"
+
+# Since default on J721e is for GP, add a version for SR1.1 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 SR2.0 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 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 SR2.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb"
 
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"

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

@@ -6,6 +6,17 @@ MACHINE_FEATURES += "screen gpu"
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# 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"

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

@@ -0,0 +1,22 @@
+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 ?= "ti-img-rogue-driver"
+
+# 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_BOOT_FILES += "tiboot3-j722s-hs-evm.bin"
+
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
+
+SERIAL_CONSOLES = "115200;ttyS2"

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

@@ -6,6 +6,17 @@ MACHINE_FEATURES += "screen gpu"
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
+# 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"

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

@@ -40,6 +40,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

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

@@ -12,8 +12,8 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc
 # 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"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
 
 SPL_SUFFIX = "bin"
 SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"

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

@@ -13,7 +13,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
 
 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= ""
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
 
 KERNEL_IMAGETYPE = "zImage"
@@ -40,6 +40,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"

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

@@ -11,4 +11,6 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
+
 MACHINE_FEATURES = "serial usbhost usbgadget alsa"

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

@@ -1,5 +1,9 @@
 # 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"
+
+# TI platforms all use devicetrees with overlays
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
 KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
+
 require conf/machine/include/soc-family.inc

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

@@ -14,7 +14,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
 
 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= ""
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"
 
 KERNEL_IMAGETYPE = "zImage"
@@ -63,6 +63,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"
 

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

@@ -14,7 +14,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
 
 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= ""
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
 
 KERNEL_IMAGETYPE = "zImage"
@@ -57,7 +57,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"

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"

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"

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"

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"

meta-ti-bsp/conf/multiconfig/k3r5.conf

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

meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb

@@ -8,18 +8,13 @@ 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"

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

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,13 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0"
 PV = "${CNM_WAVE521_FW_VERSION}"
 PR = "${INC_PR}.1"
 
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "j721s2|j784s4|am62axx"
+COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|am62axx|am62pxx"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git"
 TARGET_WAVE521C = "wave521c_codec_fw.bin"
 
 SOURCE_WAVE521C = "wave521c_k3_codec_fw.bin"
@@ -33,10 +29,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"

meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db"
 PV = "6.2+git${SRCPV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit deploy
 inherit update-alternatives
 
 PROTOCOL = "https"

meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb

@@ -8,13 +8,10 @@ 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 +19,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"

meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb

@@ -12,7 +12,7 @@ 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 +22,14 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;
 
 S = "${WORKDIR}/git"
 
-SRCREV = "c0adc3c36f4a0b2f590abfe0609b03096d58c648"
+SRCREV = "c89c1efa4a1ee5da64fd525f45e9e33728cf6181"
 
 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"
 

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
 
@@ -16,33 +16,30 @@ 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"

meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb

@@ -5,14 +5,10 @@ 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 \
@@ -28,7 +24,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"

meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb

@@ -5,14 +5,10 @@ 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 \
@@ -26,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"

meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb

@@ -4,14 +4,10 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
 PR = "${INC_PR}.0"
 
-CLEANBROKEN = "1"
-
 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"
@@ -23,8 +19,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"

meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb

@@ -5,14 +5,10 @@ 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 \
@@ -28,7 +24,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"

meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb

@@ -5,14 +5,10 @@ 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-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf"
 TARGET:ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf"
@@ -24,7 +20,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"

meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb

@@ -5,14 +5,10 @@ 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"
@@ -24,7 +20,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"

meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb

@@ -5,14 +5,10 @@ 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 \
@@ -28,7 +24,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"

meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb

@@ -4,14 +4,10 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
 PR = "${INC_PR}.0"
 
-CLEANBROKEN = "1"
-
 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"
@@ -23,8 +19,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"

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

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"

meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb

@@ -7,18 +7,13 @@ 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"

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.03"
 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.05"
+TI_SYSFW_VERSION = "10.00.08"
 
-TI_LINUX_FW_SRCREV ?= "b99791cb6496139dbeb1ccf0a72bb1cb1ecfa7e6"
+TI_LINUX_FW_SRCREV ?= "64248dad39a9448ad191bc04130c49e0354cb2ce"
 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"

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

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${SRCPV}"
+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"

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"

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"

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 = "2023.07"
+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 = "2023.07"
 # 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 = "83cdab8b2c6ea0fc0860f8444d083353b47f1d5c"
+SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e"

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 = "17439dc59aec6375772c4302a33b23370ca9c2d5"
-
-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 = "7044504f44002fe46b4598420852033d335d56c7"

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

@@ -1,6 +1,9 @@
-# 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"
@@ -14,7 +17,7 @@ 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"
@@ -40,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"
@@ -54,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)"
 
@@ -82,6 +89,10 @@ SPL_UART_BINARY:k3r5 = ""
 SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
 SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
 
+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"
 UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${PV}-${PR}"
@@ -103,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/u-boot-spl.${UBOOT_SUFFIX} ${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
 }
 
@@ -122,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}
@@ -152,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}
@@ -183,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 () {
@@ -203,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}
@@ -248,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}
@@ -273,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"

meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb

@@ -6,8 +6,6 @@ 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"
 SRC_URI[dra7xx-evm.sha256sum] = "a0b254ffd0c7f481cb3989e632088f5e4a233c73a1c676faa3061721ea60dc90"

meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb

@@ -1,18 +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"
 
 inherit cmake
 
-PV = "0.2+git${SRCPV}"
+PV = "0.3+git${SRCPV}"
 
 COMPATIBLE_MACHINE = "k3"
 
 BRANCH ?= "master"
-SRCREV = "3297ea3ecb1fd39ce70504335dc2e5fb7e33dbfe"
+SRCREV = "30a1d5b2d08c0da39d4e62b3ebee591a9882fa21"
 
 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
-

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb

@@ -23,13 +23,13 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-SRCREV = "54fd9d7dea098b6f11c2a244b0c6763dc8c5690c"
-
 PACKAGECONFIG:append = " \
     ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \
     ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
 "
 
+SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083"
+
 PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
 PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
 PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"

meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb

@@ -6,19 +6,21 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de52
 inherit bin_package
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx"
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
 
 PR = "r2"
 
 BRANCH = "linuxws/kirkstone/k6.1/${PV}"
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
-SRCREV = "6e460fee82d07513bb329b3022e5430c5ba73809"
+SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199"
 S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"
 
 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"
 
@@ -29,7 +31,7 @@ RDEPENDS:${PN} = " \
 "
 
 PACKAGECONFIG ?= " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan x11 wayland', 'vulkan', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan wayland', 'vulkan', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'opengl opencl', d)} \
 "
 
@@ -66,7 +68,9 @@ do_install:prepend() {
         done
     fi
     if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
-        mv ${S}/lib/firmware ${S}${nonarch_base_libdir}
+        if [ -e ${S}/lib/firmware ]; then
+            mv ${S}/lib/firmware ${S}${nonarch_base_libdir}
+        fi
     fi
 
     # clean up any empty directories
@@ -115,7 +119,7 @@ RDEPENDS:libgles2-rogue += "mesa-megadriver"
 
 # vulkan specific shared objects and configs
 FILES:libvk-rogue = "${libdir}/libVK_IMG.so* ${datadir}/vulkan"
-RDEPENDS:libvk-rogue += "vulkan-loader libx11-xcb wayland libdrm"
+RDEPENDS:libvk-rogue += "vulkan-loader wayland libdrm"
 
 # opencl specific shared objects and configs
 FILES:libopencl-rogue = "${libdir}/libPVROCL.so* ${sysconfdir}/OpenCL"

meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um/pvrsrvkm.rules

@@ -1 +0,0 @@
-SUBSYSTEM=="platform", ACTION=="bind", ENV{DRIVER}=="pvrsrvkm", RUN+="/usr/bin/pvrsrvctl --start --no-module"

meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb

@@ -1,38 +1,35 @@
 DESCRIPTION = "Userspace libraries for PowerVR SGX chipset on TI SoCs"
 HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux"
 LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
 
 PR = "r38"
 
-BRANCH = "ti-img-sgx/kirkstone-mesa/${PV}"
+BRANCH = "${PV}/mesa/glibc-2.35"
 
 SRC_URI = " \
     git://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git;protocol=https;branch=${BRANCH} \
-    file://pvrsrvkm.rules \
 "
-SRCREV = "bbae7217051341f515515ec190e165119102f45a"
-
-TARGET_PRODUCT:ti33x = "ti335x"
-TARGET_PRODUCT:ti43x = "ti437x"
-TARGET_PRODUCT:omap-a15 = "ti572x"
-TARGET_PRODUCT:am65xx = "ti654x"
+SRCREV = "70364424dd496833fad5b243c9e6cc8b077f04ac"
 
 INITSCRIPT_NAME = "rc.pvr"
 INITSCRIPT_PARAMS = "defaults 8"
 
 PACKAGECONFIG ??= "udev"
-PACKAGECONFIG[udev] = ",,,udev"
+PACKAGECONFIG[udev] = "UDEV=true,,,udev"
 
-def use_initscript(d):
-    sysvinit = bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d)
-    udev = bb.utils.contains('PACKAGECONFIG', 'udev', True, False, d)
-    return sysvinit and not udev
+def use_sysvinit(d):
+    return d.getVar('VIRTUAL-RUNTIME_init_manager') == 'sysvinit'
 
-inherit ${@oe.utils.ifelse(use_initscript(d), 'update-rc.d', '')}
+inherit ${@oe.utils.ifelse(use_sysvinit(d), 'update-rc.d', '')}
+
+TARGET_PRODUCT:ti33x = "ti335x_linux"
+TARGET_PRODUCT:ti43x = "ti437x_linux"
+TARGET_PRODUCT:omap-a15 = "ti572x_linux"
+TARGET_PRODUCT:am65xx = "ti654x_linux"
 
 RDEPENDS:${PN} += "libdrm"
 
@@ -40,24 +37,10 @@ RRECOMMENDS:${PN} += "ti-sgx-ddk-km"
 
 S = "${WORKDIR}/git"
 
-do_install () {
-    oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT}
+EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} ${PACKAGECONFIG_CONFARGS}"
 
-    without_sysvinit=${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}
-    with_udev=${@bb.utils.contains('PACKAGECONFIG', 'udev', 'true', 'false', d)}
-
-    # Delete initscript if it is not needed or would conflict with the udev rules
-    if ${@oe.utils.ifelse(use_initscript(d), 'false', 'true')}; then
-        rm -rf ${D}${sysconfdir}/init.d
-        rmdir --ignore-fail-on-non-empty ${D}${sysconfdir}
-    fi
-
-    if $with_udev; then
-        install -m644 -D ${WORKDIR}/pvrsrvkm.rules \
-            ${D}${nonarch_base_libdir}/udev/rules.d/80-pvrsrvkm.rules
-    fi
-
-    chown -R root:root ${D}
+do_install() {
+    oe_runmake install
 }
 
 FILES:${PN} =  "${bindir}/*"
@@ -66,6 +49,10 @@ FILES:${PN} +=  "${includedir}/*"
 FILES:${PN} +=  "${sysconfdir}/*"
 FILES:${PN} +=  "${datadir}/*"
 FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d"
+FILES:${PN} += "${nonarch_base_libdir}/systemd/system"
+
+# No debug or dev packages for this recipe
+PACKAGES = "${PN}"
 
 INSANE_SKIP:${PN} += "ldflags"
-INSANE_SKIP:${PN} += "already-stripped"
+INSANE_SKIP:${PN} += "already-stripped dev-so"

meta-ti-bsp/recipes-kernel/linux/ffa-debugfs/ffa-debugfs-mod_%.bbappend

@@ -1,5 +0,0 @@
-# Added my meta-arm, this needs ceetain backports in 5.10
-# Disable until kernel upgrades to newer than 5.10 where it
-# is already upstreamed
-# Revisit when kernel is upgraded to 5.15 or newer e.g.
-COMPATIBLE_HOST:ti-soc = "null"

meta-ti-bsp/recipes-kernel/linux/files/0001-ata-ahci-fix-enum-constants-for-gcc-13.patch

@@ -1,351 +0,0 @@
-From f07788079f515ca4a681c5f595bdad19cfbd7b1d Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Sat, 3 Dec 2022 11:54:25 +0100
-Subject: [PATCH] ata: ahci: fix enum constants for gcc-13
-
-gcc-13 slightly changes the type of constant expressions that are defined
-in an enum, which triggers a compile time sanity check in libata:
-
-linux/drivers/ata/libahci.c: In function 'ahci_led_store':
-linux/include/linux/compiler_types.h:357:45: error: call to '__compiletime_assert_302' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
-357 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
-
-The new behavior is that sizeof() returns the same value for the
-constant as it does for the enum type, which is generally more sensible
-and consistent.
-
-The problem in libata is that it contains a single enum definition for
-lots of unrelated constants, some of which are large positive (unsigned)
-integers like 0xffffffff, while others like (1<<31) are interpreted as
-negative integers, and this forces the enum type to become 64 bit wide
-even though most constants would still fit into a signed 32-bit 'int'.
-
-Fix this by changing the entire enum definition to use BIT(x) in place
-of (1<<x), which results in all values being seen as 'unsigned' and
-fitting into an unsigned 32-bit type.
-
-Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107917
-Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107405
-Reported-by: Luis Machado <luis.machado@arm.com>
-Cc: linux-ide@vger.kernel.org
-Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
-Cc: stable@vger.kernel.org
-Cc: Randy Dunlap <rdunlap@infradead.org>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Tested-by: Luis Machado <luis.machado@arm.com>
-Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
----
- drivers/ata/ahci.h | 245 +++++++++++++++++++++++----------------------
- 1 file changed, 123 insertions(+), 122 deletions(-)
-
---- a/drivers/ata/ahci.h
-+++ b/drivers/ata/ahci.h
-@@ -24,6 +24,7 @@
- #include <linux/libata.h>
- #include <linux/phy/phy.h>
- #include <linux/regulator/consumer.h>
-+#include <linux/bits.h>
-
- /* Enclosure Management Control */
- #define EM_CTRL_MSG_TYPE              0x000f0000
-@@ -54,12 +55,12 @@ enum {
-	AHCI_PORT_PRIV_FBS_DMA_SZ	= AHCI_CMD_SLOT_SZ +
-					  AHCI_CMD_TBL_AR_SZ +
-					  (AHCI_RX_FIS_SZ * 16),
--	AHCI_IRQ_ON_SG		= (1 << 31),
--	AHCI_CMD_ATAPI		= (1 << 5),
--	AHCI_CMD_WRITE		= (1 << 6),
--	AHCI_CMD_PREFETCH	= (1 << 7),
--	AHCI_CMD_RESET		= (1 << 8),
--	AHCI_CMD_CLR_BUSY	= (1 << 10),
-+	AHCI_IRQ_ON_SG		= BIT(31),
-+	AHCI_CMD_ATAPI		= BIT(5),
-+	AHCI_CMD_WRITE		= BIT(6),
-+	AHCI_CMD_PREFETCH	= BIT(7),
-+	AHCI_CMD_RESET		= BIT(8),
-+	AHCI_CMD_CLR_BUSY	= BIT(10),
-
-	RX_FIS_PIO_SETUP	= 0x20,	/* offset of PIO Setup FIS data */
-	RX_FIS_D2H_REG		= 0x40,	/* offset of D2H Register FIS data */
-@@ -77,37 +78,37 @@ enum {
-	HOST_CAP2		= 0x24, /* host capabilities, extended */
-
-	/* HOST_CTL bits */
--	HOST_RESET		= (1 << 0),  /* reset controller; self-clear */
--	HOST_IRQ_EN		= (1 << 1),  /* global IRQ enable */
--	HOST_MRSM		= (1 << 2),  /* MSI Revert to Single Message */
--	HOST_AHCI_EN		= (1 << 31), /* AHCI enabled */
-+	HOST_RESET		= BIT(0),  /* reset controller; self-clear */
-+	HOST_IRQ_EN		= BIT(1),  /* global IRQ enable */
-+	HOST_MRSM		= BIT(2),  /* MSI Revert to Single Message */
-+	HOST_AHCI_EN		= BIT(31), /* AHCI enabled */
-
-	/* HOST_CAP bits */
--	HOST_CAP_SXS		= (1 << 5),  /* Supports External SATA */
--	HOST_CAP_EMS		= (1 << 6),  /* Enclosure Management support */
--	HOST_CAP_CCC		= (1 << 7),  /* Command Completion Coalescing */
--	HOST_CAP_PART		= (1 << 13), /* Partial state capable */
--	HOST_CAP_SSC		= (1 << 14), /* Slumber state capable */
--	HOST_CAP_PIO_MULTI	= (1 << 15), /* PIO multiple DRQ support */
--	HOST_CAP_FBS		= (1 << 16), /* FIS-based switching support */
--	HOST_CAP_PMP		= (1 << 17), /* Port Multiplier support */
--	HOST_CAP_ONLY		= (1 << 18), /* Supports AHCI mode only */
--	HOST_CAP_CLO		= (1 << 24), /* Command List Override support */
--	HOST_CAP_LED		= (1 << 25), /* Supports activity LED */
--	HOST_CAP_ALPM		= (1 << 26), /* Aggressive Link PM support */
--	HOST_CAP_SSS		= (1 << 27), /* Staggered Spin-up */
--	HOST_CAP_MPS		= (1 << 28), /* Mechanical presence switch */
--	HOST_CAP_SNTF		= (1 << 29), /* SNotification register */
--	HOST_CAP_NCQ		= (1 << 30), /* Native Command Queueing */
--	HOST_CAP_64		= (1 << 31), /* PCI DAC (64-bit DMA) support */
-+	HOST_CAP_SXS		= BIT(5),  /* Supports External SATA */
-+	HOST_CAP_EMS		= BIT(6),  /* Enclosure Management support */
-+	HOST_CAP_CCC		= BIT(7),  /* Command Completion Coalescing */
-+	HOST_CAP_PART		= BIT(13), /* Partial state capable */
-+	HOST_CAP_SSC		= BIT(14), /* Slumber state capable */
-+	HOST_CAP_PIO_MULTI	= BIT(15), /* PIO multiple DRQ support */
-+	HOST_CAP_FBS		= BIT(16), /* FIS-based switching support */
-+	HOST_CAP_PMP		= BIT(17), /* Port Multiplier support */
-+	HOST_CAP_ONLY		= BIT(18), /* Supports AHCI mode only */
-+	HOST_CAP_CLO		= BIT(24), /* Command List Override support */
-+	HOST_CAP_LED		= BIT(25), /* Supports activity LED */
-+	HOST_CAP_ALPM		= BIT(26), /* Aggressive Link PM support */
-+	HOST_CAP_SSS		= BIT(27), /* Staggered Spin-up */
-+	HOST_CAP_MPS		= BIT(28), /* Mechanical presence switch */
-+	HOST_CAP_SNTF		= BIT(29), /* SNotification register */
-+	HOST_CAP_NCQ		= BIT(30), /* Native Command Queueing */
-+	HOST_CAP_64		= BIT(31), /* PCI DAC (64-bit DMA) support */
-
-	/* HOST_CAP2 bits */
--	HOST_CAP2_BOH		= (1 << 0),  /* BIOS/OS handoff supported */
--	HOST_CAP2_NVMHCI	= (1 << 1),  /* NVMHCI supported */
--	HOST_CAP2_APST		= (1 << 2),  /* Automatic partial to slumber */
--	HOST_CAP2_SDS		= (1 << 3),  /* Support device sleep */
--	HOST_CAP2_SADM		= (1 << 4),  /* Support aggressive DevSlp */
--	HOST_CAP2_DESO		= (1 << 5),  /* DevSlp from slumber only */
-+	HOST_CAP2_BOH		= BIT(0),  /* BIOS/OS handoff supported */
-+	HOST_CAP2_NVMHCI	= BIT(1),  /* NVMHCI supported */
-+	HOST_CAP2_APST		= BIT(2),  /* Automatic partial to slumber */
-+	HOST_CAP2_SDS		= BIT(3),  /* Support device sleep */
-+	HOST_CAP2_SADM		= BIT(4),  /* Support aggressive DevSlp */
-+	HOST_CAP2_DESO		= BIT(5),  /* DevSlp from slumber only */
-
-	/* registers for each SATA port */
-	PORT_LST_ADDR		= 0x00, /* command list DMA addr */
-@@ -129,24 +130,24 @@ enum {
-	PORT_DEVSLP		= 0x44, /* device sleep */
-
-	/* PORT_IRQ_{STAT,MASK} bits */
--	PORT_IRQ_COLD_PRES	= (1 << 31), /* cold presence detect */
--	PORT_IRQ_TF_ERR		= (1 << 30), /* task file error */
--	PORT_IRQ_HBUS_ERR	= (1 << 29), /* host bus fatal error */
--	PORT_IRQ_HBUS_DATA_ERR	= (1 << 28), /* host bus data error */
--	PORT_IRQ_IF_ERR		= (1 << 27), /* interface fatal error */
--	PORT_IRQ_IF_NONFATAL	= (1 << 26), /* interface non-fatal error */
--	PORT_IRQ_OVERFLOW	= (1 << 24), /* xfer exhausted available S/G */
--	PORT_IRQ_BAD_PMP	= (1 << 23), /* incorrect port multiplier */
--
--	PORT_IRQ_PHYRDY		= (1 << 22), /* PhyRdy changed */
--	PORT_IRQ_DEV_ILCK	= (1 << 7), /* device interlock */
--	PORT_IRQ_CONNECT	= (1 << 6), /* port connect change status */
--	PORT_IRQ_SG_DONE	= (1 << 5), /* descriptor processed */
--	PORT_IRQ_UNK_FIS	= (1 << 4), /* unknown FIS rx'd */
--	PORT_IRQ_SDB_FIS	= (1 << 3), /* Set Device Bits FIS rx'd */
--	PORT_IRQ_DMAS_FIS	= (1 << 2), /* DMA Setup FIS rx'd */
--	PORT_IRQ_PIOS_FIS	= (1 << 1), /* PIO Setup FIS rx'd */
--	PORT_IRQ_D2H_REG_FIS	= (1 << 0), /* D2H Register FIS rx'd */
-+	PORT_IRQ_COLD_PRES	= BIT(31), /* cold presence detect */
-+	PORT_IRQ_TF_ERR		= BIT(30), /* task file error */
-+	PORT_IRQ_HBUS_ERR	= BIT(29), /* host bus fatal error */
-+	PORT_IRQ_HBUS_DATA_ERR	= BIT(28), /* host bus data error */
-+	PORT_IRQ_IF_ERR		= BIT(27), /* interface fatal error */
-+	PORT_IRQ_IF_NONFATAL	= BIT(26), /* interface non-fatal error */
-+	PORT_IRQ_OVERFLOW	= BIT(24), /* xfer exhausted available S/G */
-+	PORT_IRQ_BAD_PMP	= BIT(23), /* incorrect port multiplier */
-+
-+	PORT_IRQ_PHYRDY		= BIT(22), /* PhyRdy changed */
-+	PORT_IRQ_DEV_ILCK	= BIT(7), /* device interlock */
-+	PORT_IRQ_CONNECT	= BIT(6), /* port connect change status */
-+	PORT_IRQ_SG_DONE	= BIT(5), /* descriptor processed */
-+	PORT_IRQ_UNK_FIS	= BIT(4), /* unknown FIS rx'd */
-+	PORT_IRQ_SDB_FIS	= BIT(3), /* Set Device Bits FIS rx'd */
-+	PORT_IRQ_DMAS_FIS	= BIT(2), /* DMA Setup FIS rx'd */
-+	PORT_IRQ_PIOS_FIS	= BIT(1), /* PIO Setup FIS rx'd */
-+	PORT_IRQ_D2H_REG_FIS	= BIT(0), /* D2H Register FIS rx'd */
-
-	PORT_IRQ_FREEZE		= PORT_IRQ_HBUS_ERR |
-				  PORT_IRQ_IF_ERR |
-@@ -162,34 +163,34 @@ enum {
-				  PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS,
-
-	/* PORT_CMD bits */
--	PORT_CMD_ASP		= (1 << 27), /* Aggressive Slumber/Partial */
--	PORT_CMD_ALPE		= (1 << 26), /* Aggressive Link PM enable */
--	PORT_CMD_ATAPI		= (1 << 24), /* Device is ATAPI */
--	PORT_CMD_FBSCP		= (1 << 22), /* FBS Capable Port */
--	PORT_CMD_ESP		= (1 << 21), /* External Sata Port */
--	PORT_CMD_HPCP		= (1 << 18), /* HotPlug Capable Port */
--	PORT_CMD_PMP		= (1 << 17), /* PMP attached */
--	PORT_CMD_LIST_ON	= (1 << 15), /* cmd list DMA engine running */
--	PORT_CMD_FIS_ON		= (1 << 14), /* FIS DMA engine running */
--	PORT_CMD_FIS_RX		= (1 << 4), /* Enable FIS receive DMA engine */
--	PORT_CMD_CLO		= (1 << 3), /* Command list override */
--	PORT_CMD_POWER_ON	= (1 << 2), /* Power up device */
--	PORT_CMD_SPIN_UP	= (1 << 1), /* Spin up device */
--	PORT_CMD_START		= (1 << 0), /* Enable port DMA engine */
--
--	PORT_CMD_ICC_MASK	= (0xf << 28), /* i/f ICC state mask */
--	PORT_CMD_ICC_ACTIVE	= (0x1 << 28), /* Put i/f in active state */
--	PORT_CMD_ICC_PARTIAL	= (0x2 << 28), /* Put i/f in partial state */
--	PORT_CMD_ICC_SLUMBER	= (0x6 << 28), /* Put i/f in slumber state */
-+	PORT_CMD_ASP		= BIT(27), /* Aggressive Slumber/Partial */
-+	PORT_CMD_ALPE		= BIT(26), /* Aggressive Link PM enable */
-+	PORT_CMD_ATAPI		= BIT(24), /* Device is ATAPI */
-+	PORT_CMD_FBSCP		= BIT(22), /* FBS Capable Port */
-+	PORT_CMD_ESP		= BIT(21), /* External Sata Port */
-+	PORT_CMD_HPCP		= BIT(18), /* HotPlug Capable Port */
-+	PORT_CMD_PMP		= BIT(17), /* PMP attached */
-+	PORT_CMD_LIST_ON	= BIT(15), /* cmd list DMA engine running */
-+	PORT_CMD_FIS_ON		= BIT(14), /* FIS DMA engine running */
-+	PORT_CMD_FIS_RX		= BIT(4), /* Enable FIS receive DMA engine */
-+	PORT_CMD_CLO		= BIT(3), /* Command list override */
-+	PORT_CMD_POWER_ON	= BIT(2), /* Power up device */
-+	PORT_CMD_SPIN_UP	= BIT(1), /* Spin up device */
-+	PORT_CMD_START		= BIT(0), /* Enable port DMA engine */
-+
-+	PORT_CMD_ICC_MASK	= (0xfu << 28), /* i/f ICC state mask */
-+	PORT_CMD_ICC_ACTIVE	= (0x1u << 28), /* Put i/f in active state */
-+	PORT_CMD_ICC_PARTIAL	= (0x2u << 28), /* Put i/f in partial state */
-+	PORT_CMD_ICC_SLUMBER	= (0x6u << 28), /* Put i/f in slumber state */
-
-	/* PORT_FBS bits */
-	PORT_FBS_DWE_OFFSET	= 16, /* FBS device with error offset */
-	PORT_FBS_ADO_OFFSET	= 12, /* FBS active dev optimization offset */
-	PORT_FBS_DEV_OFFSET	= 8,  /* FBS device to issue offset */
-	PORT_FBS_DEV_MASK	= (0xf << PORT_FBS_DEV_OFFSET),  /* FBS.DEV */
--	PORT_FBS_SDE		= (1 << 2), /* FBS single device error */
--	PORT_FBS_DEC		= (1 << 1), /* FBS device error clear */
--	PORT_FBS_EN		= (1 << 0), /* Enable FBS */
-+	PORT_FBS_SDE		= BIT(2), /* FBS single device error */
-+	PORT_FBS_DEC		= BIT(1), /* FBS device error clear */
-+	PORT_FBS_EN		= BIT(0), /* Enable FBS */
-
-	/* PORT_DEVSLP bits */
-	PORT_DEVSLP_DM_OFFSET	= 25,             /* DITO multiplier offset */
-@@ -197,52 +198,52 @@ enum {
-	PORT_DEVSLP_DITO_OFFSET	= 15,             /* DITO offset */
-	PORT_DEVSLP_MDAT_OFFSET	= 10,             /* Minimum assertion time */
-	PORT_DEVSLP_DETO_OFFSET	= 2,              /* DevSlp exit timeout */
--	PORT_DEVSLP_DSP		= (1 << 1),       /* DevSlp present */
--	PORT_DEVSLP_ADSE	= (1 << 0),       /* Aggressive DevSlp enable */
-+	PORT_DEVSLP_DSP		= BIT(1),       /* DevSlp present */
-+	PORT_DEVSLP_ADSE	= BIT(0),       /* Aggressive DevSlp enable */
-
-	/* hpriv->flags bits */
-
- #define AHCI_HFLAGS(flags)		.private_data	= (void *)(flags)
-
--	AHCI_HFLAG_NO_NCQ		= (1 << 0),
--	AHCI_HFLAG_IGN_IRQ_IF_ERR	= (1 << 1), /* ignore IRQ_IF_ERR */
--	AHCI_HFLAG_IGN_SERR_INTERNAL	= (1 << 2), /* ignore SERR_INTERNAL */
--	AHCI_HFLAG_32BIT_ONLY		= (1 << 3), /* force 32bit */
--	AHCI_HFLAG_MV_PATA		= (1 << 4), /* PATA port */
--	AHCI_HFLAG_NO_MSI		= (1 << 5), /* no PCI MSI */
--	AHCI_HFLAG_NO_PMP		= (1 << 6), /* no PMP */
--	AHCI_HFLAG_SECT255		= (1 << 8), /* max 255 sectors */
--	AHCI_HFLAG_YES_NCQ		= (1 << 9), /* force NCQ cap on */
--	AHCI_HFLAG_NO_SUSPEND		= (1 << 10), /* don't suspend */
--	AHCI_HFLAG_SRST_TOUT_IS_OFFLINE	= (1 << 11), /* treat SRST timeout as
-+	AHCI_HFLAG_NO_NCQ		= BIT(0),
-+	AHCI_HFLAG_IGN_IRQ_IF_ERR	= BIT(1), /* ignore IRQ_IF_ERR */
-+	AHCI_HFLAG_IGN_SERR_INTERNAL	= BIT(2), /* ignore SERR_INTERNAL */
-+	AHCI_HFLAG_32BIT_ONLY		= BIT(3), /* force 32bit */
-+	AHCI_HFLAG_MV_PATA		= BIT(4), /* PATA port */
-+	AHCI_HFLAG_NO_MSI		= BIT(5), /* no PCI MSI */
-+	AHCI_HFLAG_NO_PMP		= BIT(6), /* no PMP */
-+	AHCI_HFLAG_SECT255		= BIT(8), /* max 255 sectors */
-+	AHCI_HFLAG_YES_NCQ		= BIT(9), /* force NCQ cap on */
-+	AHCI_HFLAG_NO_SUSPEND		= BIT(10), /* don't suspend */
-+	AHCI_HFLAG_SRST_TOUT_IS_OFFLINE	= BIT(11), /* treat SRST timeout as
-							link offline */
--	AHCI_HFLAG_NO_SNTF		= (1 << 12), /* no sntf */
--	AHCI_HFLAG_NO_FPDMA_AA		= (1 << 13), /* no FPDMA AA */
--	AHCI_HFLAG_YES_FBS		= (1 << 14), /* force FBS cap on */
--	AHCI_HFLAG_DELAY_ENGINE		= (1 << 15), /* do not start engine on
-+	AHCI_HFLAG_NO_SNTF		= BIT(12), /* no sntf */
-+	AHCI_HFLAG_NO_FPDMA_AA		= BIT(13), /* no FPDMA AA */
-+	AHCI_HFLAG_YES_FBS		= BIT(14), /* force FBS cap on */
-+	AHCI_HFLAG_DELAY_ENGINE		= BIT(15), /* do not start engine on
-						        port start (wait until
-						        error-handling stage) */
--	AHCI_HFLAG_NO_DEVSLP		= (1 << 17), /* no device sleep */
--	AHCI_HFLAG_NO_FBS		= (1 << 18), /* no FBS */
-+	AHCI_HFLAG_NO_DEVSLP		= BIT(17), /* no device sleep */
-+	AHCI_HFLAG_NO_FBS		= BIT(18), /* no FBS */
-
- #ifdef CONFIG_PCI_MSI
--	AHCI_HFLAG_MULTI_MSI		= (1 << 20), /* per-port MSI(-X) */
-+	AHCI_HFLAG_MULTI_MSI		= BIT(20), /* per-port MSI(-X) */
- #else
-	/* compile out MSI infrastructure */
-	AHCI_HFLAG_MULTI_MSI		= 0,
- #endif
--	AHCI_HFLAG_WAKE_BEFORE_STOP	= (1 << 22), /* wake before DMA stop */
--	AHCI_HFLAG_YES_ALPM		= (1 << 23), /* force ALPM cap on */
--	AHCI_HFLAG_NO_WRITE_TO_RO	= (1 << 24), /* don't write to read
-+	AHCI_HFLAG_WAKE_BEFORE_STOP	= BIT(22), /* wake before DMA stop */
-+	AHCI_HFLAG_YES_ALPM		= BIT(23), /* force ALPM cap on */
-+	AHCI_HFLAG_NO_WRITE_TO_RO	= BIT(24), /* don't write to read
-							only registers */
--	AHCI_HFLAG_IS_MOBILE		= (1 << 25), /* mobile chipset, use
-+	AHCI_HFLAG_IS_MOBILE		= BIT(25), /* mobile chipset, use
-							SATA_MOBILE_LPM_POLICY
-							as default lpm_policy */
--	AHCI_HFLAG_SUSPEND_PHYS		= (1 << 26), /* handle PHYs during
-+	AHCI_HFLAG_SUSPEND_PHYS		= BIT(26), /* handle PHYs during
-							suspend/resume */
--	AHCI_HFLAG_IGN_NOTSUPP_POWER_ON	= (1 << 27), /* ignore -EOPNOTSUPP
-+	AHCI_HFLAG_IGN_NOTSUPP_POWER_ON	= BIT(27), /* ignore -EOPNOTSUPP
-							from phy_power_on() */
--	AHCI_HFLAG_NO_SXS		= (1 << 28), /* SXS not supported */
-+	AHCI_HFLAG_NO_SXS		= BIT(28), /* SXS not supported */
-
-	/* ap->flags bits */
-
-@@ -258,22 +259,22 @@ enum {
-	EM_MAX_RETRY			= 5,
-
-	/* em_ctl bits */
--	EM_CTL_RST		= (1 << 9), /* Reset */
--	EM_CTL_TM		= (1 << 8), /* Transmit Message */
--	EM_CTL_MR		= (1 << 0), /* Message Received */
--	EM_CTL_ALHD		= (1 << 26), /* Activity LED */
--	EM_CTL_XMT		= (1 << 25), /* Transmit Only */
--	EM_CTL_SMB		= (1 << 24), /* Single Message Buffer */
--	EM_CTL_SGPIO		= (1 << 19), /* SGPIO messages supported */
--	EM_CTL_SES		= (1 << 18), /* SES-2 messages supported */
--	EM_CTL_SAFTE		= (1 << 17), /* SAF-TE messages supported */
--	EM_CTL_LED		= (1 << 16), /* LED messages supported */
-+	EM_CTL_RST		= BIT(9), /* Reset */
-+	EM_CTL_TM		= BIT(8), /* Transmit Message */
-+	EM_CTL_MR		= BIT(0), /* Message Received */
-+	EM_CTL_ALHD		= BIT(26), /* Activity LED */
-+	EM_CTL_XMT		= BIT(25), /* Transmit Only */
-+	EM_CTL_SMB		= BIT(24), /* Single Message Buffer */
-+	EM_CTL_SGPIO		= BIT(19), /* SGPIO messages supported */
-+	EM_CTL_SES		= BIT(18), /* SES-2 messages supported */
-+	EM_CTL_SAFTE		= BIT(17), /* SAF-TE messages supported */
-+	EM_CTL_LED		= BIT(16), /* LED messages supported */
-
-	/* em message type */
--	EM_MSG_TYPE_LED		= (1 << 0), /* LED */
--	EM_MSG_TYPE_SAFTE	= (1 << 1), /* SAF-TE */
--	EM_MSG_TYPE_SES2	= (1 << 2), /* SES-2 */
--	EM_MSG_TYPE_SGPIO	= (1 << 3), /* SGPIO */
-+	EM_MSG_TYPE_LED		= BIT(0), /* LED */
-+	EM_MSG_TYPE_SAFTE	= BIT(1), /* SAF-TE */
-+	EM_MSG_TYPE_SES2	= BIT(2), /* SES-2 */
-+	EM_MSG_TYPE_SGPIO	= BIT(3), /* SGPIO */
- };
-
- struct ahci_cmd_hdr {

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

@@ -1,38 +0,0 @@
-# Pull in the devicetree files into the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
-
-# Add run-time dependency for PM firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " amx3-cm3"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " amx3-cm3"
-
-# Add run-time dependency for VPE VPDMA firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw"
-
-# Add run-time dependency for Goodix firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw"
-
-# Add run-time dependency for PRU Ethernet firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx = " prueth-fw prusw-fw pruhsr-fw pruprp-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx-evm = " prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am64xx = " prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2"
-
-# Add run-time dependency for Cadence MHDP firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " cadence-mhdp-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cadence-mhdp-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cadence-mhdp-fw"
-
-# Add run-time dependency for Video Decoding firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " vxd-dec-fw"
-
-# Add run-time dependency for Chips&Media Wave521 firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " cnm-wave-fw"
-
-# Add run-time dependency for TI ETH firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " ti-eth-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7200 = " ti-eth-fw"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " ti-eth-fw"

meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb

@@ -16,15 +16,15 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
 
 S = "${WORKDIR}/git"
 
-# 5.10.168 version for 32-bit
-SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
-PV:armv7a = "5.10.168+git${SRCPV}"
-BRANCH:armv7a = "v5.10.168-ti-r70"
+# 6.1.80 version for 32-bit
+SRCREV:armv7a = "4ca9ea30768d58c8d4d56d03dd1eaf8c8feb7ef9"
+PV:armv7a = "6.1.80+git${SRCPV}"
+BRANCH:armv7a = "v6.1.80-ti-r34"
 
-# 5.10.162 version for 64-bit
-SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
-PV:aarch64 = "5.10.162+git${SRCPV}"
-BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
+# 6.1.80 version for 64-bit
+SRCREV:aarch64 = "977c75e082620f15c06c72bcced30f787c14b390"
+PV:aarch64 = "6.1.80+git${SRCPV}"
+BRANCH:aarch64 = "v6.1.80-ti-arm64-r49"
 
 SRC_URI = " \
     git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \

meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb

@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 inherit kernel
 
-require recipes-kernel/linux/kernel-rdepends.inc
 require recipes-kernel/linux/ti-kernel.inc
 
 DEPENDS += "gmp-native libmpc-native"

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omap2_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/dra7xx/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_dra7x_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/k3/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_arm64_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/omapl138/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omapl138_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/ti33x/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am3x_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/ti43x/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am4x_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omap2_rt_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/dra7xx/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_dra7x_rt_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/k3/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_arm64_rt_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/ti33x/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am3x_rt_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/ti43x/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am4x_rt_release

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb

@@ -1,10 +0,0 @@
-require linux-ti-staging_5.10.bb
-
-# Look in the generic major.minor directory for files
-# This will have priority over generic non-rt path
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
-
-BRANCH = "ti-rt-linux-5.10.y"
-
-SRCREV = "101d44260b8dfbab27763581e4bbd534dd36ae33"
-PV = "5.10.168+git${SRCPV}"

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb

@@ -1,10 +1,15 @@
 require linux-ti-staging_6.1.bb
 
+KERNEL_LOCALVERSION:append = "-rt"
+
 # Look in the generic major.minor directory for files
 # This will have priority over generic non-rt path
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
 
 BRANCH = "ti-rt-linux-6.1.y"
 
-SRCREV = "5c91cbf4b3d6860742df8d1849095f2cc2103059"
-PV = "6.1.46+git${SRCPV}"
+SRCREV = "258616ead12edc4acf7ac38e741d588b372144e4"
+
+include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
+
+PV = "6.1.105+git${SRCPV}"

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omap2_debug

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/dra7xx/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_dra7x_debug

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/k3/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_arm64_debug

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/omapl138/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_omapl138_debug

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/ti33x/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am3x_debug

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/ti43x/defconfig

@@ -1 +0,0 @@
-use-tisdk-config=ti_sdk_am4x_debug

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_5.10.bb

@@ -1,5 +0,0 @@
-require linux-ti-staging_5.10.bb
-
-# Look in the generic major.minor directory for files
-# This will have priority over generic non-rt path
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb

@@ -1,48 +0,0 @@
-SECTION = "kernel"
-SUMMARY = "Linux kernel for TI devices"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-KERNEL_CLASSES += "${@bb.utils.contains('TFA_PLATFORM', 'k3', 'kernel-fitimage-ti-u-boot', '', d)}"
-
-inherit kernel
-
-DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh"
-require recipes-kernel/linux/setup-defconfig.inc
-require recipes-kernel/linux/kernel-rdepends.inc
-require recipes-kernel/linux/ti-kernel.inc
-include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
-
-DEPENDS += "gmp-native libmpc-native"
-
-# Look in the generic major.minor directory for files
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
-		      ${EXTRA_DTC_ARGS}"
-
-S = "${WORKDIR}/git"
-
-BRANCH = "ti-linux-5.10.y"
-
-SRCREV = "991c5ce91e43cb620f534dc9fe7b0ad21f4f4388"
-PV = "5.10.168+git${SRCPV}"
-
-# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR:append = "b"
-PR = "${MACHINE_KERNEL_PR}"
-
-KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
-KERNEL_GIT_PROTOCOL = "https"
-SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
-            file://0001-ata-ahci-fix-enum-constants-for-gcc-13.patch \
-            file://defconfig"
-
-FILES:${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb"
-
-# Special configuration for remoteproc/rpmsg IPC modules
-module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
-module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
-module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
-KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
-KERNEL_MODULE_AUTOLOAD:append:j721e = " rpmsg_kdrv_switch"

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb

@@ -7,7 +7,6 @@ inherit ti-secdev
 inherit kernel
 
 require recipes-kernel/linux/setup-defconfig.inc
-require recipes-kernel/linux/kernel-rdepends.inc
 require recipes-kernel/linux/ti-kernel.inc
 include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
 include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
@@ -24,8 +23,8 @@ S = "${WORKDIR}/git"
 
 BRANCH ?= "ti-linux-6.1.y"
 
-SRCREV ?= "7d0810d9af6bb4948af8ce2f2a3a9aa40d1b9930"
-PV = "6.1.46+git${SRCPV}"
+SRCREV ?= "da449d8c3cf600b0346a6696e1e3cc431422e765"
+PV = "6.1.105+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR:append = "b"

meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc

@@ -1,6 +1,4 @@
-# KERNEL_LOCALVERSION can be set to add a tag to the end of the
-# kernel version string.  such as the commit id
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"
+KERNEL_LOCALVERSION = "-ti"
 
 # Check the defconfig file and see if it points to an in kernel
 # defconfig that should be used, or if it is a complete config file
@@ -13,8 +11,10 @@ do_configure() {
     # tree config
     cp ${WORKDIR}/defconfig ${B}/.config
 
-    echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
-    echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
+    scm_version=$(printf '%s%s' -g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12))
+
+    echo ${scm_version} > ${B}/.scmversion
+    echo ${scm_version} > ${S}/.scmversion
 
     # Zero, when using "tisdk" configs, pass control to defconfig_builder
     config=`cat ${B}/.config | grep use-tisdk-config | cut -d= -f2`