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

Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2026.01: SRCREV_uboot linux-ti-staging_6.18: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=cf4a45b898294c96af02a62b7321c35651b3fa67..58a8a47f9063cfcd9eebcfb2825b99a34ef19b80 u-boot-ti-staging_2026.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=90e682a353fe494e4058068a02bd8ee9f7a1bbf2..8dedb46bfd7e7bba52cbedfbab10fe4383317b7b linux-ti-staging_6.18: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=30182cf3ac7db7fd66c36870f3fc5db91a32f36c..1ae61a325571a4b242dac987edcbff0bf11cbd35 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
ti-extras: Add Jailhouse support for bsp-ti-6_18
2026-03-06 19:50:16 +00:00 · 2026-03-06 07:43:07 -06:00 · 2026-03-05 10:55:37 -06:00 · 2026-03-05 10:55:37 -06:00 · 2026-03-05 05:09:58 -06:00 · 2026-03-04 18:08:45 -06:00
133 changed files with 666 additions and 975 deletions
--- a/meta-beagle/conf/machine/beaglebadge-ti.conf
+++ b/meta-beagle/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-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/beagleplay-ti-k3r5.conf
+++ b/meta-beagle/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-beagle/conf/machine/beagleplay-ti.conf
+++ b/meta-beagle/conf/machine/beagleplay-ti.conf
@@ -2,23 +2,10 @@
 #@NAME: BeaglePlay (A53)
 #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)

-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-SOC_FAMILY:append = ":am62xx"
-
-MACHINE_FEATURES += "screen"
+require conf/machine/include/am62xx.inc

 SERIAL_CONSOLES = "115200;ttyS2"

-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
 UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"

 SPL_BINARY = "tispl.bin_unsigned"
--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -2,14 +2,8 @@
 #@NAME: BeagleY AI (R5F)
 #@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)

-require conf/machine/include/k3r5.inc
+require conf/machine/beagley-ai-ti-k3r5.conf
+
 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"
-UBOOT_MACHINE:bsp-ti-6_12 = "j722s_evm_r5_defconfig"
--- a/meta-beagle/conf/machine/beagley-ai-ti-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-ti-k3r5.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: BeagleY AI (R5F)
+#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"
--- a/meta-beagle/conf/machine/beagley-ai-ti.conf
+++ b/meta-beagle/conf/machine/beagley-ai-ti.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: BeagleY AI (A53)
+#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
+
+require conf/machine/include/j722s.inc
+
+UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_a53_config"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am67a \
+    ti/k3-j722s \
+"
+
+MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-beagle/conf/machine/beagley-ai.conf
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -2,18 +2,11 @@
 #@NAME: BeagleY AI (A53)
 #@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)

-require conf/machine/include/j722s.inc
+require conf/machine/beagley-ai-ti.conf
+
 require conf/machine/include/beagle-bsp.inc

-UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"
 UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config"
-UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_a53_config"
-UBOOT_MACHINE:bsp-ti-6_12 = "j722s_evm_a53_config"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am67a \
-    ti/k3-j722s \
-"

 KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
 ti/k3-am67a-beagley-ai.dtb \
--- a/meta-beagle/conf/machine/include/beagle-bsp.inc
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -15,6 +15,7 @@ BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%"
 BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org"
 BSP_BOOTLOADER_VERSION:bsp-bb_org-6_12 = "2025.%"
 KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
+TI_CORE_INITRAMFS_KERNEL_MODULES: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%"
@@ -36,6 +37,7 @@ BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
 BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
 BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
 KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
+TI_CORE_INITRAMFS_KERNEL_MODULES: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%"
--- 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/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -4,10 +4,14 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 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"
--- 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
@@ -9,6 +9,7 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62a7-sk-edgeai \
    ti/k3-am62x-sk \
    ti/k3-am62a7-sk-rpi-hdr-ehrpwm \
+    ti/k3-am62a7-sk-e3-max-opp \
 "

 KERNEL_DEVICETREE = ""
@@ -17,4 +18,4 @@ FIT_CONF_DEFAULT_DTB = "k3-am62d2-evm.dtb"

 UBOOT_MACHINE = "am62dx_evm_a53_defconfig"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-dac-fw"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-adc-fw"
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -4,10 +4,22 @@

 require conf/machine/include/k3r5.inc

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

-UBOOT_MACHINE = "am62px_evm_r5_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:ti-falcon = "k3_r5_falcon.config"
+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"
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/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)}"
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -4,10 +4,14 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 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"
--- 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,14 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 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"
--- 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,16 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am64x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
+UBOOT_MACHINE = ""

-UBOOT_MACHINE = "am64x_evm_r5_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 = "${UBOOT_ECDSA_SIGN_CONFIG} main"
+
+UBOOT_CONFIG[main] = "am64x_evm_r5_defconfig"
+UBOOT_CONFIG[ecdsa] = "am64x_evm_r5_defconfig"
+
+UBOOT_CONFIG_MAKE_OPTS[ecdsa] = "${TI_SIGN_WITH_ECDSA_KEY}"
--- a/meta-ti-bsp/conf/machine/am64xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am64xx-evm.conf
@@ -4,4 +4,21 @@

 require conf/machine/include/am64xx.inc

-UBOOT_MACHINE = "am64x_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 = ""
+
+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] = "am64x_evm_a53_defconfig"
+UBOOT_CONFIG[ecdsa] = "am64x_evm_a53_defconfig"
+
+UBOOT_CONFIG_MAKE_OPTS[ecdsa] = "${TI_SIGN_WITH_ECDSA_KEY}"
+
+IMAGE_BOOT_FILES += "${ECDSA_BOOT_FILES}"
--- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
@@ -4,8 +4,10 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "am65x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
 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"
--- 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/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,6 @@ 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_CORE_INITRAMFS_KERNEL_MODULES = "kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
+TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-ti-6_6 = ""
+TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-ti-6_12 = ""
--- a/meta-ti-bsp/conf/machine/include/am62lxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62lxx.inc
@@ -3,7 +3,8 @@ SOC_FAMILY:append = ":am62lxx"

 MACHINE_FEATURES += "screen"

-TFA_BOARD = "am62l"
+TFA_BOARD = "am62lx"
 TFA_K3_SYSTEM_SUSPEND = "1"
+TFA_PLATFORM = "k3low"

 OPTEEMACHINE = "k3-am62lx"
--- 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/j721e.inc
+++ b/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-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"
+TI_CORE_INITRAMFS_KERNEL_MODULES = "kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
+TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-ti-6_6 = ""
+TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-ti-6_12 = ""
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/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-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"
+TI_CORE_INITRAMFS_KERNEL_MODULES = "kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
+TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-ti-6_6 = ""
+TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-ti-6_12 = ""
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -43,7 +43,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-pka-fw"

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"

-IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin tiboot3-*-evm.bin"
+IMAGE_BOOT_FILES += "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin tiboot3-*-evm.bin"
 IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"

 EFI_PROVIDER ?= "grub-efi"
--- 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,8 +3,8 @@
 # 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
-TI_PREFERRED_BSP ??= "ti-6_12"
+# Supported options are: mainline, next, ti-6_18, ti-6_12, ti-6_6
+TI_PREFERRED_BSP ??= "ti-6_18"

 # Use bsp-* namespace for overrides
 MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:"
@@ -33,6 +33,19 @@ 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%"
+
+BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_18 = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_18 = "25%"
+BSP_MESA_PVR_VERSION:bsp-ti-6_18 = "24%"
+
 # ==========
 # ti-6_12
 # TI staging kernel 6.12, u-boot 2025.01
--- a/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-core-initramfs.inc
@@ -0,0 +1,23 @@
+#------------------------------------------------------------------------------
+#
+# To turn off the ti-core-initramfs.cpio creation just set:
+#
+#   TI_CORE_INITRAMFS_ENABLED = "0"
+#
+#------------------------------------------------------------------------------
+TI_CORE_INITRAMFS_ENABLED ?= "${@ '1' if d.getVar('TI_CORE_INITRAMFS_KERNEL_MODULES') or d.getVar('TI_CORE_INITRAMFS_EXTRA_INSTALL') else '0'}"
+
+TI_CORE_INITRAMFS_KERNEL_MODULES ?= ""
+TI_CORE_INITRAMFS_EXTRA_INSTALL ?= ""
+
+TI_CORE_INITRAMFS_IMAGE = "ti-core-initramfs"
+TI_CORE_INITRAMFS_IMAGE_FILE = "${TI_CORE_INITRAMFS_IMAGE}.cpio.xz"
+
+#------------------------------------------------------------------------------
+# Apply all of the needed changes to create/use the initramfs (if enabled).
+#------------------------------------------------------------------------------
+do_image_wic[depends] += "${@ '${TI_CORE_INITRAMFS_IMAGE}:do_image_complete' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}"
+
+TI_WKS_INITRAMFS ?= "${@ ',initrd=${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}"
+
+IMAGE_BOOT_FILES += "${@ '${TI_CORE_INITRAMFS_IMAGE_FILE}' if d.getVar('TI_CORE_INITRAMFS_ENABLED') == "1" else ''}"
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -3,6 +3,7 @@
 SOC_FAMILY = "ti-soc"
 require conf/machine/include/soc-family.inc
 require conf/machine/include/ti-extras.inc
+require conf/machine/include/ti-core-initramfs.inc

 # kernel, initrd load addresses for the fitImage in all TI platforms
 UBOOT_ENTRYPOINT = "0x82000000"
@@ -28,19 +29,3 @@ CLASS_DEVICETREE_PREFIX = "${@ 'ti-devicetree-prefix' if d.getVar('KERNEL_DEVICE

 KERNEL_CLASSES += "${CLASS_DEVICETREE_PREFIX}"
 IMAGE_CLASSES += "${CLASS_DEVICETREE_PREFIX}"
-
-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-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-mainline = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
-TI_WKS_INITRAMFS:bsp-next = ",initrd=${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}"
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -91,5 +91,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa"

 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}"
+IMAGE_BOOT_FILES += "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -63,5 +63,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa"

 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}"
+IMAGE_BOOT_FILES += "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
--- 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,12 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j722s"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
 UBOOT_MACHINE = "j722s_evm_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
+
+UBOOT_CONFIG = "main"
+UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
+UBOOT_CONFIG[main] = "j722s_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "j722s_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
--- 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/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
@@ -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}"

--- 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.3.6908880.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_25.3.6908880.bb
@@ -13,11 +13,11 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"

 DEPENDS = "virtual/kernel"

-BRANCH = "linuxws/scarthgap/k6.12/${PV}"
+BRANCH = "linuxws/scarthgap/k6.18/${PV}"

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

-SRCREV = "72723eea0cab47c20e5734c1c7b9a441ed2d74c2"
+SRCREV = "d241b0d5df404c60b80233bb5116b596039062e6"


 TARGET_PRODUCT:j721e = "j721e_linux"
--- 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-adc-fw/ti-adc-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-adc-fw/ti-adc-fw.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "TI ADC PCM6240 config prebuild binary firmware"
+
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+
+PV = "${PCM6240_FW_VERSION}"
+PR = "${INC_PR}.0"
+
+COMPATIBLE_MACHINE = "am62dxx"
+
+PCM6240_2DEV = "pcm6240-2dev-reg.bin"
+
+do_install() {
+	install -d ${D}${nonarch_base_libdir}/firmware
+	install -m 0644 ${S}/ti/pcm6240/${PCM6240_2DEV} ${D}${nonarch_base_libdir}/firmware/
+}
--- a/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb
@@ -1,17 +0,0 @@
-DESCRIPTION = "TI DAC TAD5212 config prebuild binary firmware"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-PV = "${TAD5212_FW_VERSION}"
-PR = "${INC_PR}.0"
-
-COMPATIBLE_MACHINE = "am62dxx"
-
-TAD5212_1DEV = "tad5212_01.bin"
-TAD5212_4DEV = "tad5212_04.bin"
-
-do_install() {
-	install -d ${D}${nonarch_base_libdir}/firmware
-	install -m 0644 ${S}/ti/tad5212/${TAD5212_1DEV} ${D}${nonarch_base_libdir}/firmware/
-	install -m 0644 ${S}/ti/tad5212/${TAD5212_4DEV} ${D}${nonarch_base_libdir}/firmware/
-}
--- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/ti-vxe-vxd-driver_6.12.bb
+++ b/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"

--- 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
@@ -15,13 +15,13 @@ 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.02.07"
-TI_SYSFW_VERSION = "11.02.05"
+TI_SYSFW_VERSION = "11.02.09"
 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"
+PCM6240_FW_VERSION = "1.0.0.0"

-TI_LINUX_FW_SRCREV ?= "b5f45f14e23b927f3ab1f4e00c58eacb47b01d31"
+TI_LINUX_FW_SRCREV ?= "58a8a47f9063cfcd9eebcfb2825b99a34ef19b80"
 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
@@ -2,17 +2,17 @@

 FILESEXTRAPATHS:prepend := "${THISDIR}/trusted-firmware-a:"

-PV = "2.13+git"
+PV = "2.14+git"

 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
-SRCREV_tfa = "e0c4d3903b382bf34f552af53e6d955fae5283ab"
+SRCREV_tfa = "76500ceaeefcda967d8a1f4e30bb04f9fe0425a2"
 SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
 SRCBRANCH = "master"

-LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
-SRCREV_tfa:am62lxx = "960816d244c39ac1cfa24c4ea028c4404f9cbb20"
+LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+SRCREV_tfa:am62lxx = "6cbb606a1de234c08aaf6eae57ae24f6422ec111"
 SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
-SRCBRANCH:am62lxx = "ti-master"
+SRCBRANCH:am62lxx = "ti-tfa-2.14.y"

 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"

@@ -30,14 +30,3 @@ 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
@@ -1,115 +0,0 @@
-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
@@ -1,194 +0,0 @@
-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
@@ -1,68 +0,0 @@
-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/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/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}
--- a/meta-ti-bsp/recipes-bsp/u-boot/files/custMpk_ecdsa.key
+++ b/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-----
--- a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
@@ -4,7 +4,9 @@
 COMPATIBLE_MACHINE:tie-jailhouse = "am62xx|am62pxx|am62lxx"

 BRANCH:tie-jailhouse:bsp-ti-6_12 = "ti-u-boot-2025.01-jailhouse"
+BRANCH:tie-jailhouse:bsp-ti-6_18 = "ti-u-boot-2026.01-jailhouse"

 SRCREV_uboot:tie-jailhouse:bsp-ti-6_12 = "e718bbcec3ebf663c021839753034a224be4cc53"
+SRCREV_uboot:tie-jailhouse:bsp-ti-6_18 = "257704a4a690f221064e0210028e8986a4b4ccae"

 UBOOT_GIT_URI:tie-jailhouse = "git://git.ti.com/git/processor-sdk/u-boot.git"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
+++ b/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
-}
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
@@ -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"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
@@ -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"
--- 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
@@ -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 = "3f3051bacd384bf331193070c29053d781296ab0"
+SRCREV_uboot = "ef2eb76b650415637bd93b0eddfb1e31489117f9"
--- 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,7 @@
+require u-boot-ti.inc
+
+PR = "r0"
+
+BRANCH = "ti-u-boot-2026.01"
+
+SRCREV_uboot = "8dedb46bfd7e7bba52cbedfbab10fe4383317b7b"
--- 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,12 +5,10 @@ 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
+
+include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}

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

@@ -67,10 +65,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"
@@ -145,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 () {
@@ -225,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
 }
@@ -254,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
 }
@@ -388,3 +416,6 @@ PACKAGES:prepend:am62pxx-evm = "${FALCON_PKG} "
 PACKAGES:prepend:am62xx-lp-evm = "${FALCON_PKG} "

 TOOLCHAIN = "gcc"
+
+TI_SIGN_WITH_ECDSA_KEY ?= "SIGNING_KEY=${THISDIR}/files/custMpk_ecdsa.key"
+TI_SIGN_WITH_ECDSA_KEY:bsp-ti-6_12 = "KEY_PATH=${THISDIR}/files/custMpk_ecdsa.key"
--- 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 = "c50875c7c4ad112d5e632bea3301e06a0aa8669f"

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

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

 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/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch
@@ -1,60 +0,0 @@
-From 4907fa9ff1dbdd72ce9fa7855091fb604a35a62d Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <reatmon@ti.com>
-Date: Wed, 17 Jul 2024 14:55:10 -0500
-Subject: [PATCH] vt/conmakehash: improve reproducibility for v6.10
-
-The file generated by conmakehash capture the application
-path used to generate the file. While that can be informative,
-it varies based on where the kernel was built, as the full
-path is captured.
-
-We tweak the application to use a second input as the "capture
-name", and then modify the Makefile to pass the basename of
-the source, making it reproducible.
-
-This could be improved by using some sort of path mapping,
-or the application manipualing argv[1] itself, but for now
-this solves the reprodicibility issue.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
-
-This is a minior rework of Bruce's original patch for the v6.10 kernel.
-
-Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
- drivers/tty/vt/Makefile      | 2 +-
- drivers/tty/vt/conmakehash.c | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
-index 2c8ce8b592ed..8532077ed3bb 100644
--- a/drivers/tty/vt/Makefile
-+++ b/drivers/tty/vt/Makefile
-@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
- hostprogs += conmakehash
-
- quiet_cmd_conmk = CONMK   $@
-      cmd_conmk = $(obj)/conmakehash $< > $@
-+      cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
-
- $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
-	$(call cmd,conmk)
-diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
-index dc2177fec715..9cd4096a8ffa 100644
--- a/drivers/tty/vt/conmakehash.c
-+++ b/drivers/tty/vt/conmakehash.c
-@@ -112,6 +112,8 @@ int main(int argc, char *argv[])
-   else
-     rel_tblname = tblname;
-
-+  rel_tblname = argv[2];
-+
-   /* For now we assume the default font is always 256 characters. */
-   fontlen = 256;
-
--
-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/Show More
+++ b/Show More