CI/CD Auto-Merger: cicd.master.202601090100

Updated the value(s) for: atf: SRCREV_tfa:am62lxx Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
CI/CD Auto-Merger: cicd.master.202601050100
2026-01-12 01:20:20 +00:00 · 2026-01-09 01:00:43 -06:00 · 2026-01-05 01:00:36 -06:00 · 2025-12-19 14:05:06 -06:00 · 2025-12-19 12:27:03 -06:00 · 2025-12-19 12:27:03 -06:00
106 changed files with 855 additions and 331 deletions
--- a/check_yocto_rules.json
+++ b/check_yocto_rules.json
@@ -18,7 +18,8 @@
            "meta-ti-bsp/recipes-core/udev/eudev_%.bbappend",
            "meta-ti-bsp/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend",
            "meta-ti-bsp/recipes-security/optee/optee-%.bbappend",
-            "meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend"
+            "meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend",
+            "meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bbappend"
        ]
    },
    "GUARD-2" : {
@@ -29,6 +30,20 @@
            "meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend"
        ]
    },
+    "PV-1" :{
+        "skip_files" : [
+            "meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb",
+            "meta-ti-bsp/recipes-multimedia/ti-multimedia-udev/ti-multimedia-udev.bb",
+            "meta-ti-bsp/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bb",
+            "meta-ti-bsp/recipes-ti/initramfs/ti-core-initramfs.bb",
+            "meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb",
+            "meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb",
+            "meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb",
+            "meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb",
+            "meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb",
+            "meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb"
+        ]
+    },
    "SUMMARY-1" : {
        "skip_files" : [
            "meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb"
--- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
@@ -5,14 +5,4 @@
 require conf/machine/include/k3r5.inc
 require conf/machine/include/beagle-bsp.inc

-SYSFW_SOC = "j721e"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
 UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"
--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -5,10 +5,6 @@
 require conf/machine/include/k3r5.inc
 require conf/machine/include/beagle-bsp.inc

-SYSFW_SOC = "j722s"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
 UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_r5_defconfig"
 UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"
--- a/meta-beagle/conf/machine/include/beagle-bsp.inc
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -19,7 +19,7 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "25%"
 BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%"

 # GC320 support requires out-of-tree drivers not yet available in bb.org 6.12
@@ -40,7 +40,7 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "25%"
 BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"

 # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
--- a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
+++ b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
@@ -5,8 +5,4 @@
 require conf/machine/include/k3r5.inc
 require conf/machine/include/beagle-bsp.inc

-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am62_pocketbeagle2_r5_defconfig"
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
@@ -15,7 +15,7 @@ require recipes-kernel/linux/ti-kernel.inc

 DEPENDS += "gmp-native libmpc-native"

-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 # Extra DT overlays/capes
 KERNEL_DEVICETREE:append:armv7a = " \
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb
@@ -15,7 +15,7 @@ require recipes-kernel/linux/ti-kernel.inc

 DEPENDS += "gmp-native libmpc-native"

-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 # Extra DT overlays/capes
 KERNEL_DEVICETREE:append:armv7a = " \
--- a/meta-ti-bsp/classes/ti-secdev.bbclass
+++ b/meta-ti-bsp/classes/ti-secdev.bbclass
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG:k3r5 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K
 TI_SECURE_DEV_PKG:ti33x = "${TI_SECURE_DEV_PKG_CAT}/am3x"
 TI_SECURE_DEV_PKG:ti43x = "${TI_SECURE_DEV_PKG_CAT}/am4x"
 TI_SECURE_DEV_PKG:am57xx = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
-TI_SECURE_DEV_PKG:dra7xx = "${TI_SECURE_DEV_PKG_AUTO}/dra7"

 # The SECDEV scripts may need their own location provided through the environment
 export TI_SECURE_DEV_PKG
--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -36,3 +36,8 @@ 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}"
+
+MIRRORS += " \
+    git://git.ti.com/.* git://github.com/TexasInstruments/BASENAME;protocol=https \
+    gitsm://git.ti.com/.* gitsm://github.com/TexasInstruments/BASENAME;protocol=https \
+"
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -4,10 +4,6 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am62ax_evm_r5_defconfig"

 UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62dx"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am62dx_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am62dxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm.conf
@@ -8,6 +8,7 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62d2 \
    ti/k3-am62a7-sk-edgeai \
    ti/k3-am62x-sk \
+    ti/k3-am62a7-sk-rpi-hdr-ehrpwm \
 "

 KERNEL_DEVICETREE = ""
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -4,10 +4,6 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62px"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am62px_evm_r5_defconfig"

 UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -4,10 +4,6 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am62x_evm_r5_defconfig"

 UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -4,10 +4,6 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"

 UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -4,9 +4,6 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig"
 UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_18 = "am6254atl_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -24,6 +24,8 @@ KERNEL_DEVICETREE = " \

 FIT_CONF_DEFAULT_DTB = "k3-am6254xxl-sk.dtb"
 FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "k3-am625-sk.dtb"
+FIT_CONF_DEFAULT_DTB:bsp-ti-6_18 = "k3-am6254atl-sk.dtb"

 UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig"
 UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig"
+UBOOT_MACHINE:bsp-ti-6_18 = "am6254atl_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am64x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am64x_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am65x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
 UBOOT_MACHINE = "am65x_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am65x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "am65x_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
-
-require conf/machine/include/am65xx.inc
-
-UBOOT_MACHINE = "am65x_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am68_sk_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "am69_sk_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/beaglebadge-ti.conf
+++ b/meta-ti-bsp/conf/machine/beaglebadge-ti.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: AM62L Badge
+#@DESCRIPTION: Machine configuration for the TI AM62L Badge
+
+require conf/machine/include/am62lxx.inc
+
+IMAGE_FSTYPES += "ubifs ubi"
+
+MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"
+
+UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am62l3-badge \
+"
+
+KERNEL_DEVICETREE = ""
+
+UBOOT_MACHINE = "am62lx_badge_defconfig"
+
+TFA_BOARD = "am62l-badge"
--- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
 UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: DRA7xx EVM
 #@DESCRIPTION: Machine configuration for the TI DRA7xx EVM

-require conf/machine/include/dra7xx.inc
+require conf/machine/include/am57xx.inc

 MACHINE_FEATURES += "touchscreen"

--- a/meta-ti-bsp/conf/machine/include/am57xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am57xx.inc
@@ -1,7 +1,50 @@
-require conf/machine/include/omap-a15.inc
-SOC_FAMILY:append = ":dra7xx"
+require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":am57xx"

-MACHINE_FEATURES += "pci"
+DEFAULTTUNE ?= "armv7athf-neon"
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw"
+require conf/machine/include/ti-bsp.inc
+
+# Graphics providers and variables
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
+
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPES = "zImage uImage"
+KERNEL_CLASSES += "kernel-uimage"
+
+UBOOT_ARCH = "arm"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# Generate an extlinux.conf file
+UBOOT_EXTLINUX = "1"
+UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
+UBOOT_EXTLINUX_BOOT_FILES = " \
+    extlinux.conf;extlinux/extlinux.conf \
+    ${KERNEL_IMAGETYPE} \
+    ${DEVICETREE_FILES} \
+"
+
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw prueth-fw prusw-fw pruhsr-fw pruprp-fw"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"
+
+# List common SoC features, may need to add touchscreen for specific machines
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320 pci"
+
+IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
+WKS_FILE ?= "sdimage-2part.wks"
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
+do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -12,5 +12,5 @@ OPTEEMACHINE = "k3-am62x"

 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"

-TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline  = " kernel-module-tps6594-i2c"
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-next  = " kernel-module-tps6594-i2c"
+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"
--- a/meta-ti-bsp/conf/machine/include/dra7xx.inc
+++ b/meta-ti-bsp/conf/machine/include/dra7xx.inc
@@ -1,4 +0,0 @@
-require conf/machine/include/omap-a15.inc
-SOC_FAMILY:append = ":dra7xx"
-
-MACHINE_FEATURES += "pci"
--- a/meta-ti-bsp/conf/machine/include/k3r5.inc
+++ b/meta-ti-bsp/conf/machine/include/k3r5.inc
@@ -15,13 +15,8 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc
 require conf/machine/include/ti-bsp.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"

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

 PACKAGECONFIG:pn-u-boot-ti-staging = ""
 PACKAGECONFIG:pn-u-boot-ti-mainline = ""
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -1,50 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":omap-a15"
-
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa15.inc
-
-require conf/machine/include/ti-bsp.inc
-
-# Graphics providers and variables
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
-
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_IMAGETYPES = "zImage uImage"
-KERNEL_CLASSES += "kernel-uimage"
-
-UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILES} \
-"
-
-SPL_BINARY = "MLO"
-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"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"
--- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
@@ -3,7 +3,7 @@
 # preferences for kernel, bootloader and graphics components, as
 # well as a dedicated machine override.

-# Supported options are: mainline, next, ti-6_12, ti-6_6
+# Supported options are: mainline, next, ti-6_18, ti-6_12, ti-6_6
 TI_PREFERRED_BSP ??= "ti-6_12"

 # Use bsp-* namespace for overrides
@@ -33,6 +33,15 @@ BSP_BOOTLOADER_VERSION:bsp-next = "%"
 # GC320 support requires out-of-tree drivers not yet available in next
 MACHINE_FEATURES:remove:bsp-next = "gc320"

+# ==========
+# ti-6_18
+# TI staging kernel 6.18, u-boot 2026.01
+# ==========
+BSP_KERNEL_PROVIDER:bsp-ti-6_18 = "linux-ti-staging"
+BSP_KERNEL_VERSION:bsp-ti-6_18 = "6.18%"
+BSP_BOOTLOADER_PROVIDER:bsp-ti-6_18 = "u-boot-ti-staging"
+BSP_BOOTLOADER_VERSION:bsp-ti-6_18 = "2026.01%"
+
 # ==========
 # ti-6_12
 # TI staging kernel 6.12, u-boot 2025.01
@@ -45,7 +54,7 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%"
 BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%"
+BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "25%"
 BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"

 # ==========
@@ -60,7 +69,7 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"
 BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
+BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "25%"
 BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"

 # GC320 support requires out-of-tree drivers not yet available in 6.6
--- a/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j7200"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
 UBOOT_MACHINE = "j7200_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j7200_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j7200_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM
-
-require conf/machine/j7200-evm.conf
-
-UBOOT_MACHINE = "j7200_evm_a72_defconfig"
--- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j721e"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
 UBOOT_MACHINE = "j721e_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721e HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721e HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j721e_sr1_1"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j721e_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721e HS EVM
-#@DESCRIPTION: Machine configuration for the TI J721e HS EVM
-
-require conf/machine/j721e-evm.conf
-
-UBOOT_MACHINE = "j721e_evm_a72_defconfig"
--- a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j721e"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
 UBOOT_MACHINE = "j721e_sk_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
 UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
-
-require conf/machine/j721s2-evm.conf
--- a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j722s"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "j722s_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j722s-evm.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm.conf
@@ -7,7 +7,7 @@ require conf/machine/include/j722s.inc
 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-j722s \
    ti/k3-fpdlink \
-    ti/k3-am625-sk-mcspi-loopback \
+    ti/k3-am62x-sk-mcspi-loopback \
    ti/k3-v3link \
 "

--- a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j742s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "j742s2_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
@@ -4,8 +4,4 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
 UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM
-
-require conf/machine/j784s4-evm.conf
--- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
+++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
@@ -6,7 +6,6 @@ require conf/machine/include/omapl138.inc

 UBOOT_MACHINE = "omapl138_lcdk_config"
 UBOOT_SUFFIX = "ais"
-SPL_BINARY = ""

 UBOOT_ENTRYPOINT = "0xc0008000"
 UBOOT_LOADADDRESS = "0xc0008000"
--- a/meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bbappend
+++ b/meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bbappend
@@ -0,0 +1,3 @@
+RDEPENDS:${PN} += "\
+    cifs-utils \
+"
--- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Spectrum-GT9271;md5=2a6de6be7af1fe46370c684da
 PV = "${GOODIX_FW_VERSION}"
 PR = "${INC_PR}.0"

-COMPATIBLE_MACHINE = "dra7xx"
+COMPATIBLE_MACHINE = "am57xx"

 ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin"
 TARGET = "goodix_9271_cfg.bin"
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_25.2.6850647.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_25.2.6850647.bb
@@ -17,7 +17,8 @@ BRANCH = "linuxws/scarthgap/k6.12/${PV}"

 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"

-SRCREV = "8eaff654a8871118c08cfafe53795f57e3b6b396"
+SRCREV = "72723eea0cab47c20e5734c1c7b9a441ed2d74c2"
+

 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
@@ -29,7 +30,12 @@ TARGET_PRODUCT:j722s = "j722s_linux"
 PVR_BUILD = "release"
 PVR_WS = "lws-generic"

-EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
+EXTRA_OEMAKE += 'KERNELDIR="${KBUILD_OUTPUT}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
+
+do_compile(){
+    unset CC
+    oe_runmake
+}

 do_install() {
    make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -7,7 +7,7 @@ inherit module

 PROVIDES = "virtual/gpudriver"

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

 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -19,9 +19,9 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;

 SRCREV = "9ae0fa4998b1c624408945e062bf8fb0ea7efb9d"

-TARGET_PRODUCT:omap-a15 = "ti572x_linux"
 TARGET_PRODUCT:ti33x = "ti335x_linux"
 TARGET_PRODUCT:ti43x = "ti437x_linux"
+TARGET_PRODUCT:am57xx = "ti572x_linux"
 TARGET_PRODUCT:am65xx = "ti654x_linux"
 PVR_BUILD = "release"
 PVR_WS = "lws-generic"
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -9,19 +9,19 @@ INC_PR = "r4"
 # Firmware versions
 CORESDK_RTOS_VERSION = "08.02.00.04"
 PRUETH_FW_AM65X_VERSION = "08.00.00.20"
-PRUETH_FW_AM65X_SR2_VERSION = "02.02.15.04"
+PRUETH_FW_AM65X_SR2_VERSION = "02.02.15.10"
 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.8"
-TI_DM_FW_VERSION = "11.01.09"
-TI_SYSFW_VERSION = "11.02.00"
+TI_DM_FW_VERSION = "11.02.07"
+TI_SYSFW_VERSION = "11.02.05"
 TI_HSM_DEMO_FW_VERSION = "11.00.09"
 TAD5212_FW_VERSION = "1.0.0.0"
 TI_PKA_FW_VERSION = "2.1.0"
 TI_IPC_EXAMPLES_FW_VERSION = "3.52.00.01"

-TI_LINUX_FW_SRCREV ?= "3c8ad7386e818cb42cce6ed4ce2aa1e76d7c688f"
+TI_LINUX_FW_SRCREV ?= "8ec0c42b8ccf2c9e8bebfd7c4e03d93fed555442"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -1,5 +1,7 @@
 # NOTE: This .inc file with customizations only gets included for K3 platforms

+FILESEXTRAPATHS:prepend := "${THISDIR}/trusted-firmware-a:"
+
 PV = "2.13+git"

 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
@@ -8,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 = "075e9d21ef52f85a5b455101b55997fd2efd3298"
+SRCREV_tfa:am62lxx = "2efbddd1caaa8c2126261225fdfe333be03c22f1"
 SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
 SRCBRANCH:am62lxx = "ti-master"

@@ -28,3 +30,14 @@ EXTRA_OEMAKE += "${@ 'BL32_BASE=' + d.getVar('TFA_K3_BL32_BASE') if d.getVar('TF
 EXTRA_OEMAKE += "${@ 'PRELOADED_BL33_BASE=' + d.getVar('TFA_K3_PRELOADED_BL33') if d.getVar('TFA_K3_PRELOADED_BL33') else ''}"
 EXTRA_OEMAKE += "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
 EXTRA_OEMAKE:append:ti-falcon = " PRELOADED_BL33_BASE=0x82000000 K3_HW_CONFIG_BASE=0x88000000"
+
+# LPM support patches for Jacinto platforms (J7200, J742S2, J784S4)
+TFA_JACINTO_LPM_PATCHES = " \
+    file://0001-feat-k3-choose-cluster_start_id-depending-on-the-soc.patch \
+    file://0002-feat-ti-add-message-to-encrypt-tfa-during-suspend.patch \
+    file://0003-feat-k3-handle-suspend-in-case-of-LPM_BOARDCFG_MANAG.patch \
+"
+
+SRC_URI:append:j7200 = " ${TFA_JACINTO_LPM_PATCHES}"
+SRC_URI:append:j742s2 = " ${TFA_JACINTO_LPM_PATCHES}"
+SRC_URI:append:j784s4 = " ${TFA_JACINTO_LPM_PATCHES}"
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a/0001-feat-k3-choose-cluster_start_id-depending-on-the-soc.patch
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a/0001-feat-k3-choose-cluster_start_id-depending-on-the-soc.patch
@@ -0,0 +1,115 @@
+From 3de4f871d9bfe29c3862860e494bfa70ba72af3e Mon Sep 17 00:00:00 2001
+From: Abhash Kumar Jha <a-kumar2@ti.com>
+Date: Mon, 20 Oct 2025 11:26:17 +0530
+Subject: [PATCH 1/3] feat(k3): choose cluster_start_id depending on the soc
+
+The CLUSTER_DEVICE_START_ID denotes the device id of the A-core cluster.
+It is utilized when powering off the entire cluster.
+
+J7200, J721E and J721S2 have a different cluster_start_id than their
+"generic" counterparts.
+
+Query the JTAG_ID register to get the part id and choose the
+cluster_start_id depending on that.
+
+Upstream-Status: Pending
+
+Change-Id: I44d3ac0ec646c39019e4c0167d34f410015a147a
+Signed-off-by: Abhash Kumar Jha <a-kumar2@ti.com>
+---
+ plat/ti/k3/common/k3_bl31_setup.c |  1 +
+ plat/ti/k3/common/k3_psci.c       | 25 ++++++++++++++++++++++++-
+ plat/ti/k3/include/platform_def.h | 16 ++++++++++++++++
+ 3 files changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/plat/ti/k3/common/k3_bl31_setup.c b/plat/ti/k3/common/k3_bl31_setup.c
+index 1b93dc860..79a9c924c 100644
+--- a/plat/ti/k3/common/k3_bl31_setup.c
+++ b/plat/ti/k3/common/k3_bl31_setup.c
+@@ -20,6 +20,7 @@ const mmap_region_t plat_k3_mmap[] = {
+	K3_MAP_REGION_FLAT(SEC_PROXY_RT_BASE,   SEC_PROXY_RT_SIZE,   MT_DEVICE | MT_RW | MT_SECURE),
+	K3_MAP_REGION_FLAT(SEC_PROXY_SCFG_BASE, SEC_PROXY_SCFG_SIZE, MT_DEVICE | MT_RW | MT_SECURE),
+	K3_MAP_REGION_FLAT(SEC_PROXY_DATA_BASE, SEC_PROXY_DATA_SIZE, MT_DEVICE | MT_RW | MT_SECURE),
+	K3_MAP_REGION_FLAT(WKUP_CTRL_MMR0_BASE, WKUP_CTRL_MMR0_SIZE, MT_DEVICE | MT_RW | MT_SECURE),
+	{ /* sentinel */ }
+ };
+
+diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c
+index ec37d9f4c..a443dd851 100644
+--- a/plat/ti/k3/common/k3_psci.c
+++ b/plat/ti/k3/common/k3_psci.c
+@@ -11,6 +11,8 @@
+ #include <common/debug.h>
+ #include <lib/el3_runtime/cpu_data.h>
+ #include <lib/psci/psci.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+ #include <plat/common/platform.h>
+
+ #include <ti_sci_protocol.h>
+@@ -83,6 +85,27 @@ static int k3_pwr_domain_on(u_register_t mpidr)
+	return PSCI_E_SUCCESS;
+ }
+
+uint32_t get_plat_cluster_start_id()
+{
+	static uint32_t cluster_id;
+	uint32_t part_id, jtag_id_reg;
+
+	if (cluster_id) {
+		return cluster_id;
+	}
+
+	jtag_id_reg = mmio_read_32(WKUP_CTRL_MMR0_BASE + JTAG_ID);
+	part_id = EXTRACT(JTAG_PART_ID, jtag_id_reg);
+
+	if ((part_id == J7200_PART_ID) || (part_id == J721E_PART_ID) || (part_id == J721S2_PART_ID)) {
+		cluster_id = J7_PLAT_CLUSTER_DEVICE_START_ID;
+	} else {
+		cluster_id = PLAT_CLUSTER_DEVICE_START_ID;
+	}
+
+	return cluster_id;
+}
+
+ void k3_pwr_domain_off(const psci_power_state_t *target_state)
+ {
+	int core, cluster, proc_id, device_id, cluster_id, ret;
+@@ -97,7 +120,7 @@ void k3_pwr_domain_off(const psci_power_state_t *target_state)
+	cluster = MPIDR_AFFLVL1_VAL(read_mpidr_el1());
+	proc_id = PLAT_PROC_START_ID + core;
+	device_id = PLAT_PROC_DEVICE_START_ID + core;
+-	cluster_id = PLAT_CLUSTER_DEVICE_START_ID + (cluster * 2);
+	cluster_id = get_plat_cluster_start_id() + (cluster * 2);
+
+	/*
+	 * If we are the last core in the cluster then we take a reference to
+diff --git a/plat/ti/k3/include/platform_def.h b/plat/ti/k3/include/platform_def.h
+index db5e31d95..d191781a6 100644
+--- a/plat/ti/k3/include/platform_def.h
+++ b/plat/ti/k3/include/platform_def.h
+@@ -25,6 +25,22 @@
+ #define SEC_PROXY_RT_SIZE	0x80000
+ #endif /* K3_SEC_PROXY_LITE */
+
+#define WKUP_CTRL_MMR0_BASE		UL(0x43000000)
+#define WKUP_CTRL_MMR0_SIZE		UL(0x20000)
+#define JTAG_ID			U(0x14)
+#define JTAG_PART_ID_MASK		GENMASK(27, 12)
+
+#define J721E_PART_ID			U(0xBB64)
+#define J7200_PART_ID			U(0xBB6D)
+#define J721S2_PART_ID			U(0xBB75)
+#define J784S4_J742S2_PART_ID		U(0xBB80)
+
+#define JTAG_PART_ID_WIDTH		U(0x10)
+#define JTAG_PART_ID_SHIFT		U(0xC)
+
+/* A-core Cluster Device ID for j721e, j7200 and j721s2 */
+#define J7_PLAT_CLUSTER_DEVICE_START_ID 	U(0x4)
+
+ #define SEC_PROXY_TIMEOUT_US		1000000
+ #define SEC_PROXY_MAX_MESSAGE_SIZE	56
+
+--
+2.34.1
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a/0002-feat-ti-add-message-to-encrypt-tfa-during-suspend.patch
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a/0002-feat-ti-add-message-to-encrypt-tfa-during-suspend.patch
@@ -0,0 +1,194 @@
+From c79ff3679a4360bb848b01d4036c365533fcf791 Mon Sep 17 00:00:00 2001
+From: Richard Genoud <richard.genoud@bootlin.com>
+Date: Tue, 11 Feb 2025 18:20:17 +0100
+Subject: [PATCH 2/3] feat(ti): add message to encrypt tfa during suspend
+
+At suspend, BL31 with its context will be encrypted by TIFS in DDR.
+Encryption is needed for security matters, so that the BL31 is not
+modified before entering suspend or early at resume.
+
+We only need the encryption function here because the decryption message
+will be send by the R5 SPL at resume.
+
+Also introduce the LPM_ENCRYPT_IMAGE cap signals that FW has the support
+to encrypt the image using the TISCI_MSG_LPM_ENCRYPT tisci message.
+
+This is useful in suspend to ram cases where we would like to
+store the encrypted image of a secure fw instead of the original image
+itself in the DDR.
+
+Check for LPM_ENCRYPT_IMAGE flag in the FW capabilities, and only then
+call encrypt.
+
+Upstream-Status: Pending
+
+Change-Id: I266472da87dd0821493019b2d9853f8886f33811
+Signed-off-by: Richard Genoud <richard.genoud@bootlin.com>
+Signed-off-by: Abhash Kumar Jha <a-kumar2@ti.com>
+---
+ drivers/ti/ti_sci/ti_sci.c          | 36 +++++++++++++++++++++++++++++
+ drivers/ti/ti_sci/ti_sci.h          |  7 ++++++
+ drivers/ti/ti_sci/ti_sci_protocol.h | 32 +++++++++++++++++++++++++
+ plat/ti/k3/common/k3_psci.c         | 10 ++++++++
+ 4 files changed, 85 insertions(+)
+
+diff --git a/drivers/ti/ti_sci/ti_sci.c b/drivers/ti/ti_sci/ti_sci.c
+index f0813e5b0..ee5f7166f 100644
+--- a/drivers/ti/ti_sci/ti_sci.c
+++ b/drivers/ti/ti_sci/ti_sci.c
+@@ -1784,3 +1784,39 @@ int ti_sci_lpm_get_next_sys_mode(uint8_t *next_mode)
+
+	return 0;
+ }
+/*
+ * ti_sci_encrypt_tfa - Ask TIFS to encrypt TFA at a specific address
+ *
+ * @src_tfa_addr: Address where the TFA lies unencrypted
+ * @src_tfa_len: Size of the TFA unencrypted
+ *
+ * Return: 0 if all goes well, else appropriate error message
+ */
+int ti_sci_encrypt_tfa(uint64_t src_tfa_addr,
+		       uint32_t src_tfa_len)
+{
+	struct ti_sci_msg_req_encrypt_tfa req = { 0 };
+	struct ti_sci_msg_resp_encrypt_tfa resp = { 0 };
+	struct ti_sci_xfer xfer;
+	int ret;
+
+	ret = ti_sci_setup_one_xfer(TISCI_MSG_LPM_ENCRYPT_TFA, 0,
+				    &req, sizeof(req),
+				    &resp, sizeof(resp),
+				    &xfer);
+	if (ret != 0U) {
+		ERROR("Message alloc failed (%d)\n", ret);
+		return ret;
+	}
+
+	req.src_tfa_addr = src_tfa_addr;
+	req.src_tfa_len = src_tfa_len;
+
+	ret = ti_sci_do_xfer(&xfer);
+	if (ret != 0U) {
+		ERROR("Transfer send failed (%d)\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+diff --git a/drivers/ti/ti_sci/ti_sci.h b/drivers/ti/ti_sci/ti_sci.h
+index 1f1963274..2afa11317 100644
+--- a/drivers/ti/ti_sci/ti_sci.h
+++ b/drivers/ti/ti_sci/ti_sci.h
+@@ -258,6 +258,11 @@ int ti_sci_proc_wait_boot_status_no_wait(uint8_t proc_id,
+  *
+  * Return: 0 if all goes well, else appropriate error message
+  *
+ * - ti_sci_encrypt_tfa - Ask TIFS to encrypt TFA at a specific address
+ *
+ *		@src_tfa_addr: Address where the TFA lies unencrypted
+ *		@src_tfa_len: Size of the TFA unencrypted
+ *
+  * NOTE: for all these functions, the following are generic in nature:
+  * Returns 0 for successful request, else returns corresponding error message.
+  */
+@@ -265,5 +270,7 @@ int ti_sci_enter_sleep(uint8_t proc_id,
+		       uint8_t mode,
+		       uint64_t core_resume_addr);
+ int ti_sci_lpm_get_next_sys_mode(uint8_t *next_mode);
+int ti_sci_encrypt_tfa(uint64_t src_tfa_addr,
+		       uint32_t src_tfa_len);
+
+ #endif /* TI_SCI_H */
+diff --git a/drivers/ti/ti_sci/ti_sci_protocol.h b/drivers/ti/ti_sci/ti_sci_protocol.h
+index bdd24622a..a165cda99 100644
+--- a/drivers/ti/ti_sci/ti_sci_protocol.h
+++ b/drivers/ti/ti_sci/ti_sci_protocol.h
+@@ -53,6 +53,9 @@
+ #define TISCI_MSG_GET_PROC_BOOT_STATUS	0xc400
+ #define TISCI_MSG_WAIT_PROC_BOOT_STATUS	0xc401
+
+/* TFA encrypt/decrypt messages */
+#define TISCI_MSG_LPM_ENCRYPT_TFA	0x030F
+
+ /**
+  * struct ti_sci_secure_msg_hdr - Header that prefixes all TISCI messages sent
+  *				  via secure transport.
+@@ -160,6 +163,7 @@ struct ti_sci_msg_resp_query_fw_caps {
+ #define MSG_FLAG_CAPS_LPM_STANDBY	TI_SCI_MSG_FLAG(3)
+ #define MSG_FLAG_CAPS_LPM_PARTIAL_IO	TI_SCI_MSG_FLAG(4)
+ #define MSG_FLAG_CAPS_LPM_DM_MANAGED	TI_SCI_MSG_FLAG(5)
+#define MSG_FLAG_CAPS_LPM_ENCRYPT_IMAGE	TI_SCI_MSG_FLAG(11)
+	uint64_t fw_caps;
+ } __packed;
+
+@@ -810,4 +814,32 @@ struct ti_sci_msg_resp_lpm_get_next_sys_mode {
+	uint8_t mode;
+ } __packed;
+
+/*
+ * struct ti_sci_msg_req_encrypt_tfa - Request for TISCI_MSG_LPM_ENCRYPT_TFA.
+ *
+ * @hdr			Generic Header
+ * @src_tfa_addr:  Address where the TFA lies unencrypted
+ * @src_tfa_len:   Size of the TFA unencrypted
+ *
+ * This message is to be sent when the system is going in suspend, just before
+ * TI_SCI_MSG_ENTER_SLEEP.
+ * The TIFS will then encrypt the TFA and store it in RAM, along with a private
+ * header.
+ * Upon resume, the SPL will ask TIFS to decrypt it back.
+ */
+struct ti_sci_msg_req_encrypt_tfa {
+	struct ti_sci_msg_hdr hdr;
+	uint64_t src_tfa_addr;
+	uint32_t src_tfa_len;
+} __packed;
+
+/*
+ * struct ti_sci_msg_req_encrypt_tfa - Request for TISCI_MSG_LPM_ENCRYPT_TFA.
+ *
+ * @hdr			Generic Header
+ */
+struct ti_sci_msg_resp_encrypt_tfa {
+	struct ti_sci_msg_hdr hdr;
+} __packed;
+
+ #endif /* TI_SCI_PROTOCOL_H */
+diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c
+index a443dd851..c2017666b 100644
+--- a/plat/ti/k3/common/k3_psci.c
+++ b/plat/ti/k3/common/k3_psci.c
+@@ -24,6 +24,7 @@
+ #define SYSTEM_PWR_STATE(state) ((state)->pwr_domain_state[PLAT_MAX_PWR_LVL])
+
+ uintptr_t k3_sec_entrypoint;
+bool encrypt_image;
+
+ static void k3_cpu_standby(plat_local_state_t cpu_state)
+ {
+@@ -282,6 +283,11 @@ static void k3_pwr_domain_suspend_to_mode(const psci_power_state_t *target_state
+	k3_gic_cpuif_disable();
+	k3_gic_save_context();
+
+	if (encrypt_image)
+	{
+		ti_sci_encrypt_tfa((uint64_t)__TEXT_START__, BL31_SIZE);
+	}
+
+	k3_pwr_domain_off(target_state);
+
+	ti_sci_enter_sleep(proc_id, mode, k3_sec_entrypoint);
+@@ -347,6 +353,10 @@ int plat_setup_psci_ops(uintptr_t sec_entrypoint,
+		ERROR("Unable to query firmware capabilities (%d)\n", ret);
+	}
+
+	if (fw_caps & MSG_FLAG_CAPS_LPM_ENCRYPT_IMAGE) {
+		encrypt_image = true;
+	}
+
+	/* If firmware does not support any known suspend mode */
+	if (!(fw_caps & (MSG_FLAG_CAPS_LPM_DEEP_SLEEP |
+			 MSG_FLAG_CAPS_LPM_MCU_ONLY |
+--
+2.34.1
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a/0003-feat-k3-handle-suspend-in-case-of-LPM_BOARDCFG_MANAG.patch
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a/0003-feat-k3-handle-suspend-in-case-of-LPM_BOARDCFG_MANAG.patch
@@ -0,0 +1,68 @@
+From 470cf022d03e350beab36605d4250944d2c92ffe Mon Sep 17 00:00:00 2001
+From: Abhash Kumar Jha <a-kumar2@ti.com>
+Date: Tue, 28 Oct 2025 23:24:22 +0530
+Subject: [PATCH 3/3] feat(k3): handle suspend in case of LPM_BOARDCFG_MANAGED
+
+The J7 platforms support LPM_BOARDCFG_MANAGED capability where the
+low power mode configuration is done statically for the DM via the
+pm-boardcfg.
+
+This is entirely opposite to the case of DM_MANAGED, where the DM fw
+decides the low power mode to enter into.
+
+Introduce LPM_BOARDCFG_MANAGED cap to handle suspend for those
+platforms as well.
+
+Upstream-Status: Pending
+
+Change-Id: Iaa0ab478cbe0db6652f61e9d733c0fddb4bab234
+Signed-off-by: Abhash Kumar Jha <a-kumar2@ti.com>
+---
+ drivers/ti/ti_sci/ti_sci_protocol.h |  1 +
+ plat/ti/k3/common/k3_psci.c         | 13 ++++++++-----
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/ti/ti_sci/ti_sci_protocol.h b/drivers/ti/ti_sci/ti_sci_protocol.h
+index a165cda99..b83174b0d 100644
+--- a/drivers/ti/ti_sci/ti_sci_protocol.h
+++ b/drivers/ti/ti_sci/ti_sci_protocol.h
+@@ -164,6 +164,7 @@ struct ti_sci_msg_resp_query_fw_caps {
+ #define MSG_FLAG_CAPS_LPM_PARTIAL_IO	TI_SCI_MSG_FLAG(4)
+ #define MSG_FLAG_CAPS_LPM_DM_MANAGED	TI_SCI_MSG_FLAG(5)
+ #define MSG_FLAG_CAPS_LPM_ENCRYPT_IMAGE	TI_SCI_MSG_FLAG(11)
+#define MSG_FLAG_CAPS_LPM_BOARDCFG_MANAGED	TI_SCI_MSG_FLAG(12)
+	uint64_t fw_caps;
+ } __packed;
+
+diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c
+index c2017666b..9cf41b4cb 100644
+--- a/plat/ti/k3/common/k3_psci.c
+++ b/plat/ti/k3/common/k3_psci.c
+@@ -357,17 +357,20 @@ int plat_setup_psci_ops(uintptr_t sec_entrypoint,
+		encrypt_image = true;
+	}
+
+-	/* If firmware does not support any known suspend mode */
+-	if (!(fw_caps & (MSG_FLAG_CAPS_LPM_DEEP_SLEEP |
+	/* If firmware is capabale of low power modes */
+	if (fw_caps & (MSG_FLAG_CAPS_LPM_DM_MANAGED |
+			MSG_FLAG_CAPS_LPM_BOARDCFG_MANAGED)) {
+		k3_plat_psci_ops.pwr_domain_suspend = k3_pwr_domain_suspend_dm_managed;
+	} else if (!(fw_caps & (MSG_FLAG_CAPS_LPM_DEEP_SLEEP |
+			 MSG_FLAG_CAPS_LPM_MCU_ONLY |
+			 MSG_FLAG_CAPS_LPM_STANDBY |
+			 MSG_FLAG_CAPS_LPM_PARTIAL_IO))) {
+-		/* Disable PSCI suspend support */
+		/* If firmware does not support any known suspend mode
+		 * disable PSCI suspend support
+		 */
+		k3_plat_psci_ops.pwr_domain_suspend = NULL;
+		k3_plat_psci_ops.pwr_domain_suspend_finish = NULL;
+		k3_plat_psci_ops.get_sys_suspend_power_state = NULL;
+-	} else if (fw_caps & MSG_FLAG_CAPS_LPM_DM_MANAGED) {
+-		k3_plat_psci_ops.pwr_domain_suspend = k3_pwr_domain_suspend_dm_managed;
+	}
+
+	*psci_ops = &k3_plat_psci_ops;
+--
+2.34.1
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
@@ -6,4 +6,4 @@ PR = "r0"

 BRANCH = "ti-u-boot-2025.01"

-SRCREV_uboot = "aa613c2e83299906b121fcf0d6a5824f1d1c3ff9"
+SRCREV_uboot = "df1fe238230433ba3e5b731356156e145aa90917"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2026.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2026.01.bb
@@ -0,0 +1,9 @@
+require u-boot-ti.inc
+
+PR = "r0"
+
+BRANCH = "ti-u-boot-2026.01"
+
+SRCREV_uboot = "c5e6d2ab7eba68cbfb600cdc131c0c375ced2ec9"
+
+DEFAULT_PREFERENCE = "-1"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -5,9 +5,6 @@ do_compile:prepend () {
    echo ${scm_version} > ${S}/.scmversion
 }

-UBOOT_SUFFIX ?= "img"
-SPL_BINARY ?= "MLO"
-
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 require u-boot-mergeconfig.inc
@@ -67,10 +64,18 @@ PLAT_SFX:am62dxx = "am62dxx"
 PLAT_SFX:am62lxx = "am62lxx"
 PLAT_SFX:am62pxx = "am62pxx"

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

 PACKAGECONFIG:append:aarch64 = " atf optee"
 PACKAGECONFIG:append:j721e = " dm"
--- a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
+++ b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
@@ -2,7 +2,7 @@ SUMMARY = "Radio Application Firmware"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3"

-COMPATIBLE_MACHINE = "dra7xx"
+COMPATIBLE_MACHINE = "am57xx"

 PR = "r1"

--- a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
+++ b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
@@ -3,7 +3,7 @@ SUMMARY = "VPDMA firmware for Video Input Port and Video Processing Engine"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c"

-COMPATIBLE_MACHINE = "dra7xx"
+COMPATIBLE_MACHINE = "am57xx"

 SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vpdma-fw/03-2012/exports/vpdma-fw_03-2012.tar.gz;protocol=http;name=dra7xx-evm"
 SRC_URI[dra7xx-evm.md5sum] = "80176df1350c21d9efa90171789c546e"
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -10,6 +10,6 @@ PV = "0.3+git"
 COMPATIBLE_MACHINE = "k3"

 BRANCH ?= "master"
-SRCREV = "cba7dc13a39191ac18bf64fccbba429faff112b4"
+SRCREV = "4e3a44c4b961831f2de80606942dd0d8eb508eca"

 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
--- a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
@@ -7,7 +7,7 @@ inherit features_check

 REQUIRED_MACHINE_FEATURES = "gc320"

-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"

 CLEANBROKEN = "1"

--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_25.2.6850647.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_25.2.6850647.bb
@@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"

-PR = "r4"
-
 BRANCH = "linuxws/scarthgap/k6.12/${PV}"
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
-SRCREV = "1ed9ee185cd876200e6747192854015b8e94a7b0"
+SRCREV = "adcbb5c620ff172da4152c02a2fee8f42dc4c472"

 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
@@ -4,7 +4,7 @@ LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx"

 PR = "r38"

@@ -37,7 +37,7 @@ inherit ${@pick_init(d)}

 TARGET_PRODUCT:ti33x = "ti335x_linux"
 TARGET_PRODUCT:ti43x = "ti437x_linux"
-TARGET_PRODUCT:omap-a15 = "ti572x_linux"
+TARGET_PRODUCT:am57xx = "ti572x_linux"
 TARGET_PRODUCT:am65xx = "ti654x_linux"

 RDEPENDS:${PN} += "libdrm ti-sgx-ddk-km"
--- a/meta-ti-bsp/recipes-kernel/linux/files/0001-arm-Remove-build-path-from-generated-mach-types.h.patch
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-arm-Remove-build-path-from-generated-mach-types.h.patch
@@ -0,0 +1,90 @@
+From mboxrd@z Thu Jan  1 00:00:00 1970
+Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6C761CF7C0
+	for <linux-kernel@vger.kernel.org>; Wed,  2 Oct 2024 17:51:03 +0000 (UTC)
+Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.19.141
+ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
+	t=1727891465; cv=none; b=CEYYtmSJFo/Sgv/xDxI47tFv5EQYgI48gCmjgNCwoCG+YAxaTGv6w5t0LvkrZFVDbtI7ZlXtzmSmrUjH/knuKDDfcyE9kRmVwFTkvZuTRbeuzgYAvzQqGZx2MUP+19HrXiJhkzdaW2gqaUHm6jzKotnMAmuIf5MdymPExP2XEOA=
+ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
+	s=arc-20240116; t=1727891465; c=relaxed/simple;
+	bh=rz8JAFjsjsVowpA2nxzzCem6/hVUcRWem+15QWeBIZ8=;
+	h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=U//l6phLjcdtIQoiM3NTJtyWYEckbwlaAolhWAr5vBabPsLMC8r132cMmOCq2VeaXQYpJZi1PF9o9qa7ruMa2mDuPYYQEJxfQXLUcfvfuNBNSe3/YPt0ZnczRoKOVp/ZhK9eCbAyuqdKiV88VJX4HXf29Pk4U/pJUJiuIBz6z0c=
+ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=x9oOIcId; arc=none smtp.client-ip=198.47.19.141
+Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com
+Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com
+Authentication-Results: smtp.subspace.kernel.org;
+	dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="x9oOIcId"
+Received: from fllv0034.itg.ti.com ([10.64.40.246])
+	by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 492HonLf096412;
+	Wed, 2 Oct 2024 12:50:49 -0500
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com;
+	s=ti-com-17Q1; t=1727891449;
+	bh=D9PCum0HyoqSpwC0i4ipngZTLS2ludQXOcLTt/aASvw=;
+	h=From:To:Subject:Date;
+	b=x9oOIcIdQ4fKCK786eVp28izZrfEKKj+AFEJLw99X5XocNNHcf79PYgeIiaJSHqti
+	 vyuEZgxqpc2ofiOvg8GGStvsJHvu9KDY6b/0cD4X6xgrxSob2RwVUMwwLFpqoGE7Ap
+	 Rrv5bG+RIcs00EQ7NOloYHr81TExET3fQMA/NGQA=
+Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26])
+	by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 492HonXu062400
+	(version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL);
+	Wed, 2 Oct 2024 12:50:49 -0500
+Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE105.ent.ti.com
+ (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2,
+ cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 2
+ Oct 2024 12:50:50 -0500
+Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE110.ent.ti.com
+ (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2,
+ cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via
+ Frontend Transport; Wed, 2 Oct 2024 12:50:49 -0500
+Received: from uda0214219 (uda0214219.dhcp.ti.com [128.247.81.222])
+	by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 492Hon1W127998;
+	Wed, 2 Oct 2024 12:50:49 -0500
+Received: from reatmon by uda0214219 with local (Exim 4.90_1)
+	(envelope-from <reatmon@ti.com>)
+	id 1sw3Uv-0003yB-Am; Wed, 02 Oct 2024 12:50:49 -0500
+From: Ryan Eatmon <reatmon@ti.com>
+To: Russell King <linux@armlinux.org.uk>, <linux-kernel@vger.kernel.org>,
+        Ryan
+ Eatmon <reatmon@ti.com>
+Subject: [PATCH] arm: Remove build path from generated mach-types.h
+Date: Wed, 2 Oct 2024 12:50:49 -0500
+Message-ID: <20241002175049.15219-1-reatmon@ti.com>
+X-Mailer: git-send-email 2.17.1
+Precedence: bulk
+X-Mailing-List: linux-kernel@vger.kernel.org
+List-Id: <linux-kernel.vger.kernel.org>
+List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
+List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea
+
+For reproducible builds, having any of the build paths in a generated
+file is problematic.  Simple fix is to just remove the path.  This is
+similar to the same code in arch/sh/tools/gen-mach-types.
+
+Upstream-Status: Submitted [https://lore.kernel.org/linux-kernel/20241002175049.15219-1-reatmon@ti.com/]
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ arch/arm/tools/gen-mach-types | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types
+index cbe1c33bb871..9a2a5c0f1c45 100644
+--- a/arch/arm/tools/gen-mach-types
+++ b/arch/arm/tools/gen-mach-types
+@@ -24,8 +24,7 @@ NF == 3 {
+ 
+ END	{
+ 	  printf("/*\n");
+-	  printf(" * This was automagically generated from %s!\n", FILENAME);
+-	  printf(" * Do NOT edit\n");
+	  printf(" * This was automagically generated, do NOT edit.\n");
+ 	  printf(" */\n\n");
+ 	  printf("#ifndef __ASM_ARM_MACH_TYPE_H\n");
+ 	  printf("#define __ASM_ARM_MACH_TYPE_H\n\n");
+-- 
+2.17.1
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
@@ -9,7 +9,7 @@ inherit ${KERNEL_BASE_CLASS}

 DEPENDS += "gmp-native libmpc-native"

-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"

--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=kernel/configs/ti_arm64_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/omapl138/defconfig
@@ -0,0 +1 @@
+use-kernel-config=davinci_all_defconfig
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/ti33x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/ti33x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/ti43x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/ti43x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/omapl138/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=davinci_all_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/ti33x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/ti33x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/ti43x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/ti43x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb
@@ -10,8 +10,8 @@ BRANCH_ARM64 = "ti-linux-6.12.y"
 BRANCH = "${BRANCH_ARM64}"

 BRANCH_ARM32 = "ti-rt-linux-6.12.y-arm32"
-SRCREV_ARM32 = "a55efe5b7adbb88ee55b67f4f044c2882978d1b5"
-PV_ARM32 = "6.12.49+git"
+SRCREV_ARM32 = "1379a8eb9786e78509f67ff8eac658bde5ddc66d"
+PV_ARM32 = "6.12.57+git"

 BRANCH:ti33x = "${BRANCH_ARM32}"
 BRANCH:ti43x = "${BRANCH_ARM32}"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.18.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.18.bb
@@ -0,0 +1,9 @@
+require linux-ti-staging_6.18.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.18:"
+
+include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
@@ -15,15 +15,14 @@ DEPENDS += "gmp-native libmpc-native"
 # Look in the generic major.minor directory for files
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"

-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
-		      ${EXTRA_DTC_ARGS}"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"

 BRANCH ?= "ti-linux-6.12.y"

-SRCREV ?= "9b2678be3a92ebdbf376000f06636eab8f7c1dd8"
-PV = "6.12.49+git"
+SRCREV ?= "15b58b1dcd0e0a79d83740b81da1a1367f6f3f68"
+PV = "6.12.57+git"

 KERNEL_REPRODUCIBILITY_PATCHES = " \
    file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.18.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.18.bb
@@ -0,0 +1,39 @@
+SECTION = "kernel"
+SUMMARY = "Linux kernel for TI devices"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+require recipes-kernel/linux/ti-kernel.inc
+
+inherit ${KERNEL_BASE_CLASS}
+
+require recipes-kernel/linux/setup-defconfig.inc
+include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+DEPENDS += "gmp-native libmpc-native"
+
+# Look in the generic major.minor directory for files
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.18:"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
+		      ${EXTRA_DTC_ARGS}"
+
+S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
+
+BRANCH ?= "ti-linux-6.18.y"
+
+SRCREV ?= "75433f843c99d1ab544808749a46a6e2f0151a56"
+PV = "6.18.0+git"
+
+KERNEL_REPRODUCIBILITY_PATCHES = " \
+    file://0001-perf-python-Fix-compile-for-32bit-platforms.patch \
+    file://0001-arm-Remove-build-path-from-generated-mach-types.h.patch \
+"
+
+# 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"
+
+DEFAULT_PREFERENCE = "-1"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
@@ -15,8 +15,7 @@ DEPENDS += "gmp-native libmpc-native"
 # Look in the generic major.minor directory for files
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"

-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
-		      ${EXTRA_DTC_ARGS}"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

 S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"

--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
@@ -1,6 +1,8 @@
 # Use TI SECDEV for signing
 inherit ti-secdev

+FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
+
 EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y"

 EXTRA_OEMAKE:append:k3 = " ${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
@@ -41,7 +43,7 @@ do_compile:append:ti43x() {
    optee_sign_legacyhs
 }

-do_compile:append:dra7xx() {
+do_compile:append:am57xx() {
    optee_sign_legacyhs
 }

@@ -62,7 +64,7 @@ do_deploy:append:ti43x() {
    optee_deploy_legacyhs
 }

-do_deploy:append:dra7xx() {
+do_deploy:append:am57xx() {
    optee_deploy_legacyhs
 }

@@ -76,3 +78,12 @@ RDEPENDS:${PN} += "${PN}-ta"

 # This is needed for bl32.elf
 INSANE_SKIP:${PN}:append:k3 = " textrel"
+
+# LPM support patch for Jacinto platforms (J7200, J742S2, J784S4)
+OPTEE_JACINTO_LPM_PATCHES = " \
+    file://0001-plat-k3-drivers-Open-TRNG-firewall-for-TIFS-on-all-k.patch \
+"
+
+SRC_URI:append:j7200 = " ${OPTEE_JACINTO_LPM_PATCHES}"
+SRC_URI:append:j742s2 = " ${OPTEE_JACINTO_LPM_PATCHES}"
+SRC_URI:append:j784s4 = " ${OPTEE_JACINTO_LPM_PATCHES}"
--- a/meta-ti-bsp/recipes-security/optee/optee-os/0001-plat-k3-drivers-Open-TRNG-firewall-for-TIFS-on-all-k.patch
+++ b/meta-ti-bsp/recipes-security/optee/optee-os/0001-plat-k3-drivers-Open-TRNG-firewall-for-TIFS-on-all-k.patch
@@ -0,0 +1,45 @@
+From 00f74ba2ab00088d51e6da3c0eefe50599ef5c82 Mon Sep 17 00:00:00 2001
+From: Prasanth Babu Mantena <p-mantena@ti.com>
+Date: Mon, 3 Nov 2025 12:42:57 +0530
+Subject: [PATCH] plat-k3: drivers: Open TRNG firewall for TIFS on all k3 devs
+
+On k3 devices, TRNG is firewalled to be accessed only by OPTEE.
+
+TIFS needs this for the encryption and decryption services to support
+different low power modes. So, open firewall to TIFS as well.
+
+There is no concurrent usage of TRNG, as TIFS uses TRNG only at suspend
+when OPTEE is down and resume, when firewalls are restored but OPTEE is
+not up yet.
+
+As this is a firewall that required to be shared along with TIFS on all
+devices, making this a common change and open on all devs.
+
+Upstream-Status: Submitted [https://github.com/OP-TEE/optee_os/pull/7582]
+
+Signed-off-by: Prasanth Babu Mantena <p-mantena@ti.com>
+Reviewed-by: Manorit Chawdhry <m-chawdhry@ti.com>
+Reviewed-by: Andrew Davis <afd@ti.com>
+---
+ core/arch/arm/plat-k3/drivers/sa2ul.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/core/arch/arm/plat-k3/drivers/sa2ul.c b/core/arch/arm/plat-k3/drivers/sa2ul.c
+index c50757b2c..e10bde131 100644
+--- a/core/arch/arm/plat-k3/drivers/sa2ul.c
+++ b/core/arch/arm/plat-k3/drivers/sa2ul.c
+@@ -121,12 +121,7 @@ static TEE_Result sa2ul_init(void)
+	start_address = RNG_BASE;
+	end_address = RNG_BASE + RNG_REG_SIZE - 1;
+	permissions[num_perm++] = (FW_BIG_ARM_PRIVID << 16) | FW_SECURE_ONLY;
+-#if defined(PLATFORM_FLAVOR_am62x) || \
+-	defined(PLATFORM_FLAVOR_am62ax) || \
+-	defined(PLATFORM_FLAVOR_am62px)
+-
+	permissions[num_perm++] = (FW_TIFS_PRIVID << 16) | FW_NON_SECURE;
+-#endif
+	ret = ti_sci_set_fwl_region(fwl_id, rng_region, num_perm,
+				    control, permissions,
+				    start_address, end_address);
+--
+2.34.1
--- a/meta-ti-bsp/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bb
+++ b/meta-ti-bsp/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bb
@@ -9,7 +9,6 @@ RDEPENDS:${PN} += "\
    initramfs-framework-base \
    initramfs-module-udev \
    initramfs-module-nfsrootfs \
-    cifs-utils \
    nfs-utils \
    nfs-utils-client \
 "
--- a/meta-ti-bsp/recipes-ti/initramfs/ti-core-initramfs.bb
+++ b/meta-ti-bsp/recipes-ti/initramfs/ti-core-initramfs.bb
@@ -23,6 +23,8 @@ PACKAGE_INSTALL = "packagegroup-ti-core-initramfs"

 export IMAGE_BASENAME = "${IMAGE_NAME}"

+IMAGE_OVERHEAD_FACTOR = "1.1"
+
 # 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
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
@@ -6,7 +6,7 @@ COMPATIBLE_HOST ?= "null"
 COMPATIBLE_HOST:ti-soc = ".*-linux"

 PLATFORM = "UNKNOWN"
-PLATFORM:dra7xx = "DRA7XX"
+PLATFORM:am57xx = "DRA7XX"
 PLATFORM:omapl138 = "OMAPL138"

 ALT_PLATFORM:am57xx = "AM572X AM571X"
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
@@ -22,7 +22,7 @@ SRC_URI += "file://tiipclad-daemon.sh \
 CFLAGS += "-I${UNPACKDIR} -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR}"

 DAEMON = "UNKNOWN"
-DAEMON:dra7xx = "lad_dra7xx"
+DAEMON:am57xx = "lad_dra7xx"
 DAEMON:omapl138 = "lad_omapl138"

 inherit autotools-brokensep pkgconfig update-rc.d systemd
@@ -55,7 +55,7 @@ do_install:append() {
    install -c -m 755 ${UNPACKDIR}/tiipclad-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }

-do_install:append:dra7xx() {
+do_install:append:am57xx() {
    install -d ${D}${sysconfdir}/modprobe.d/
    install -c -m 644 ${UNPACKDIR}/omap_remoteproc.conf ${D}${sysconfdir}/modprobe.d/
 }
--- a/meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb
@@ -1,14 +1,14 @@
 SUMMARY = "RPMsg DMA shared library"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=744e63d2bb8c6151dcdd97f49aa02c53"
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=91dc4ee6d125d0aaba4e5bd2fcc50ed3"

-SRC_URI = "git://github.com/TexasInstruments/rpmsg-dma.git;protocol=https;branch=main"
-SRCREV = "609fd72f458ba56f80d06810509ef88d010d2c03"
+SRC_URI = "git://github.com/TexasInstruments/rpmsg-dma.git;protocol=https;branch=scarthgap"
+SRCREV = "153951932925a72346b76d98b2774952c48a82fc"

 inherit cmake

 DEPENDS = "ti-rpmsg-char"

-EXTRA_OECMAKE += "-DBUILD_LIB=ON -DBUILD_EXAMPLE=OFF"
+EXTRA_OECMAKE += "-DBUILD_LIB=ON -DBUILD_AUDIO_OFFLOAD_EXAMPLE=OFF -DBUILD_2DFFT_OFFLOAD_EXAMPLE=OFF"

 COMPATIBLE_MACHINE = "^(k3)$"
--- a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char-examples/0001-examples-Remove-use-of-includedir-and-libdir.patch
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char-examples/0001-examples-Remove-use-of-includedir-and-libdir.patch
@@ -13,11 +13,11 @@ paths to linker/compiler commandline
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- examples/Makefile.am | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
+ examples/Makefile.am | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)

 diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 5a9bedb..d547e41 100644
+index da34204..34ac7a8 100644
 --- a/examples/Makefile.am
 +++ b/examples/Makefile.am
@@ -1,6 +1,4 @@
@@ -26,13 +26,19 @@ index 5a9bedb..d547e41 100644
 -AM_CFLAGS = -Wall -g -O2 $(INCLUDE)
 +AM_CFLAGS = -Wall -g -O2
 
- bin_PROGRAMS = rpmsg_char_simple
+ bin_PROGRAMS = rpmsg_char_simple rpmsg_char_benchmark
 
-@@ -8,4 +6,3 @@ bin_PROGRAMS = rpmsg_char_simple
+@@ -8,10 +6,8 @@ bin_PROGRAMS = rpmsg_char_simple rpmsg_char_benchmark
 rpmsg_char_simple_SOURCES = rpmsg_char_simple.c
 rpmsg_char_simple_CPPFLAGS = $(AM_CFLAGS)
 rpmsg_char_simple_LDADD = -lpthread -lti_rpmsg_char
 -rpmsg_char_simple_LDFLAGS = -L${libdir}
+
+ # rpmsg_char_benchmark program
+ rpmsg_char_benchmark_SOURCES = rpmsg_char_benchmark.c
+ rpmsg_char_benchmark_CPPFLAGS = $(AM_CFLAGS)
+ rpmsg_char_benchmark_LDADD = -lpthread -lti_rpmsg_char
+-rpmsg_char_benchmark_LDFLAGS = -L${libdir}
 -- 
 2.29.1

--- a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
@@ -7,9 +7,9 @@ PROTOCOL = "https"
 BRANCH = "master"
 SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"

-# 0.6.9 release
-SRCREV = "09b064c6663ed46e4a402291dd87c8fe96135bd7"
+# 0.6.10 release
+SRCREV = "057b1a249261e26d00c501b59646957160ec815b"

-PV = "0.6.9+git"
+PV = "0.6.10+git"

 COMPATIBLE_MACHINE = "^(k3)$"
--- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
@@ -8,7 +8,7 @@ S:append = "/debugss_module/debugss-mod"

 inherit module

-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"

 EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"

--- a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
@@ -8,7 +8,7 @@ PR = "${INC_PR}.2"

 S:append = "/dsptop"

-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"

 EXTRA_OEMAKE = "release DEVICE=DRA7xx CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""

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

 S:append = "/dsptop/ulm"

-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"

 EXTRA_OEMAKE = "release DEVICE=DRA7xx CROSS_COMPILE=${TARGET_PREFIX}"

--- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -3,7 +3,7 @@ LICENSE = "TI-TSPA"

 LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"

-COMPATIBLE_MACHINE = "dra7xx"
+COMPATIBLE_MACHINE = "am57xx"

 inherit features_check

--- a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
+++ b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
@@ -14,7 +14,7 @@ PV = "6.5.0"

 require recipes-ti/includes/ti-paths.inc

-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am62xx|am64xx|am65xx|j721e"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am62xx|am64xx|am65xx|j721e"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 PACKAGES:prepend = " \
@@ -36,7 +36,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs"

 PLATFORM:ti33x = "am335x"
 PLATFORM:ti43x = "am437x"
-PLATFORM:omap-a15 = "am572x"
+PLATFORM:am57xx = "am572x"
 PLATFORM:am62xx = "am62x"
 PLATFORM:am64xx = "am64x"
 PLATFORM:am65xx = "am65x"
@@ -84,7 +84,7 @@ do_install:append:ti43x() {
    done
 }

-do_install:append:omap-a15() {
+do_install:append:am57xx() {
    install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
                   ${D}${nonarch_base_libdir}/firmware/pru
    for i in 1 2
@@ -182,7 +182,7 @@ FILES:${PN}-rpmsg-echo = "${nonarch_base_libdir}/firmware/pru/PRU_RPMsg_Echo_Int
 # Set up names for the firmwares
 PRU_ICSS_ALTERNATIVES:ti33x    = "am335x-pru0-fw am335x-pru1-fw"
 PRU_ICSS_ALTERNATIVES:ti43x    = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
-PRU_ICSS_ALTERNATIVES:omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
+PRU_ICSS_ALTERNATIVES:am57xx   = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
 PRU_ICSS_ALTERNATIVES:am62xx   = "am62x-pru0-fw am62x-pru1-fw"
 PRU_ICSS_ALTERNATIVES:am64xx   = "am64x-pru0_0-fw am64x-pru0_1-fw am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw am64x-rtu1_1-fw"
 PRU_ICSS_ALTERNATIVES:am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=bf0fe2872eb3dfeebb2cbe38206fe81f

 DEPENDS = "ncurses bison-native texinfo flex-native gettext"

-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"

 PR = "${INC_PR}.1"

--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
@@ -8,7 +8,7 @@ PR = "${INC_PR}.0"

 S:append = "/gdbserver-c6x/src"

-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"

 EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM"

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
LCPD Automation Script	3b7aad2f15	CI/CD Auto-Merger: cicd.master.202601090100 Updated the value(s) for: atf: SRCREV_tfa:am62lxx Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2026-01-09 01:00:43 -06:00
LCPD Automation Script	61fa7d2a15	CI/CD Auto-Merger: cicd.master.202601050100 Updated the value(s) for: u-boot-ti-staging_2025.01: SRCREV_uboot linux-ti-staging-rt_6.12: SRCREV_ARM32 linux-ti-staging_6.12: SRCREV Changelogs: u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=afb6e41006ca88067397873e015a21adaf31fd06..df1fe238230433ba3e5b731356156e145aa90917 linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=2a440e3d83789c8220b722e077255a89d826e48a..1379a8eb9786e78509f67ff8eac658bde5ddc66d linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=ee0a0f44964f12d6668a14b4b0b3594ce2ab8871..15b58b1dcd0e0a79d83740b81da1a1367f6f3f68 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2026-01-05 01:00:36 -06:00
LCPD Automation Script	8050c16e48	CI/CD Auto-Merger: cicd.master.202512191404 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV_uboot k3conf: SRCREV linux-ti-staging-rt_6.12: SRCREV_ARM32 linux-ti-staging_6.12: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=b5f45f14e23b927f3ab1f4e00c58eacb47b01d31..8ec0c42b8ccf2c9e8bebfd7c4e03d93fed555442 u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=3f3051bacd384bf331193070c29053d781296ab0..afb6e41006ca88067397873e015a21adaf31fd06 k3conf: https://git.ti.com/cgit/k3conf/k3conf/log/?qt=range&q=cba7dc13a39191ac18bf64fccbba429faff112b4..4e3a44c4b961831f2de80606942dd0d8eb508eca linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=1db5d0126012c7a0b82eff330f9f8a68b3d10f19..2a440e3d83789c8220b722e077255a89d826e48a linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=2d5f05489a39201c2fcf95d2dc04af57b6f7f356..ee0a0f44964f12d6668a14b4b0b3594ce2ab8871 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-12-19 14:05:06 -06:00
Judith Mendez	1d045003d8	trusted-firmware-a: am62l: Update to latest ti-master Update to latest ti-master commit which includes support for BeagleBadge. Signed-off-by: Judith Mendez <jm@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 12:27:03 -06:00
Judith Mendez	05d73bf19f	beaglebadge-ti: Add support for BeagleBadge Add support for the BeagleBadge which is an AM62L based device that requires new build configuration for U-Boot and TF-A sources. Signed-off-by: Judith Mendez <jm@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 12:27:03 -06:00
Ryan Eatmon	26f5767fd2	u-boot: Update trusted-firmware-a locations A recent change in meta-arm installs all of files into a trusted-firmware-a directory. We need that added to the paths for the PACKAGECONFIG settings so that u-boot can compile. Take this opportunity to also break all of the firmware paths into separate variables in case we need to override one of them in the future. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Ryan Eatmon	d42f338a0a	gdbserverproxy-module-drv: Add support for kernel 6.15+ Add a patch to support a kernel change in 6.15: - removed del_timer() in favor of timer_delete(). Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Ryan Eatmon	48de7dc6a4	am62xxsip-evm: Update for 6.18 and 2026.01 The name of the u-boot defconfig changed when it was upstreamed into 2026.01, and the name of the dtb changed to k3-am6254atl-sk.dtb in the kernel. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Ryan Eatmon	8267e14677	ti-bsp: Add ti-6_18 for LTS development Add entries for ti-6_18 for the upcoming LTS development effort. This includes: kernel: 6.18 u-boot: 2026.01 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Ryan Eatmon	413cb96496	u-boot-ti-staging: Add initial 2026.01 recipe for LTS development Add then initial recipe needed for 6.18 development. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Ryan Eatmon	ff8d85e8a4	linux-ti-staging: Add initial 6.18 recipes for LTS development Add all of the initial recipes/files needed for 6.18 development. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Andrew Davis	010c6a4336	meta-ti/all: Merge omap-a15.inc into am57xx.inc As am57xx.inc is now the only user of omap-a15.inc, merge the content of omap-a15.inc into am57xx.inc and remove omap-a15.inc. As we no longer have this common include, also remove "omap-a15" and use "am57xx" in its place. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Andrew Davis	3a9e75ebba	meta-ti/all: Make DRA7xx support a subset of AM57xx support As AM57xx already defined both "dra7xx" and "am57xx" as SOC_FAMILY the AM57xx was effectively a superset MACHINE. Although not all features of AM57xx are needed for DRA7xx, make DRA7xx-EVM use the AM57xx definition. This allows us to still support DRA7xx as the only differences that impact device function are the selection of U-Boot defconfig, DTBs, and OPTEE, all handled by the MACHINE conf file which is left unchanged. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Andrew Davis	534edb03e5	linux-bb.org: Remove unused EXTRA_DTC_ARGS from kernel args This is no longer used anywhere, drop it out. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Andrew Davis	27c220e87c	linux-ti-staging: Remove unused EXTRA_DTC_ARGS from kernel args This is no longer used anywhere, drop it out. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Andrew Davis	6c8b8fe015	k3r5: Remove per-board SYSFW_ variables These were used back when each board had to select the correct tiboot3.bin to become the default for that board's image. Two things have changed since then, first we deploy all options for tiboot3.bin generated by U-Boot. And second, U-Boot's binman tool now symlinks the most appropriate version of this file for us for the selected U-Boot defconfig file. These are no longer needed so drop them. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Andrew Davis	32e30bef7a	k3r5: Use UBOOT_BINARY for R5 U-Boot Image As R5 only builds one working image (tiboot3.bin), define this as the "UBOOT_BINARY", even though it was technically build using the SPL build pass in U-Boot. This allows some simplification and removes deploying of a dummy file (u-boot-spl.bin) which is not a usable boot file. It was only deployed as UBOOT_BINARY is not optional and so something needed to be set here. BeagleBone-AI64 already did something similar to this so the overrides in that MACHINE conf can now be removed. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Andrew Davis	65ee7c49c8	u-boot: Remove defaults for UBOOT_SUFFIX and SPL_BINARY These were set to the defaults we would expect from OMAP class U-Boot, but as all board families set these including the OMAP class MACHINEs we can remove these defaults. This helps in the cases that we do not want to define one of these, such as SPL_BINARY in the case of OMAP-L138 which does not use SPL. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Andrew Davis	d29a9cc06f	conf: machine: Remove remaining K3 HS machines Every MACHINE build deploys a tiboot3.bin file for all three K3 security types (GP, HS-FS, HS-SE). These extra MACHINE configs existed to select a different default. As U-Boot now selects a default for us this logic does not need to exist here. Instead if one wants to use a non-default security type for an EVM then can simply rename the tiboot3.bin file in the boot partition. Testing automation already handles this and Sitara- family devices have dropped the dedicated MACHINE configs, do the same for Jacinto-family devices. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
Moteen Shah	3073bf9e29	am62axx.inc: Add TPS6594 regulator and core modules to initramfs image Add TPS6594 core and regulator driver modules in the initramfs image so that the SD card can be probed for am62axx as it is dependent on regulator to get the SD card probing and eventually boot from it. Signed-off-by: Moteen Shah <m-shah@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-19 09:57:39 -06:00
LCPD Automation Script	2b3ca72005	CI/CD Auto-Merger: cicd.master.202512040100 Updated the value(s) for: ti-linux-fw: TI_DM_FW_VERSION,TI_LINUX_FW_SRCREV u-boot-ti-staging_2025.01: SRCREV_uboot linux-ti-staging-rt_6.12: PV_ARM32,SRCREV_ARM32 linux-ti-staging_6.12: PV,SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=0a37dc07b1120127eba73c7196a0b532350b9639..b5f45f14e23b927f3ab1f4e00c58eacb47b01d31 u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=a44465cad8a30cbad5e8b22baef59aa7f5151494..3f3051bacd384bf331193070c29053d781296ab0 linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=6ebb538029fdce262760611915225be608c31257..1db5d0126012c7a0b82eff330f9f8a68b3d10f19 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=1a86d36433eac7cef246d41fbd4d2bdd9612253f..2d5f05489a39201c2fcf95d2dc04af57b6f7f356 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-12-04 01:00:51 -06:00
Manorit Chawdhry	b05876bb9c	trusted-firmware-a/optee-os: Add LPM support on few platforms Adds the required TF-A and OP-TEE patches to enable LPM support on J7200, J784s4, J742s2. Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-12-01 16:12:44 -06:00
Ryan Eatmon	7bec7f73c6	check_yocto_rules: Add new PV-1 entries We have added a new PV check to the check_repo script that checks to make sure that PV is set either in the filename or via the PV variable in the recipe. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-20 14:15:29 -06:00
Randolph Sapp	780d73ff61	layer: add github MIRRORS definitions We have some projects mirrored to GitHub currently. It makes sense to add a MIRRORS entry for git.ti.com sources to fall back on in the event git.ti.com is unreachable. Placing this in the main BSP layer configuration file should be all that is required for this and any other layers that depend this core layer to fall back to GitHub. Signed-off-by: Randolph Sapp <rs@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-20 14:15:29 -06:00
Antonios Christidis	a349aed7bd	ti-img-rogue-*: Migrate GPU driver version 24.2 -> 25.2 New recipes for GPU DDK 25.2. Update BSP configuration files with new preferred recipe versions. For the driver recipe, specifically unset the CC variable due to yocto appending CROSS_COMPILE and CC, resulting in a warning for the do_compile task: make[1]: aarch64-oe-linux-aarch64-oe-linux-gcc: No such file or directory Signed-off-by: Antonios Christidis <a-christidis@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-20 14:15:29 -06:00
LCPD Automation Script	2676538ee0	CI/CD Auto-Merger: cicd.master.202511180100 Updated the value(s) for: ti-linux-fw: PRUETH_FW_AM65X_SR2_VERSION,TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV_uboot linux-ti-staging-rt_6.12: SRCREV_ARM32 linux-ti-staging_6.12: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=faf2980429e83e502d1a2da907f8be14b131c9fc..0a37dc07b1120127eba73c7196a0b532350b9639 u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=934cf94788c505068308069903d42f6cdf30c0ae..a44465cad8a30cbad5e8b22baef59aa7f5151494 linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=998927d273b149e4e03abc087965dbfafdec66a2..6ebb538029fdce262760611915225be608c31257 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=4be12a82ab1650b6313835b4d2fc70848f38dc13..1a86d36433eac7cef246d41fbd4d2bdd9612253f Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-11-18 01:00:43 -06:00
Ryan Eatmon	e8eb6eac34	ti-rpmsg-char-examples: Fix patch The recent SRCREV bump to ti-rpmsg-char makes this patch not apply. Update the patch to match the new changes. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-17 13:50:55 -06:00
Hari Nagalla	5d15cce6fc	ipc: ti-rpmsg-char: Update library to 0.6.10 update rpmsg library to 0.6.10 It brings the following fixes from ti-rpmsg-char repo: d4cf638 src: fix bug in file_read_string() 3e72722 src: add api to fetch kernel allocated remote proc id 5061690 benchmark: update max runs = 1 trillion, max latency = 9sec 4aa2a84 examples: clean up tabs, delay metering 07660dd example: add rpmsg_char_benchmark b40845f Replace read bytes from 256 --> 496 b2e9e2f Update max message size to 496 Signed-off-by: Hari Nagalla <hnagalla@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-17 13:50:55 -06:00
Anurag Dutta	20f7b83e1c	conf: machine: j722s: Fix overlay name in KERNEL_DEVICETREE_PREFIX Currently, the overlay mentioned in KERNEL_DEVICETREE_PREFIX in case of j722s is "k3-am625-sk-mcspi-loopback" which is incorrect as it has been renamed recently. Change the overlay to "k3-am62x-sk-mcspi-loopback" in order to carry out SPI loopback tests successfully. Fixes: `3b2097d727` ("conf: machine: j722s: Change overlay in KERNEL_DEVICETREE_PREFIX") Signed-off-by: Anurag Dutta <a-dutta@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-17 13:50:55 -06:00
Ryan Eatmon	de5d6d7e35	check_yocto_rules: Add new exception for packagegroup-ti-core-initramfs.bbappend Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-12 15:53:07 -06:00
LCPD Automation Script	10c316b005	CI/CD Auto-Merger: cicd.master.202511120100 Updated the value(s) for: atf: SRCREV_tfa:am62lxx Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-11-12 01:00:40 -06:00
LCPD Automation Script	7cff97509d	CI/CD Auto-Merger: cicd.master.202511110100 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV_uboot linux-ti-staging-rt_6.12: SRCREV_ARM32 linux-ti-staging_6.12: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=3c8ad7386e818cb42cce6ed4ce2aa1e76d7c688f..faf2980429e83e502d1a2da907f8be14b131c9fc u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=aa613c2e83299906b121fcf0d6a5824f1d1c3ff9..934cf94788c505068308069903d42f6cdf30c0ae linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=a55efe5b7adbb88ee55b67f4f044c2882978d1b5..998927d273b149e4e03abc087965dbfafdec66a2 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=9b2678be3a92ebdbf376000f06636eab8f7c1dd8..4be12a82ab1650b6313835b4d2fc70848f38dc13 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-11-11 01:00:43 -06:00
Paresh Bhagat	aca8792dec	conf: machine: am62dxx-evm: Package eHRPWM overlay Package eHRPWM overlay for am62dxx-evm by reusing the existing overlay for am62a7-sk. Signed-off-by: Paresh Bhagat <p-bhagat@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-05 17:55:43 -06:00
Denys Dmytriyenko	ea3574a504	packagegroup-ti-core-initramfs: move cifs-utils to dynamic-layers Since cifs-utils is available in meta-openembedded, not OE-Core, it cannot be added to this packagegroup unconditionally, as meta-ti-bsp doesn't depend on meta-oe, only recommends it. As it breaks yocto-check-layer now, move cifs-utils addition to dynamic-layers to be added conditionally on meta-oe presence. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-05 17:55:43 -06:00
Ryan Eatmon	2264eb9462	ti-core-initramfs: Set IMAGE_OVERHEAD_FACTOR We are seeing errors when building against linux-next where we run into the INITRAMFS_MAXSIZE check. Lower the overhead factor a little to give us a little more room. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-05 17:55:43 -06:00
Vishnu Singh	53154b7a45	ti-librpmsg-dma: update ti-librpmsg-dma SRCREV & LICENSE Replace MIT license with TI-TFL to align with TI release policy and product requirements. Legal approval: SRAS00013045 Update scarthgap srcrev and disable 2dfft example from lib build. License-Update: Replace MIT to TI-TFL license Signed-off-by: Vishnu Singh <v-singh1@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-11-05 17:55:43 -06:00