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
158 changed files with 1094 additions and 665 deletions
--- a/check_yocto_rules.json
+++ b/check_yocto_rules.json
@@ -18,12 +18,32 @@
            "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" : {
        "skip_vars" : [ "k3" , "ti-soc" ]
    },
+    "GUARD-3" : {
+        "skip_files" : [
+            "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,9 +5,7 @@
 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 = "j722s_evm_r5_defconfig"
-UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"
+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.conf
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -5,9 +5,10 @@
 require conf/machine/include/j722s.inc
 require conf/machine/include/beagle-bsp.inc

-UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config"
-
 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 \
--- a/meta-beagle/conf/machine/include/beagle-bsp.inc
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -18,10 +18,8 @@ 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_SGX_UMLIBS_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_UMLIBS_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
@@ -41,10 +39,8 @@ 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_SGX_UMLIBS_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_UMLIBS_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 = "am6232_pocketbeagle2_r5_defconfig"
+UBOOT_MACHINE = "am62_pocketbeagle2_r5_defconfig"
--- a/meta-beagle/conf/machine/pocketbeagle2.conf
+++ b/meta-beagle/conf/machine/pocketbeagle2.conf
@@ -16,7 +16,7 @@ TFA_K3_SYSTEM_SUSPEND = "1"

 OPTEEMACHINE = "k3-am62x"

-UBOOT_MACHINE = "am6232_pocketbeagle2_a53_defconfig"
+UBOOT_MACHINE = "am62_pocketbeagle2_a53_defconfig"

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am6232 \
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.10+git/bootcmd-ti-mmc.cfg
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.10+git/bootcmd-ti-mmc.cfg
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.07.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.07.bb
@@ -1,19 +0,0 @@
-require recipes-bsp/u-boot/u-boot-ti.inc
-
-SUMMARY = "BeagleBoard.org U-Boot"
-
-COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
-
-PV = "2025.07"
-
-UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
-UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2025.07-Beagle"
-SRCREV = "919ec3cd84f39e6960d1705d4ba7f810bc1067fc"
-
-BRANCH:pocketbeagle2 = "v2025.07-am6232-pocketbeagle2"
-BRANCH:pocketbeagle2-k3r5 = "v2025.07-am6232-pocketbeagle2"
-SRCREV:pocketbeagle2 = "6d5b4abc28f036a4a83ccb234f04d72eceafdc4e"
-SRCREV:pocketbeagle2-k3r5 = "6d5b4abc28f036a4a83ccb234f04d72eceafdc4e"
-
-SRC_URI:append:pocketbeagle2 = " file://bootcmd-ti-mmc.cfg"
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb
@@ -0,0 +1,19 @@
+require recipes-bsp/u-boot/u-boot-ti.inc
+
+SUMMARY = "BeagleBoard.org U-Boot"
+
+COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
+
+PV = "2025.10"
+
+UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
+UBOOT_GIT_PROTOCOL = "https"
+BRANCH = "v2025.10-Beagle"
+SRCREV = "6825d60bea17774358f4199c4c7062801cfb931e"
+
+BRANCH:pocketbeagle2 = "v2025.10-am62-pocketbeagle2"
+BRANCH:pocketbeagle2-k3r5 = "v2025.10-am62-pocketbeagle2"
+SRCREV:pocketbeagle2 = "4e0b6294a1185029d34eff6ed91f3ad1734b643f"
+SRCREV:pocketbeagle2-k3r5 = "4e0b6294a1185029d34eff6ed91f3ad1734b643f"
+
+SRC_URI:append:pocketbeagle2 = " file://bootcmd-ti-mmc.cfg"
--- 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 = " \
@@ -52,12 +52,6 @@ KERNEL_DEVICETREE:append:armv7a = " \
    ti/omap/PB-MIKROBUS-1.dtbo \
 "

-KERNEL_DEVICETREE:append:aarch64 = " \
-    ti/BONE-I2C1.dtbo \
-    ti/BONE-I2C2.dtbo \
-    ti/BONE-I2C3.dtbo \
-"
-
 S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"

 # 6.12.34 version for 32-bit
@@ -65,9 +59,9 @@ SRCREV:armv7a = "9e419b26243bd7efcd103ae0f6456f828592b34b"
 PV:armv7a = "6.12.34+git"
 BRANCH:armv7a = "v6.12.34-ti-arm32-r12"

-# 6.12.34 version for 64-bit
-SRCREV:aarch64 = "9ca36b8c54806a037f357efcd40eaa8399798b05"
-PV:aarch64 = "6.12.34+git"
-BRANCH:aarch64 = "v6.12.34-ti-arm64-r46"
+# 6.12.43 version for 64-bit
+SRCREV:aarch64 = "84c4b4613a852db269620a3fdfed65de90569fa1"
+PV:aarch64 = "6.12.43+git"
+BRANCH:aarch64 = "v6.12.43-ti-arm64-r54"

 KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
--- 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/am335x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-evm.conf
@@ -22,7 +22,7 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 16000"
+MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 18000"

 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
--- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
@@ -20,3 +20,4 @@ FITIMAGE_HASH_ALGO = ""
 FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
+FIT_CONF_DEFAULT_DTB = "am335x-evm.dtb"
--- a/meta-ti-bsp/conf/machine/am437x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-evm.conf
@@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyS0"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 8000"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 10000"

 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:
--- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
@@ -22,3 +22,4 @@ FITIMAGE_PACK_TEE = "1"
 FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
+FIT_CONF_DEFAULT_DTB = "am437x-gp-evm.dtb"
--- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
@@ -23,3 +23,4 @@ FITIMAGE_PACK_TEE = "1"
 FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
+FIT_CONF_DEFAULT_DTB = "am57xx-evm.dtb"
--- 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
@@ -7,6 +7,8 @@ require conf/machine/include/am62dxx.inc
 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/am62lxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62lxx-evm.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI AM62L EVM

 require conf/machine/include/am62lxx.inc
-require conf/machine/include/ti-extras.inc

 IMAGE_FSTYPES += "ubifs ubi"

--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -3,11 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI AM62Px EVM (R5F core)

 require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
-
-SYSFW_SOC = "am62px"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62px_evm_r5_defconfig"

--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -3,13 +3,13 @@
 #@DESCRIPTION: Machine configuration for the TI AM62PX EVM

 require conf/machine/include/am62pxx.inc
-require conf/machine/include/ti-extras.inc

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62p5 \
    ti/k3-am62x-sk-csi2 \
    ti/k3-am62x-sk-hdmi \
    ti/k3-am62x-sk-lpm \
+    ti/k3-am62x-sk-mcspi-loopback \
    ti/k3-v3link \
 "

--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -3,11 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)

 require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62x_evm_r5_defconfig"

--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI AM62XX EVM

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

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

 require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"

--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM

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

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62-lp \
@@ -13,6 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62x-sk-hdmi \
    ti/k3-am62x-sk-lpm \
    ti/k3-am62x-sk-mcan \
+    ti/k3-am62x-sk-mcspi-loopback \
    ti/k3-am62x-sk-pwm \
 "

--- 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/beagleplay-ti.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
@@ -7,7 +7,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":am62xx"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 SERIAL_CONSOLES = "115200;ttyS2"

--- 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
@@ -11,3 +11,6 @@ TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"

 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
+
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline  = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-next  = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":am62pxx"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":am62xx"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -28,6 +28,6 @@ TFA_BOARD = "lite"

 OPTEEMACHINE = "k3-am64x"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw pruprp-fw"

 TI_WKS_BOOTLOADER_APPEND = "console=ttyS2,115200n8"
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":am65xx"

-MACHINE_FEATURES += "screen touchscreen gpu"
+MACHINE_FEATURES += "screen touchscreen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
--- a/meta-ti-bsp/conf/machine/include/am68.inc
+++ b/meta-ti-bsp/conf/machine/include/am68.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":j721s2"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
--- a/meta-ti-bsp/conf/machine/include/am69.inc
+++ b/meta-ti-bsp/conf/machine/include/am69.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":j784s4"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
--- 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
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":j721e"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
@@ -19,3 +19,6 @@ TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver"
 TI_VXE_VXD_DRIVER:bsp-ti-6_6 = ""

 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"
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":j721s2"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
--- a/meta-ti-bsp/conf/machine/include/j722s.inc
+++ b/meta-ti-bsp/conf/machine/include/j722s.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":j722s"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
--- a/meta-ti-bsp/conf/machine/include/j742s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j742s2.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":j742s2"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":j784s4"

-MACHINE_FEATURES += "screen gpu"
+MACHINE_FEATURES += "screen"

 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
@@ -13,3 +13,6 @@ TFA_BOARD = "j784s4"
 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"
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -20,10 +20,10 @@ SPL_BINARY = "tispl.bin"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_SUFFIX = "img"

-UBOOT_SIGN_ENABLE = "1"
+FIT_KERNEL_SIGN_ENABLE = "1"
+FIT_KERNEL_SIGN_KEYNAME ?= "custMpk"
+FIT_KERNEL_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
 UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
-UBOOT_SIGN_KEYNAME ?= "custMpk"
-UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
 FIT_HASH_ALG ?= "sha512"
 FIT_SIGN_ALG ?= "rsa4096"

--- 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,51 +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}"
-PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
-
-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 gpu 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
@@ -18,10 +18,6 @@ BSP_KERNEL_VERSION:bsp-mainline = "%"
 BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline"
 BSP_BOOTLOADER_VERSION:bsp-mainline = "%"

-# GPU support requires out-of-tree SGX and Rogue drivers not available
-# in mainline, usually present in TI staging or derivative like BB.org
-MACHINE_FEATURES:remove:bsp-mainline = "gpu"
-
 # GC320 support requires out-of-tree drivers not available in mainline
 MACHINE_FEATURES:remove:bsp-mainline = "gc320"

@@ -34,13 +30,18 @@ BSP_KERNEL_VERSION:bsp-next = "%"
 BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-next"
 BSP_BOOTLOADER_VERSION:bsp-next = "%"

-# GPU support requires out-of-tree SGX and Rogue drivers not available
-# in next, usually present in TI staging or derivative like BB.org
-MACHINE_FEATURES:remove:bsp-next = "gpu"
-
 # 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
@@ -52,10 +53,8 @@ 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_SGX_UMLIBS_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_UMLIBS_VERSION:bsp-ti-6_12 = "24%"
+BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "25%"
 BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"

 # ==========
@@ -69,10 +68,8 @@ 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_SGX_UMLIBS_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_UMLIBS_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
@@ -92,8 +89,6 @@ BSP_SGX_DRIVER_PROVIDER ?= ""
 BSP_SGX_DRIVER_VERSION ?= ""
 BSP_ROGUE_DRIVER_PROVIDER ?= ""
 BSP_ROGUE_DRIVER_VERSION ?= ""
-BSP_SGX_UMLIBS_VERSION ?= ""
-BSP_ROGUE_UMLIBS_VERSION ?= ""
 BSP_MESA_PVR_VERSION ?= ""

 # ==========
@@ -109,7 +104,7 @@ PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
 # GPU provider gets set in machine configs, as some machines are headless
 # Select default preferred versions here
 PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}"
-PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}"
+PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_DRIVER_VERSION}"
 PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}"
-PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}"
+PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_DRIVER_VERSION}"
 PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}"
--- a/meta-ti-bsp/conf/machine/include/ti-extras.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-extras.inc
@@ -1,4 +1,4 @@
 # Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'

 TI_EXTRAS ??= ""
-MACHINEOVERRIDES =. "${@ '${TI_EXTRAS}:' if d.getVar('TI_EXTRAS').startswith('tie-') else ''}"
+MACHINEOVERRIDES =. "${@ ':'.join('${TI_EXTRAS}'.strip().split()) + ':' if d.getVar('TI_EXTRAS') else ''}"
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -2,6 +2,7 @@
 # and platforms defined in meta-ti to allow BSP-level overrides.
 SOC_FAMILY = "ti-soc"
 require conf/machine/include/soc-family.inc
+require conf/machine/include/ti-extras.inc

 # kernel, initrd load addresses for the fitImage in all TI platforms
 UBOOT_ENTRYPOINT = "0x82000000"
@@ -27,3 +28,19 @@ 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
@@ -9,7 +9,6 @@ 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}"
-PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"

 KERNEL_IMAGETYPE = "zImage"

@@ -88,7 +87,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa"

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -9,7 +9,6 @@ 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}"
-PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"

 KERNEL_IMAGETYPE = "zImage"

@@ -60,7 +59,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"

 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa"

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
--- 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-dm-fw/ti-dm-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
@@ -29,7 +29,7 @@ PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
 PLAT_SFX:am62axx = "am62axx"
-PLAT_SFX:am62dxx = "am62axx"
+PLAT_SFX:am62dxx = "am62dxx"
 PLAT_SFX:am62lxx = "am62lxx"
 PLAT_SFX:am62pxx = "am62pxx"

@@ -87,7 +87,7 @@ do_deploy() {
 ALTERNATIVE:${PN}:am62xx  = "am62-main-r5f0_0-fw"
 ALTERNATIVE:${PN}:am62pxx  = "am62p-main-r5f0_0-fw"
 ALTERNATIVE:${PN}:am62axx = "am62a-main-r5f0_0-fw"
-ALTERNATIVE:${PN}:am62dxx = "am62a-main-r5f0_0-fw"
+ALTERNATIVE:${PN}:am62dxx = "am62d-main-r5f0_0-fw"
 ALTERNATIVE:${PN}:j721e   = "j7-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j7200   = "j7200-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j721s2  = "j721s2-mcu-r5f0_0-fw"
@@ -99,6 +99,7 @@ ALTERNATIVE:${PN}:j742s2  = "j742s2-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[am62p-main-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/am62p-main-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[am62a-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62a-main-r5f0_0-fw"
+ALTERNATIVE_LINK_NAME[am62d-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62d-main-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw"
@@ -110,6 +111,7 @@ ALTERNATIVE_LINK_NAME[j742s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j
 ALTERNATIVE_TARGET[am62-main-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[am62p-main-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[am62a-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
+ALTERNATIVE_TARGET[am62d-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw]     = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
--- 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.01.05"
+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 ?= "33b0116556a8a57e8e456a99e45e8736db7652f3"
+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 = "82f64bf11853cd5bcff9cd03c315415fe2cccf16"
+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/ti-extras.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
@@ -1,12 +1,10 @@
+#
+# Jailhouse settings
+#
+COMPATIBLE_MACHINE:tie-jailhouse = "am62xx|am62pxx|am62lxx"

-# This will have priority over generic uboot path
+BRANCH:tie-jailhouse:bsp-ti-6_12 = "ti-u-boot-2025.01-jailhouse"

-COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
+SRCREV_uboot:tie-jailhouse:bsp-ti-6_12 = "e718bbcec3ebf663c021839753034a224be4cc53"

-BRANCH = "ti-u-boot-2025.01"
-BRANCH:tie-jailhouse = "ti-u-boot-2025.01-jailhouse"
-
-SRCREV = "e718bbcec3ebf663c021839753034a224be4cc53"
-SRCREV:tie-jailhouse = "e718bbcec3ebf663c021839753034a224be4cc53"
-
-UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
+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-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.07"
+PV = "2025.10"

 UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"

-SRCREV = "e37de002fac3895e8d0b60ae2015e17bb33e2b5b"
+SRCREV_uboot = "e50b1e8715011def8aff1588081a2649a2c6cd47"
--- 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
@@ -8,4 +8,4 @@ BRANCH = "ti-u-boot-2024.04"

 SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"

-SRCREV = "29d0c23d67ee7b88e46fe1753cd020e2b04c2ef6"
+SRCREV_uboot = "29d0c23d67ee7b88e46fe1753cd020e2b04c2ef6"
--- 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 = "f3f8c664b3001e40cbdf46687732b2c37e1b6b33"
+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
@@ -25,7 +22,9 @@ BRANCH ?= "master"
 UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
 UBOOT_GIT_PROTOCOL ?= "https"
 UBOOT_GIT_BRANCH ?= "branch=${BRANCH}"
-SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH}"
+SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH};name=uboot"
+
+SRCREV_FORMAT = "uboot"

 PV:append = "+git"

@@ -61,14 +60,22 @@ PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
 PLAT_SFX:am62axx = "am62axx"
-PLAT_SFX:am62dxx = "am62axx"
+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"
@@ -141,43 +148,45 @@ uboot_compile_config_copy_binary:k3r5 () {
    type=$2
    binary=$3

-    if ! [ -L ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
-        ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
+    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}/${config}/${binary} ] && ! [ -f ${B}/${config}/${binary} ]; then
-        ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${binary}
+    if ! [ -L ${B}/${builddir}/${binary} ] && ! [ -f ${B}/${builddir}/${binary} ]; then
+        ln -s ${B}/${builddir}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${builddir}/${binary}
    fi
 }

 uboot_install_config:append () {
    if [ "x${SPL_UART_BINARY}" != "x" ]; then
-        install ${B}/${config}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}-${type}
+        install ${B}/${builddir}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}-${type}
        ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type}
        ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}
    fi
-    if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
-        install ${B}/${config}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${SPL_HS_MLO_BINARY} ]; then
+        install ${B}/${builddir}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type}
        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type}
        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}
    fi
-    if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
-        install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${UBOOT_HS_XLD_BINARY} ]; then
+        install ${B}/${builddir}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type}
        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type}
        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}
    fi
-    if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
-        install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${UBOOT_HS_MLO_BINARY} ]; then
+        install ${B}/${builddir}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}-${type}
        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}-${type}
        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}
    fi
-    if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
-        install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${UBOOT_HS_ISSW_BINARY} ]; then
+        install ${B}/${builddir}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}-${type}
        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}-${type}
        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}
    fi
-    if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
-        install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${UBOOT_HS_2ND_BINARY} ]; then
+        install ${B}/${builddir}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}-${type}
        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}-${type}
        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}
    fi
@@ -220,7 +229,7 @@ do_deploy:append:k3r5 () {
 }

 uboot_deploy_config:append:k3r5 () {
-	for f in ${B}/${config}/tiboot3-*.bin; do
+	for f in ${B}/${builddir}/tiboot3-*.bin; do
 		if [ -f "$f" ]; then
 			f_base=$(basename $f)
 			install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
@@ -228,7 +237,7 @@ uboot_deploy_config:append:k3r5 () {
 		fi
 	done

-	for f in ${B}/${config}/sysfw*.itb; do
+	for f in ${B}/${builddir}/sysfw*.itb; do
 		if [ -f "$f" ]; then
 			f_base=$(basename $f)
 			install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
@@ -238,7 +247,7 @@ uboot_deploy_config:append:k3r5 () {
 }

 uboot_deploy_config:append:am62lxx () {
-	for f in ${B}/${config}/tiboot3-*.bin; do
+	for f in ${B}/${builddir}/tiboot3-*.bin; do
 		if [ -f "$f" ]; then
 			f_base=$(basename $f)
 			install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
@@ -272,47 +281,47 @@ uboot_deploy:append:am62lxx () {
 uboot_deploy_config:append () {
    cd ${DEPLOYDIR}
    if [ "x${SPL_UART_BINARY}" != "x" ]; then
-        install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
+        install ${B}/${builddir}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
        rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
        ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
        ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
        ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
        ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
    fi
-    if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
-        install ${B}/${config}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${SPL_HS_MLO_BINARY} ]; then
+        install ${B}/${builddir}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type}
        rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type}
        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}
        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type}
        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}
    fi
-    if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
-        install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${UBOOT_HS_XLD_BINARY} ]; then
+        install ${B}/${builddir}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
        rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}-${type}
        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
    fi
-    if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
-        install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${UBOOT_HS_MLO_BINARY} ]; then
+        install ${B}/${builddir}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
        rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}-${type}
        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
    fi
-    if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
-        install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${UBOOT_HS_ISSW_BINARY} ]; then
+        install ${B}/${builddir}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
        rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}-${type}
        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
    fi
-    if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
-        install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
+    if [ -f ${B}/${builddir}/${UBOOT_HS_2ND_BINARY} ]; then
+        install ${B}/${builddir}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
        rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
--- 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-bsp/vpe-tests/vpe-tests_git.bb
+++ b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
@@ -1,28 +0,0 @@
-SUMMARY = "VPE test program"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=74d2f71d8898c54e3d1c9d0058c484aa"
-
-DEPENDS = "virtual/kernel vpdma-fw"
-
-PR = "r3"
-
-COMPATIBLE_MACHINE = "dra7xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "e3d8db1aa935775f9d196ad7428e0cd9864a36ca"
-BRANCH ?= "master"
-
-SRC_URI = "git://git.ti.com/git/vpe_tests/vpe_tests.git;protocol=https;branch=${BRANCH}"
-
-FLOATABI = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
-
-# The test application needs additional include headers from the kernel
-EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${FLOATABI}" KDIR="${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"'
-
-do_install() {
-    oe_runmake DESTDIR="${D}" install
-    rm -rf ${D}${nonarch_base_libdir}/firmware/vpdma-*.bin
-    rmdir -p ${D}${nonarch_base_libdir}/firmware || true
-}
--- 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 = "3de294db4f2cd75404f358768f4be8f8fa3132d7"
+SRCREV = "4e3a44c4b961831f2de80606942dd0d8eb508eca"

 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
--- a/Show More
+++ b/Show More