CI/CD Auto-Merger: cicd.master-ltsprep.202602051800

Updated the value(s) for:
  atf: SRCREV_tfa:am62lxx
  u-boot-ti-staging_2026.01: SRCREV_uboot
  linux-ti-staging_6.18: PV,SRCREV

Changelogs:
  u-boot-ti-staging_2026.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=0456d31970eeef8678fd20a6683d1acd9fc8da4a..7db1482473e9a9562061c6f89e6d3cd86a17e616
  linux-ti-staging_6.18: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=33b7bd36f11719837307a92818393608faafbc10..e36172c9eb8513198f33eee06b8cff28c6556e11

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

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

@@ -5,5 +5,13 @@
 require conf/machine/include/k3r5.inc
 
 UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
 
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:tie-test-builds = "usbdfu main"
+UBOOT_CONFIG[main] = "am62ax_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am62ax_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
+
+UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

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

@@ -4,6 +4,22 @@
 
 require conf/machine/include/k3r5.inc
 
-UBOOT_MACHINE = "am62px_evm_r5_defconfig"
+UBOOT_MACHINE = ""
 
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+UBOOT_ECDSA_SIGN_CONFIG ?= "ecdsa"
+UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = ""
+UBOOT_ECDSA_SIGN_CONFIG:bsp-next = ""
+UBOOT_ECDSA_SIGN_CONFIG:bsp-mainline = ""
+
+UBOOT_CONFIG = "${UBOOT_ECDSA_SIGN_CONFIG} main"
+UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
+
+UBOOT_CONFIG[main] = "am62px_evm_r5_defconfig"
+UBOOT_CONFIG[ecdsa] = "am62px_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am62px_evm_r5_defconfig"
+
+UBOOT_CONFIG_MAKE_OPTS[ecdsa] = "${TI_SIGN_WITH_ECDSA_KEY}"
+
+UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
+
+UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

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

@@ -23,11 +23,28 @@ KERNEL_DEVICETREE = " \
 
 FIT_CONF_DEFAULT_DTB = "k3-am62p5-sk.dtb"
 
-UBOOT_MACHINE = "am62px_evm_a53_defconfig"
+UBOOT_ECDSA_SIGN_CONFIG ?= "ecdsa"
+UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = ""
+UBOOT_ECDSA_SIGN_CONFIG:bsp-next = ""
+UBOOT_ECDSA_SIGN_CONFIG:bsp-mainline = ""
 
-# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
+ECDSA_BOOT_FILES ?= "tiboot3.bin-ecdsa tiboot3-*-evm.bin-ecdsa tispl.bin-ecdsa u-boot.img-ecdsa"
+ECDSA_BOOT_FILES:bsp-ti-6_6 = ""
+ECDSA_BOOT_FILES:bsp-next = ""
+ECDSA_BOOT_FILES:bsp-mainline = ""
+
+UBOOT_MACHINE = ""
+UBOOT_CONFIG = "${UBOOT_ECDSA_SIGN_CONFIG} main"
+UBOOT_CONFIG[main] = "am62px_evm_a53_defconfig"
+UBOOT_CONFIG[ecdsa] = "am62px_evm_a53_defconfig"
+
+UBOOT_CONFIG_MAKE_OPTS[ecdsa] = "${TI_SIGN_WITH_ECDSA_KEY}"
+
+IMAGE_BOOT_FILES += "${ECDSA_BOOT_FILES}"
+
+# UBOOT_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 am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree
-UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
+UBOOT_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"

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

@@ -5,5 +5,13 @@
 require conf/machine/include/k3r5.inc
 
 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
 
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:tie-test-builds = "usbdfu main"
+UBOOT_CONFIG[main] = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am62x_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
+
+UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

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

@@ -5,5 +5,13 @@
 require conf/machine/include/k3r5.inc
 
 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
 
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:tie-test-builds = "usbdfu main"
+UBOOT_CONFIG[main] = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am62x_lpsk_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
+
+UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf

@@ -5,3 +5,9 @@
 require conf/machine/include/k3r5.inc
 
 UBOOT_MACHINE = "am65x_evm_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
+
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu main"
+UBOOT_CONFIG[main] = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am65x_evm_r5_usbdfu_defconfig"

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

@@ -12,5 +12,6 @@ OPTEEMACHINE = "k3-am62x"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
 
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline  = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-next  = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-ti-6_18 = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-next = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"

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

@@ -17,8 +17,10 @@ OPTEEMACHINE = "k3-j721e"
 
 TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver"
 TI_VXE_VXD_DRIVER:bsp-ti-6_6 = ""
+TI_VXE_VXD_DRIVER:bsp-ti-6_18 = ""
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}"
 
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-ti-6_18 = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
 TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
 TI_INITRAMFS_KERNEL_MODULES:append:bsp-next = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"

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

@@ -14,5 +14,6 @@ OPTEEMACHINE = "k3-j784s4"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
 
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-ti-6_18 = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
 TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
 TI_INITRAMFS_KERNEL_MODULES:append:bsp-next = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"

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

@@ -33,14 +33,17 @@ BUILD_CORE_INITRAMFS_IMAGE = "ti-core-initramfs"
 BUILD_CORE_INITRAMFS_IMAGE_FILE = "${BUILD_CORE_INITRAMFS_IMAGE}.cpio.xz"
 
 BUILD_CORE_INITRAMFS_IMAGE_STEP ?= ""
+BUILD_CORE_INITRAMFS_IMAGE_STEP:bsp-ti-6_18 = "${BUILD_CORE_INITRAMFS_IMAGE}:do_image_complete"
 BUILD_CORE_INITRAMFS_IMAGE_STEP:bsp-mainline = "${BUILD_CORE_INITRAMFS_IMAGE}:do_image_complete"
 BUILD_CORE_INITRAMFS_IMAGE_STEP:bsp-next = "${BUILD_CORE_INITRAMFS_IMAGE}:do_image_complete"
 
 do_image_wic[depends] += "${BUILD_CORE_INITRAMFS_IMAGE_STEP}"
 
 TI_WKS_INITRAMFS ?= ""
+TI_WKS_INITRAMFS:bsp-ti-6_18 = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 TI_WKS_INITRAMFS:bsp-mainline = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 TI_WKS_INITRAMFS:bsp-next = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 
+IMAGE_BOOT_FILES:append:bsp-ti-6_18 = " ${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 IMAGE_BOOT_FILES:append:bsp-mainline = " ${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 IMAGE_BOOT_FILES:append:bsp-next = " ${BUILD_CORE_INITRAMFS_IMAGE_FILE}"

meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb

@@ -8,9 +8,9 @@ inherit module features_check
 REQUIRED_MACHINE_FEATURES = "gc320"
 
 # Need to branch out with ${PV} var
-BRANCH = "ti-${PV}-k6.12"
+BRANCH = "ti-${PV}-k6.18"
 
-SRCREV = "83afddf9dbf6a8458267b4dae21ee35bfb11f3d1"
+SRCREV = "a7e9a51e89c97fbea974c7d674aa0a95d7c96403"
 
 SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}"
 

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

@@ -14,7 +14,7 @@ BRANCH = "scarthgap/k${PV}"
 
 SRC_URI = "git://git.ti.com/git/multimedia/img-vxe-vxd.git;protocol=https;branch=${BRANCH}"
 
-SRCREV = "0bcbb20af32ea13275b452f0e84f5a49966d0bf6"
+SRCREV = "9453ad8ebdd42a5e5a384c21cd5f6bc2c86aa6d8"
 
 TARGET_PRODUCT:j721e = "j721e_linux"
 

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

@@ -10,7 +10,7 @@ SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmwar
 SRCBRANCH = "master"
 
 LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
-SRCREV_tfa:am62lxx = "2efbddd1caaa8c2126261225fdfe333be03c22f1"
+SRCREV_tfa:am62lxx = "d071d093b94852473ae6ae26336f125e107a964f"
 SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
 SRCBRANCH:am62lxx = "ti-master"
 

meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend

@@ -1,4 +1,4 @@
-TFA_TI = ""
-TFA_TI:k3 = "trusted-firmware-a-ti.inc"
+TRUSTED_FIRMWARE_A_TI = ""
+TRUSTED_FIRMWARE_A_TI:ti-soc = "trusted-firmware-a-ti.inc"
 
-require ${TFA_TI}
+require ${TRUSTED_FIRMWARE_A_TI}

meta-ti-bsp/recipes-bsp/u-boot/files/custMpk_ecdsa.key

@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBDO9fzBU2LoKaYgji4m3ZCHKUBF9CTVnU6ClfNPJsTo0SKZpCsmyr0
+TKUNkk16vwGgBwYFK4EEACKhZANiAATCv6ftwnJW91fP5wpLpLAxt3u732oNnKr8
+pLbZUzi/s8/e7QiISJ8QKYGaWMnjORW82cM3UJKlCw8GOrb3ZrEXYWRKxkPWql0+
+BOhDQA5b21GtL9HQPvuCPz471ZaxGYA=
+-----END EC PRIVATE KEY-----

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

@@ -1,7 +0,0 @@
-do_configure:append () {
-   if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ]
-   then
-       oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS}
-       oe_runmake -C ${S} O=${B} olddefconfig
-   fi
-}

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb

@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 SUMMARY = "Mainline U-Boot for TI devices"
 
-PV = "2025.10"
+PV = "2026.01"
 
 UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"
 
-SRCREV_uboot = "e50b1e8715011def8aff1588081a2649a2c6cd47"
+SRCREV_uboot = "127a42c7257a6ffbbd1575ed1cbaa8f5408a44b3"

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb

@@ -1,7 +1,5 @@
 require u-boot-ti.inc
 
-include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
-
 PR = "r0"
 
 BRANCH = "ti-u-boot-2024.04"

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb

@@ -1,9 +1,7 @@
 require u-boot-ti.inc
 
-include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
-
 PR = "r0"
 
 BRANCH = "ti-u-boot-2025.01"
 
-SRCREV_uboot = "df1fe238230433ba3e5b731356156e145aa90917"
+SRCREV_uboot = "ef2eb76b650415637bd93b0eddfb1e31489117f9"

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2026.01.bb

@@ -4,6 +4,6 @@ PR = "r0"
 
 BRANCH = "ti-u-boot-2026.01"
 
-SRCREV_uboot = "c5e6d2ab7eba68cbfb600cdc131c0c375ced2ec9"
+SRCREV_uboot = "7db1482473e9a9562061c6f89e6d3cd86a17e616"
 
 DEFAULT_PREFERENCE = "-1"

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

@@ -7,7 +7,8 @@ do_compile:prepend () {
 
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
-require u-boot-mergeconfig.inc
+
+include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
 
@@ -150,13 +151,17 @@ uboot_compile_config_copy_binary:k3r5 () {
 
     builddir="${builddir}"
 
-    if ! [ -L ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
-        ln -s ${B}/${builddir}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
-    fi
-
     if ! [ -L ${B}/${builddir}/${binary} ] && ! [ -f ${B}/${builddir}/${binary} ]; then
         ln -s ${B}/${builddir}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${builddir}/${binary}
     fi
+
+    if ! [ -L ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
+        tgt="${B}/${builddir}/${binary}"
+        if [ -L ${B}/${builddir}/${binary} ]; then
+            tgt=$(realpath ${B}/${builddir}/${binary})
+        fi
+        ln -s ${tgt} ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
+    fi
 }
 
 uboot_install_config:append () {
@@ -230,18 +235,34 @@ do_deploy:append:k3r5 () {
 
 uboot_deploy_config:append:k3r5 () {
 	for f in ${B}/${builddir}/tiboot3-*.bin; do
-		if [ -f "$f" ]; then
+		if [ -L "$f" ]; then
 			f_base=$(basename $f)
-			install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
-			ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			tgt=$(realpath $f)
+			tgt_base=$(basename $tgt)
+			ln -sf ${tgt_base}-${type} ${DEPLOYDIR}/${f_base}-${type}
+			ln -sf ${tgt_base}-${type} ${DEPLOYDIR}/${f_base}
+		else
+			if [ -f "$f" ]; then
+				f_base=$(basename $f)
+				install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
+				ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			fi
 		fi
 	done
 
 	for f in ${B}/${builddir}/sysfw*.itb; do
-		if [ -f "$f" ]; then
+		if [ -L "$f" ]; then
 			f_base=$(basename $f)
-			install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
-			ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			tgt=$(realpath $f)
+			tgt_base=$(basename $tgt)
+			ln -sf ${tgt_base}-${type} ${DEPLOYDIR}/${f_base}-${type}
+			ln -sf ${tgt_base}-${type} ${DEPLOYDIR}/${f_base}
+		else
+			if [ -f "$f" ]; then
+				f_base=$(basename $f)
+				install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
+				ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			fi
 		fi
 	done
 }
@@ -259,13 +280,15 @@ uboot_deploy_config:append:am62lxx () {
 uboot_deploy:append:k3r5 () {
     for f in ${B}/tiboot3-*.bin; do
 		if [ -f "$f" ]; then
-			install -m 644 $f ${DEPLOYDIR}/
+			f_base=$(basename $f)
+			install -m 644 $f ${DEPLOYDIR}/${f_base}
 		fi
 	done
 
 	for f in ${B}/sysfw*.itb; do
 		if [ -f "$f" ]; then
-			install -m 644 $f ${DEPLOYDIR}/
+			f_base=$(basename $f)
+			install -m 644 $f ${DEPLOYDIR}/${f_base}
 		fi
 	done
 }
@@ -393,3 +416,5 @@ PACKAGES:prepend:am62pxx-evm = "${FALCON_PKG} "
 PACKAGES:prepend:am62xx-lp-evm = "${FALCON_PKG} "
 
 TOOLCHAIN = "gcc"
+
+TI_SIGN_WITH_ECDSA_KEY ?= "KEY_PATH=${THISDIR}/files/custMpk_ecdsa.key"

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

@@ -10,7 +10,7 @@ BRANCH_ARM64 = "ti-linux-6.12.y"
 BRANCH = "${BRANCH_ARM64}"
 
 BRANCH_ARM32 = "ti-rt-linux-6.12.y-arm32"
-SRCREV_ARM32 = "1379a8eb9786e78509f67ff8eac658bde5ddc66d"
+SRCREV_ARM32 = "a3bc6dc973a99822f0707b1c9ba06b56bf142076"
 PV_ARM32 = "6.12.57+git"
 
 BRANCH:ti33x = "${BRANCH_ARM32}"

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

@@ -21,7 +21,7 @@ S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
 
 BRANCH ?= "ti-linux-6.12.y"
 
-SRCREV ?= "15b58b1dcd0e0a79d83740b81da1a1367f6f3f68"
+SRCREV ?= "da3c0f0a33ac00f7138c695a16d90301cf7ec02b"
 PV = "6.12.57+git"
 
 KERNEL_REPRODUCIBILITY_PATCHES = " \

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

@@ -22,8 +22,8 @@ S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
 
 BRANCH ?= "ti-linux-6.18.y"
 
-SRCREV ?= "75433f843c99d1ab544808749a46a6e2f0151a56"
-PV = "6.18.0+git"
+SRCREV ?= "e36172c9eb8513198f33eee06b8cff28c6556e11"
+PV = "6.18.8+git"
 
 KERNEL_REPRODUCIBILITY_PATCHES = " \
     file://0001-perf-python-Fix-compile-for-32bit-platforms.patch \

meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc

@@ -1,2 +1,3 @@
 PV = "4.7.0+git"
+OPTEE_TA_GIT_TAG = "${@'branch=master' if d.getVar('PV') == 'git' or d.getVar('PV').endswith('+git') else 'tag=%s;nobranch=1' % d.getVar('PV')}"
 SRCREV_optee-ta = "ce33372ab772e879826361a1ca91126260bd9be1"

meta-ti-bsp/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bb

@@ -1,16 +1,18 @@
 SUMMARY = "Minimal initramfs for boot requirements"
 
-require recipes-core/packagegroups/packagegroup-core-boot.bb
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
 
 TI_INITRAMFS_KERNEL_MODULES ?= ""
 
 RDEPENDS:${PN} += "\
     ${TI_INITRAMFS_KERNEL_MODULES} \
+    ${VIRTUAL-RUNTIME_base-utils} \
+    base-passwd \
     initramfs-framework-base \
     initramfs-module-udev \
     initramfs-module-nfsrootfs \
-    nfs-utils \
-    nfs-utils-client \
 "
-
-RDEPENDS:${PN}:remove = "grub-efi kernel"

meta-ti-bsp/recipes-ti/initramfs/ti-core-initramfs.bb

@@ -7,29 +7,26 @@ DESCRIPTION = "Image meant to probe boot essential modules\
 
 LICENSE = "MIT"
 
-inherit core-image
+INITRAMFS_FSTYPES = "cpio cpio.xz"
+
+INITRAMFS_MAXSIZE = "65536"
 
 IMAGE_NAME = "ti-core-initramfs"
 
-IMAGE_NAME_SUFFIX = ""
-
-IMAGE_FEATURES:remove = "package-management"
-
-INITRAMFS_FSTYPES = "cpio cpio.xz"
-
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+export IMAGE_BASENAME = "${IMAGE_NAME}"
 
 PACKAGE_INSTALL = "packagegroup-ti-core-initramfs"
 
-export IMAGE_BASENAME = "${IMAGE_NAME}"
+# Ensure the initramfs only contains the bare minimum
+IMAGE_FEATURES = ""
+IMAGE_LINGUAS = ""
 
-IMAGE_OVERHEAD_FACTOR = "1.1"
+# on the kernel image.
+PACKAGE_EXCLUDE = "kernel-image-*"
 
-# To further reduce the size of the rootfs, remove the /boot directory from
-# the final image this is usually done by adding RDEPENDS_kernel-base = ""
-# in the configuration file. In our case we can't use this method. Instead we
-# just wipe out the content of "/boot" before creating the image.
-ROOTFS_POSTPROCESS_COMMAND += "empty_boot_dir; "
-empty_boot_dir () {
-	rm -rf ${IMAGE_ROOTFS}/boot/*
-}
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+IMAGE_NAME_SUFFIX ?= ""
+IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
+
+inherit image