CI/CD Auto-Merger: cicd.scarthgap.202601111800

Updated the value(s) for: atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV_uboot linux-ti-staging-rt_6.12: SRCREV_ARM32 linux-ti-staging_6.12: SRCREV Changelogs: u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=df1fe238230433ba3e5b731356156e145aa90917..0b920f7b18a52ab88985f95fc7d9eec1048de9af linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=1379a8eb9786e78509f67ff8eac658bde5ddc66d..77ddb691ddc9195547ba150d373b95bd810fbde2 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=15b58b1dcd0e0a79d83740b81da1a1367f6f3f68..9d6ed8540b17d55e97355f77bb772da9d66e4f46 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
CI/CD Auto-Merger: cicd.scarthgap.202512240400
2026-01-12 01:20:20 +00:00 · 2026-01-11 18:00:20 -06:00 · 2025-12-24 04:00:16 -06:00 · 2025-12-18 18:48:51 -06:00 · 2025-12-18 18:43:41 -06:00 · 2025-12-18 18:42:38 -06:00
155 changed files with 1480 additions and 1717 deletions
--- a/check_yocto_rules.json
+++ b/check_yocto_rules.json
@@ -17,12 +17,30 @@
        "skip_files" : [
            "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/recipes-security/optee/optee-%.bbappend",
+            "meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.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-multimedia/ti-multimedia-udev/ti-multimedia-udev.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/beagleboard/gadget-init.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/beagle-x15.conf
+++ b/meta-beagle/conf/machine/beagle-x15.conf
@@ -5,21 +5,40 @@
 require conf/machine/include/am57xx.inc
 require conf/machine/include/beagle-bsp.inc

-DT_VENDOR_PREFIX = "ti/omap/"
-DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
-DT_VENDOR_PREFIX:bsp-bb_org-6_1 = ""
-
 KERNEL_DEVICETREE_PREFIX = " \
-${DT_VENDOR_PREFIX}am57xx-beagle-x15 \
-${DT_VENDOR_PREFIX}am57xx-idk-lcd \
+    ti/omap/am57xx-beagle-x15 \
+    ti/omap/am57xx-idk-lcd \
 "

-KERNEL_DEVICETREE = " \
-${DT_VENDOR_PREFIX}am57xx-beagle-x15.dtb \
-${DT_VENDOR_PREFIX}am57xx-beagle-x15-revb1.dtb \
-${DT_VENDOR_PREFIX}am57xx-beagle-x15-revc.dtb \
-${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2045.dtbo \
-${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2587.dtbo \
+KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
+ti/omap/am571x-idk.dtb \
+ti/omap/am571x-idk-touchscreen.dtbo \
+ti/omap/am5729-beagleboneai.dtb \
+ti/omap/am572x-idk.dtb \
+ti/omap/am572x-idk-touchscreen.dtbo \
+ti/omap/am574x-idk.dtb \
+ti/omap/am57xx-beagle-x15.dtb \
+ti/omap/am57xx-beagle-x15-revb1.dtb \
+ti/omap/am57xx-beagle-x15-revc.dtb \
+ti/omap/am57xx-evm.dtbo \
+ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \
+ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \
+"
+
+KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
+ti/omap/am571x-idk.dtb \
+ti/omap/am571x-idk-touchscreen.dtbo \
+ti/omap/am5729-beagleboneai.dtb \
+ti/omap/am572x-idk.dtb \
+ti/omap/am572x-idk-touchscreen.dtbo \
+ti/omap/am574x-idk.dtb \
+ti/omap/am57xx-beagle-x15.dtb \
+ti/omap/am57xx-beagle-x15-revb1.dtb \
+ti/omap/am57xx-beagle-x15-revc.dtb \
+ti/omap/am57xx-evm.dtbo \
+ti/omap/am57xx-evm-ov10635.dtbo \
+ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \
+ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
@@ -16,9 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"

 UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"
-
-UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_r5_defconfig"
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"
-
-UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_r5_defconfig"
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_r5.config"
--- a/meta-beagle/conf/machine/beaglebone-ai64.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64.conf
@@ -5,50 +5,91 @@
 require conf/machine/include/j721e.inc
 require conf/machine/include/beagle-bsp.inc

-IMAGE_SR1_1_HS_FS_FILES = ""
-IMAGE_SR1_1_HS_SE_FILES = ""
-IMAGE_SR2_HS_FS_FILES = ""
-IMAGE_SR2_HS_SE_FILES = ""
-
 UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig"

-UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_a72_config"
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
-
-UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config"
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config"
-
 SPL_BINARY = "tispl.bin_unsigned"

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-j721e \
 "

-KERNEL_DEVICETREE = " \
-ti/k3-j721e-beagleboneai64.dtb \
-ti/k3-j721e-common-proc-board.dtb \
-ti/k3-j721e-evm-gesi-exp-board.dtbo \
-ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
-ti/k3-j721e-sk.dtb \
-"
-
-KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
+KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
+ti/k3-j721e-beagleboneai64-BBORG_MOTOR.dtbo \
 ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
+ti/k3-j721e-beagleboneai64.dtb \
+ti/k3-j721e-beagleboneai64-microtips-mf070zima-lcd3.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13-p8_19.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_19.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14-p9_16.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_16.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm4-p9_25.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0-no-miso.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi2-cs0.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi3-cs0-no-miso.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0-cs1.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi6-cs1-no-miso.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi7-cs0.dtbo \
+ti/k3-j721e-common-proc-board.dtb \
 ti/k3-j721e-common-proc-board-infotainment.dtbo \
 ti/k3-j721e-evm-csi2-ov5640.dtbo \
+ti/k3-j721e-evm-ethfw.dtbo \
 ti/k3-j721e-evm-fusion.dtbo \
+ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-ina2xx.dtbo \
 ti/k3-j721e-evm-pcie0-ep.dtbo \
-ti/k3-j721e-evm-virt-mac-client.dtbo \
+ti/k3-j721e-evm-pcie1-ep.dtbo \
+ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
+ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
 ti/k3-j721e-sk-csi2-ov5640.dtbo \
-ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
-ti/k3-j721e-sk-fusion.dtbo \
+ti/k3-j721e-sk.dtb \
+ti/k3-j721e-sk-fpdlink-fusion.dtbo \
 ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
 "

+KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
+ti/k3-j721e-beagleboneai64-BBORG_MOTOR.dtbo \
+ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
+ti/k3-j721e-beagleboneai64.dtb \
+ti/k3-j721e-beagleboneai64-microtips-mf070zima-lcd3.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13-p8_19.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_19.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14-p9_16.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_16.dtbo \
+ti/k3-j721e-beagleboneai64-pwm-epwm4-p9_25.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0-no-miso.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi2-cs0.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi3-cs0-no-miso.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0-cs1.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi6-cs1-no-miso.dtbo \
+ti/k3-j721e-beagleboneai64-spi-mcspi7-cs0.dtbo \
+ti/k3-j721e-common-proc-board.dtb \
+ti/k3-j721e-common-proc-board-infotainment.dtbo \
+ti/k3-j721e-evm-csi2-ov5640.dtbo \
+ti/k3-j721e-evm-ethfw.dtbo \
+ti/k3-j721e-evm-fusion.dtbo \
+ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-pcie0-ep.dtbo \
+ti/k3-j721e-evm-pcie1-ep.dtbo \
+ti/k3-j721e-evm-pcie-ntb.dtbo \
+ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
+ti/k3-j721e-evm-ub954.dtbo \
+ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
+ti/k3-j721e-sk-csi2-ov5640.dtbo \
+ti/k3-j721e-sk.dtb \
+ti/k3-j721e-sk-fpdlink-fusion.dtbo \
+"
+
 MACHINE_GUI_CLASS = "bigscreen"

 # TI has moved a driver out of its kernel tree and into an out of tree module.
 # We need to not include that for older kernels since the module is still in
 # the kernel.
 TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = ""
-TI_VXE_VXD_DRIVER:bsp-bb_org-6_1 = ""
--- a/meta-beagle/conf/machine/beaglebone.conf
+++ b/meta-beagle/conf/machine/beaglebone.conf
@@ -5,27 +5,55 @@
 require conf/machine/include/ti33x.inc
 require conf/machine/include/beagle-bsp.inc

-DT_VENDOR_PREFIX = "ti/omap/"
-DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
-DT_VENDOR_PREFIX:bsp-bb_org-6_1 = ""
-
 KERNEL_DEVICETREE_PREFIX = " \
-${DT_VENDOR_PREFIX}am335x-bone \
-${DT_VENDOR_PREFIX}am335x-pocketbeagle \
-${DT_VENDOR_PREFIX}am335x-sancloud-bbe \
+    ti/omap/am335x-bone \
+    ti/omap/am335x-pocketbeagle \
+    ti/omap/am335x-sancloud-bbe \
 "

-KERNEL_DEVICETREE = " \
-${DT_VENDOR_PREFIX}am335x-bone.dtb \
-${DT_VENDOR_PREFIX}am335x-boneblack.dtb \
-${DT_VENDOR_PREFIX}am335x-boneblack-wireless.dtb \
-${DT_VENDOR_PREFIX}am335x-boneblue.dtb \
-${DT_VENDOR_PREFIX}am335x-bonegreen.dtb \
-${DT_VENDOR_PREFIX}am335x-bonegreen-wireless.dtb \
-${DT_VENDOR_PREFIX}am335x-pocketbeagle.dtb \
-${DT_VENDOR_PREFIX}am335x-sancloud-bbe.dtb \
-${DT_VENDOR_PREFIX}am335x-sancloud-bbe-extended-wifi.dtb \
-${DT_VENDOR_PREFIX}am335x-sancloud-bbe-lite.dtb \
+KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
+ti/omap/am335x-boneblack.dtb \
+ti/omap/am335x-boneblack-revd.dtb \
+ti/omap/am335x-boneblack-uboot.dtb \
+ti/omap/am335x-boneblack-uboot-univ.dtb \
+ti/omap/am335x-boneblack-wireless.dtb \
+ti/omap/am335x-boneblue.dtb \
+ti/omap/am335x-bone.dtb \
+ti/omap/am335x-bonegreen.dtb \
+ti/omap/am335x-bonegreen-gateway.dtb \
+ti/omap/am335x-bonegreen-wireless.dtb \
+ti/omap/am335x-bonegreen-wireless-uboot-univ.dtb \
+ti/omap/am335x-evm.dtb \
+ti/omap/am335x-evmsk.dtb \
+ti/omap/am335x-icev2.dtb \
+ti/omap/am335x-osd3358-sm-red.dtb \
+ti/omap/am335x-pocketbeagle.dtb \
+ti/omap/am335x-sancloud-bbe.dtb \
+ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \
+ti/omap/am335x-sancloud-bbe-lite.dtb \
+"
+
+KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
+ti/omap/am335x-boneblack.dtb \
+ti/omap/am335x-boneblack-revd.dtb \
+ti/omap/am335x-boneblack-uboot.dtb \
+ti/omap/am335x-boneblack-uboot-univ.dtb \
+ti/omap/am335x-boneblack-wireless.dtb \
+ti/omap/am335x-boneblue.dtb \
+ti/omap/am335x-bone.dtb \
+ti/omap/am335x-bonegreen.dtb \
+ti/omap/am335x-bonegreen-eco.dtb \
+ti/omap/am335x-bonegreen-gateway.dtb \
+ti/omap/am335x-bonegreen-wireless.dtb \
+ti/omap/am335x-bonegreen-wireless-uboot-univ.dtb \
+ti/omap/am335x-evm.dtb \
+ti/omap/am335x-evmsk.dtb \
+ti/omap/am335x-icev2.dtb \
+ti/omap/am335x-osd3358-sm-red.dtb \
+ti/omap/am335x-pocketbeagle.dtb \
+ti/omap/am335x-sancloud-bbe.dtb \
+ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \
+ti/omap/am335x-sancloud-bbe-lite.dtb \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-beagle/conf/machine/beagleplay-k3r5.conf
+++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf
@@ -5,7 +5,3 @@
 require conf/machine/beagleplay-ti-k3r5.conf

 require conf/machine/include/beagle-bsp.inc
-
-UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config"
--- a/meta-beagle/conf/machine/beagleplay.conf
+++ b/meta-beagle/conf/machine/beagleplay.conf
@@ -6,48 +6,7 @@ require conf/machine/beagleplay-ti.conf

 require conf/machine/include/beagle-bsp.inc

-UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config"
-
-KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
-ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-beaglemod.dtb \
-ti/k3-am625-beaglemod-audio.dtbo \
-ti/k3-am625-beaglemod-can0.dtbo \
-ti/k3-am625-beaglemod-can1.dtbo \
-ti/k3-am625-beaglemod-csi0-ov5640.dtbo \
-ti/k3-am625-beaglemod-eeprom.dtbo \
-ti/k3-am625-beaglemod-eth.dtbo \
-ti/k3-am625-beaglemod-hdmi.dtbo \
-ti/k3-am625-beaglemod-io-expand.dtbo \
-ti/k3-am625-beaglemod-lt-lcd185.dtbo \
-ti/k3-am625-beaglemod-ospi-flash.dtbo \
-ti/k3-am625-beaglemod-rs485-1.dtbo \
-ti/k3-am625-beaglemod-rs485-2.dtbo \
-ti/k3-am625-beaglemod-rtc.dtbo \
-ti/k3-am625-beaglemod-wl1835.dtbo \
-ti/k3-am625-sk-dmtimer-pwm.dtbo \
-ti/k3-am625-sk-ecap-capture.dtbo \
-ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk-mcspi-loopback.dtbo \
-ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
-ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
-ti/k3-am625-sk-pwm.dtbo \
-ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
-ti/k3-am62x-sk-csi2-imx219.dtbo \
-ti/k3-am62x-sk-csi2-ov5640.dtbo \
-ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
-ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
-ti/k3-am62x-sk-eqep.dtbo \
-ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \
-ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
-ti/k3-am62x-sk-mcan.dtbo \
-"
-
-KERNEL_DEVICETREE:append:bsp-bb_org-6_6 = " \
+KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
 ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
 ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
 ti/k3-am625-beagleplay.dtb \
@@ -73,3 +32,31 @@ ti/k3-am62x-sk-mcan.dtbo \
 ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \
 ti/k3-am62x-sk-pwm.dtbo \
 "
+
+KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
+ti/k3-am625-beagleplay-bcfserial-no-firmware.dtbo \
+ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+ti/k3-am625-beagleplay.dtb \
+ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-sk.dtb \
+ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-sk-m2-cc3351.dtbo \
+ti/k3-am625-sk-mcspi-loopback.dtbo \
+ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
+ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
+ti/k3-am62x-sk-csi2-imx219.dtbo \
+ti/k3-am62x-sk-csi2-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
+ti/k3-am62x-sk-dmtimer-pwm.dtbo \
+ti/k3-am62x-sk-ecap-capture.dtbo \
+ti/k3-am62x-sk-eqep.dtbo \
+ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \
+ti/k3-am62x-sk-hdmi-audio.dtbo \
+ti/k3-am62x-sk-lpm-io-ddr-wkup-sources.dtbo \
+ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
+ti/k3-am62x-sk-mcan.dtbo \
+ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \
+ti/k3-am62x-sk-pwm.dtbo \
+"
--- a/meta-beagle/conf/machine/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -9,7 +9,7 @@ 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_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
+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,25 +5,104 @@
 require conf/machine/include/j722s.inc
 require conf/machine/include/beagle-bsp.inc

-UBOOT_MACHINE = "j722s_evm_a53_config"
-UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_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 \
    ti/k3-j722s \
 "

-KERNEL_DEVICETREE = ""
-
-KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
-ti/k3-j722s-evm.dtb \
+KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
 ti/k3-am67a-beagley-ai.dtb \
+ti/k3-am67a-beagley-ai-i2c1-400000.dtbo \
+ti/k3-am67a-beagley-ai-i2c1-ads1115.dtbo \
+ti/k3-am67a-beagley-ai-i2c1-rtc-rv3028.dtbo \
+ti/k3-am67a-beagley-ai-i2c1-ssd1306.dtbo \
+ti/k3-am67a-beagley-ai-mikroe-eth.dtbo \
+ti/k3-am67a-beagley-ai-mikroe-microsd.dtbo \
+ti/k3-am67a-beagley-ai-pps-gpio18.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap0-gpio12.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap1-gpio16.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap1-gpio21.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap2-gpio17.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap2-gpio18.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio12.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio14.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio12.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio14.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio12.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio14.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio13.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio20.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio13.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio20.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio13.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio20.dtbo \
+ti/k3-am67a-beagley-ai-spi0-1cs.dtbo \
+ti/k3-am67a-beagley-ai-spi0-2cs.dtbo \
+ti/k3-am67a-beagley-ai-spidev0.dtbo \
+ti/k3-am67a-beagley-ai-uart-ttyama0.dtbo \
+ti/k3-j722s-evm-csi2-ov5640.dtbo \
+ti/k3-j722s-evm-csi2-quad-rpi-cam-imx219.dtbo \
+ti/k3-j722s-evm-csi2-quad-tevi-ov5640.dtbo \
+ti/k3-j722s-evm-dsi-rpi-7inch-panel.dtbo \
+ti/k3-j722s-evm.dtb \
+ti/k3-j722s-evm-fpdlink-fusion.dtbo \
+ti/k3-j722s-evm-microtips-mf101hie-panel.dtbo \
+ti/k3-j722s-evm-pwm.dtbo \
+ti/k3-j722s-evm-v3link-fusion.dtbo \
 "

-KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
-ti/k3-j722s-evm.dtb \
+KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
 ti/k3-am67a-beagley-ai.dtb \
+ti/k3-am67a-beagley-ai-i2c1-400000.dtbo \
+ti/k3-am67a-beagley-ai-i2c1-ads1115.dtbo \
+ti/k3-am67a-beagley-ai-i2c1-rtc-rv3028.dtbo \
+ti/k3-am67a-beagley-ai-i2c1-ssd1306.dtbo \
+ti/k3-am67a-beagley-ai-mikroe-eth.dtbo \
+ti/k3-am67a-beagley-ai-mikroe-microsd.dtbo \
+ti/k3-am67a-beagley-ai-pps-gpio18.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap0-gpio12.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap1-gpio16.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap1-gpio21.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap2-gpio17.dtbo \
+ti/k3-am67a-beagley-ai-pwm-ecap2-gpio18.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio12.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio14.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio12.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio14.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio12.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio14.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio13.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio20.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio13.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio20.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio13.dtbo \
+ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio20.dtbo \
+ti/k3-am67a-beagley-ai-spi0-1cs.dtbo \
+ti/k3-am67a-beagley-ai-spi0-2cs.dtbo \
+ti/k3-am67a-beagley-ai-spidev0.dtbo \
+ti/k3-am67a-beagley-ai-uart-ttyama0.dtbo \
+ti/k3-j722s-evm-csi2-quad-rpi-cam-imx219.dtbo \
+ti/k3-j722s-evm-csi2-quad-tevi-ov5640.dtbo \
+ti/k3-j722s-evm-dsi-rpi-7inch-panel.dtbo \
+ti/k3-j722s-evm.dtb \
+ti/k3-j722s-evm-fpdlink-fusion.dtbo \
+ti/k3-j722s-evm-fpdlink-iv-fusion.dtbo \
+ti/k3-j722s-evm-microtips-mf101hie-panel.dtbo \
+ti/k3-j722s-evm-pwm.dtbo \
+ti/k3-j722s-evm-v3link-fusion.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-beagle/conf/machine/include/beagle-bsp.inc
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -4,31 +4,30 @@
 # Default is bb_org-6_12, but can override with any of the existing options
 TI_PREFERRED_BSP ?= "bb_org-6_12"

-# ==========
+# ===========
 # bb_org-6_12
-# BeagleBoard.org kernel 6.12, Upstream u-boot 2025.04
+# BeagleBoard.org kernel 6.12, u-boot 2025.04
 # based on TI staging trees with extra Beagle-specific features
 # but may not be up-to-date with TI version
-# ==========
+# ===========
 BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org"
 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 = ""

 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.6
+# GC320 support requires out-of-tree drivers not yet available in bb.org 6.12
 MACHINE_FEATURES:remove:bsp-bb_org-6_12 = "gc320"

 # ==========
 # bb_org-6_6
-# BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07
+# BeagleBoard.org kernel 6.6, u-boot 2024.10
 # based on TI staging trees with extra Beagle-specific features
 # but may not be up-to-date with TI version
 # ==========
@@ -36,36 +35,13 @@ BSP_KERNEL_PROVIDER:bsp-bb_org-6_6 = "linux-bb.org"
 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 = ""

 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
 MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320"
-
-# ==========
-# bb_org-6_1
-# BeagleBoard.org kernel 6.1, u-boot 2023.04
-# based on TI staging trees with extra Beagle-specific features
-# but may not be up-to-date with TI version
-# ==========
-BSP_KERNEL_PROVIDER:bsp-bb_org-6_1 = "linux-bb.org"
-BSP_KERNEL_VERSION:bsp-bb_org-6_1 = "6.1.%"
-BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_1 = "u-boot-bb.org"
-BSP_BOOTLOADER_VERSION:bsp-bb_org-6_1 = "2023.%"
-
-BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_1 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_1 = "1.17%"
-BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%"
-BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%"
-
-# GC320 support requires out-of-tree drivers not yet available in bb.org 6.1
-MACHINE_FEATURES:remove:bsp-bb_org-6_1 = "gc320"
--- a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
+++ b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
@@ -9,4 +9,4 @@ 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,13 +16,43 @@ 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 \
+    ti/k3-am62-pocket \
 "

 KERNEL_DEVICETREE = " \
-    ti/k3-am6232-pocketbeagle2.dtb \
-    ti/k3-am6232-pocketbeagle2-techlab-cape.dtbo \
+ti/k3-am6232-pocketbeagle2.dtb \
+ti/k3-am6232-pocketbeagle2-techlab-cape.dtbo \
+ti/k3-am625-beagleplay-bcfserial-no-firmware.dtbo \
+ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+ti/k3-am625-beagleplay.dtb \
+ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-sk.dtb \
+ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-sk-m2-cc3351.dtbo \
+ti/k3-am625-sk-mcspi-loopback.dtbo \
+ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
+ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
+ti/k3-am62-pocketbeagle2-ardupilot-cape.dtbo \
+ti/k3-am62-pocketbeagle2.dtb \
+ti/k3-am62-pocketbeagle2-leds-off.dtbo \
+ti/k3-am62-pocketbeagle2-techlab-cape.dtbo \
+ti/k3-am62x-sk-csi2-imx219.dtbo \
+ti/k3-am62x-sk-csi2-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
+ti/k3-am62x-sk-dmtimer-pwm.dtbo \
+ti/k3-am62x-sk-ecap-capture.dtbo \
+ti/k3-am62x-sk-eqep.dtbo \
+ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \
+ti/k3-am62x-sk-hdmi-audio.dtbo \
+ti/k3-am62x-sk-lpm-io-ddr-wkup-sources.dtbo \
+ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
+ti/k3-am62x-sk-mcan.dtbo \
+ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \
+ti/k3-am62x-sk-pwm.dtbo \
 "
--- 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_2023.04.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb
@@ -1,22 +0,0 @@
-require recipes-bsp/u-boot/u-boot-ti.inc
-
-SUMMARY = "BeagleBoard.org U-Boot"
-
-COMPATIBLE_MACHINE = "beagle.*"
-
-PV = "2023.04"
-
-UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
-UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2023.04-ti-09.01.00.008"
-SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb"
-
-BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay"
-BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay"
-SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
-SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
-
-BRANCH:beagley-ai = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production"
-BRANCH:beagley-ai-k3r5 = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production"
-SRCREV:beagley-ai = "93735daa6fe024304934d5a5e93ab05a06abf1a8"
-SRCREV:beagley-ai-k3r5 = "93735daa6fe024304934d5a5e93ab05a06abf1a8"
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
@@ -1,26 +0,0 @@
-require recipes-bsp/u-boot/u-boot-ti.inc
-
-SUMMARY = "BeagleBoard.org U-Boot"
-
-COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
-
-PV = "2025.04"
-
-UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
-UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2025.04-Beagle"
-SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
-
-BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"
-BRANCH:beagley-ai-k3r5 = "v2025.04-rc3-BeagleY-AI"
-SRCREV:beagley-ai = "cc376f9faef201670c7bb1734f42f5475c73f85d"
-SRCREV:beagley-ai-k3r5 = "cc376f9faef201670c7bb1734f42f5475c73f85d"
-
-SRC_URI:append:beagley-ai = " file://bootcmd-ti-mmc.cfg"
-
-BRANCH:pocketbeagle2 = "v2025.04-pocketbeagle2"
-BRANCH:pocketbeagle2-k3r5 = "v2025.04-pocketbeagle2"
-SRCREV:pocketbeagle2 = "f7439516453b7728bda496ff6496ef6f1411aae3"
-SRCREV:pocketbeagle2-k3r5 = "f7439516453b7728bda496ff6496ef6f1411aae3"
-
-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.1/defconfig
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig
@@ -1 +0,0 @@
-use-kernel-config=bb.org_defconfig
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb
@@ -1,68 +0,0 @@
-# Look in the generic major.minor directory for files
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
-
-SECTION = "kernel"
-SUMMARY = "BeagleBoard.org Linux kernel"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-COMPATIBLE_MACHINE = "beagle.*"
-
-inherit kernel
-
-require recipes-kernel/linux/setup-defconfig.inc
-require recipes-kernel/linux/ti-kernel.inc
-
-DEPENDS += "gmp-native libmpc-native"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
-
-# Extra DT overlays/capes
-KERNEL_DEVICETREE:append:armv7a = " \
-AM335X-PRU-UIO-00A0.dtbo \
-BB-ADC-00A0.dtbo \
-BB-BBBW-WL1835-00A0.dtbo \
-BB-BBGG-WL1835-00A0.dtbo \
-BB-BBGW-WL1835-00A0.dtbo \
-BB-BONE-4D5R-01-00A1.dtbo \
-BB-BONE-eMMC1-01-00A0.dtbo \
-BB-BONE-LCD4-01-00A1.dtbo \
-BB-BONE-NH7C-01-A0.dtbo \
-BB-CAPE-DISP-CT4-00A0.dtbo \
-BB-HDMI-TDA998x-00A0.dtbo \
-BB-I2C1-MCP7940X-00A0.dtbo \
-BB-I2C1-RTC-DS3231.dtbo \
-BB-I2C1-RTC-PCF8563.dtbo \
-BB-I2C2-BME680.dtbo \
-BB-I2C2-MPU6050.dtbo \
-BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
-BB-NHDMI-TDA998x-00A0.dtbo \
-BBORG_COMMS-00A2.dtbo \
-BBORG_FAN-A000.dtbo \
-BBORG_RELAY-00A2.dtbo \
-BB-SPIDEV0-00A0.dtbo \
-BB-SPIDEV1-00A0.dtbo \
-BB-UART1-00A0.dtbo \
-BB-UART2-00A0.dtbo \
-BB-UART4-00A0.dtbo \
-BB-W1-P9.12-00A0.dtbo \
-BONE-ADC.dtbo \
-M-BB-BBG-00A0.dtbo \
-M-BB-BBGG-00A0.dtbo \
-PB-MIKROBUS-0.dtbo \
-PB-MIKROBUS-1.dtbo \
-"
-
-S = "${WORKDIR}/git"
-
-# 6.1.83 version for 32-bit
-SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792"
-PV:armv7a = "6.1.83+git"
-BRANCH:armv7a = "v6.1.83-ti-r35"
-
-# 6.1.83 version for 64-bit
-SRCREV:aarch64 = "135558243d5a98ed39812b797d2ba6295ef3b86a"
-PV:aarch64 = "6.1.83+git"
-BRANCH:aarch64 = "v6.1.83-ti-arm64-r64"
-
-KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
@@ -19,50 +19,49 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"

 # Extra DT overlays/capes
 KERNEL_DEVICETREE:append:armv7a = " \
-${DT_VENDOR_PREFIX}AM335X-PRU-UIO-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-ADC-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BBBW-WL1835-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BBGG-WL1835-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BBGW-WL1835-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BONE-4D5R-01-00A1.dtbo \
-${DT_VENDOR_PREFIX}BB-BONE-eMMC1-01-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BONE-LCD4-01-00A1.dtbo \
-${DT_VENDOR_PREFIX}BB-BONE-NH7C-01-A0.dtbo \
-${DT_VENDOR_PREFIX}BB-CAPE-DISP-CT4-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-HDMI-TDA998x-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C1-MCP7940X-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C1-RTC-DS3231.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C1-RTC-PCF8563.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C2-BME680.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C2-MPU6050.dtbo \
-${DT_VENDOR_PREFIX}BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-NHDMI-TDA998x-00A0.dtbo \
-${DT_VENDOR_PREFIX}BBORG_COMMS-00A2.dtbo \
-${DT_VENDOR_PREFIX}BBORG_FAN-A000.dtbo \
-${DT_VENDOR_PREFIX}BBORG_RELAY-00A2.dtbo \
-${DT_VENDOR_PREFIX}BB-SPIDEV0-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-SPIDEV1-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-UART1-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-UART2-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-UART4-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-W1-P9.12-00A0.dtbo \
-${DT_VENDOR_PREFIX}BONE-ADC.dtbo \
-${DT_VENDOR_PREFIX}M-BB-BBG-00A0.dtbo \
-${DT_VENDOR_PREFIX}M-BB-BBGG-00A0.dtbo \
-${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \
-${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \
+    ti/omap/BB-ADC-00A0.dtbo \
+    ti/omap/BB-BBBW-WL1835-00A0.dtbo \
+    ti/omap/BB-BBGG-WL1835-00A0.dtbo \
+    ti/omap/BB-BBGW-WL1835-00A0.dtbo \
+    ti/omap/BB-BONE-4D5R-01-00A1.dtbo \
+    ti/omap/BB-BONE-eMMC1-01-00A0.dtbo \
+    ti/omap/BB-BONE-LCD4-01-00A1.dtbo \
+    ti/omap/BB-BONE-NH7C-01-A0.dtbo \
+    ti/omap/BB-CAPE-DISP-CT4-00A0.dtbo \
+    ti/omap/BB-HDMI-TDA998x-00A0.dtbo \
+    ti/omap/BB-I2C1-MCP7940X-00A0.dtbo \
+    ti/omap/BB-I2C1-RTC-DS3231.dtbo \
+    ti/omap/BB-I2C1-RTC-PCF8563.dtbo \
+    ti/omap/BB-I2C2-BME680.dtbo \
+    ti/omap/BB-I2C2-MPU6050.dtbo \
+    ti/omap/BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
+    ti/omap/BB-NHDMI-TDA998x-00A0.dtbo \
+    ti/omap/BBORG_COMMS-00A2.dtbo \
+    ti/omap/BBORG_FAN-A000.dtbo \
+    ti/omap/BBORG_RELAY-00A2.dtbo \
+    ti/omap/BB-SPIDEV0-00A0.dtbo \
+    ti/omap/BB-SPIDEV1-00A0.dtbo \
+    ti/omap/BB-UART1-00A0.dtbo \
+    ti/omap/BB-UART2-00A0.dtbo \
+    ti/omap/BB-UART4-00A0.dtbo \
+    ti/omap/BB-W1-P9.12-00A0.dtbo \
+    ti/omap/BONE-ADC.dtbo \
+    ti/omap/M-BB-BBG-00A0.dtbo \
+    ti/omap/M-BB-BBGG-00A0.dtbo \
+    ti/omap/PB-MIKROBUS-0.dtbo \
+    ti/omap/PB-MIKROBUS-1.dtbo \
 "

 S = "${WORKDIR}/git"

-# 6.12.22 version for 32-bit
-SRCREV:armv7a = "d7f560ef48a867b94959f040b4c3c57053f4e32d"
-PV:armv7a = "6.12.22+git"
-BRANCH:armv7a = "v6.12.22-ti-arm32-r10"
+# 6.12.34 version for 32-bit
+SRCREV:armv7a = "9e419b26243bd7efcd103ae0f6456f828592b34b"
+PV:armv7a = "6.12.34+git"
+BRANCH:armv7a = "v6.12.34-ti-arm32-r12"

-# 6.12.22 version for 64-bit
-SRCREV:aarch64 = "9e43fd19ece3affb9406e87ec3df733b91b77a4f"
-PV:aarch64 = "6.12.22+git"
-BRANCH:aarch64 = "v6.12.22-ti-arm64-r35"
+# 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
@@ -19,51 +19,51 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"

 # Extra DT overlays/capes
 KERNEL_DEVICETREE:append:armv7a = " \
-${DT_VENDOR_PREFIX}AM335X-PRU-UIO-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-ADC-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BBBW-WL1835-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BBGG-WL1835-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BBGW-WL1835-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BONE-4D5R-01-00A1.dtbo \
-${DT_VENDOR_PREFIX}BB-BONE-eMMC1-01-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-BONE-LCD4-01-00A1.dtbo \
-${DT_VENDOR_PREFIX}BB-BONE-NH7C-01-A0.dtbo \
-${DT_VENDOR_PREFIX}BB-CAPE-DISP-CT4-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-HDMI-TDA998x-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C1-MCP7940X-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C1-RTC-DS3231.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C1-RTC-PCF8563.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C2-BME680.dtbo \
-${DT_VENDOR_PREFIX}BB-I2C2-MPU6050.dtbo \
-${DT_VENDOR_PREFIX}BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-NHDMI-TDA998x-00A0.dtbo \
-${DT_VENDOR_PREFIX}BBORG_COMMS-00A2.dtbo \
-${DT_VENDOR_PREFIX}BBORG_FAN-A000.dtbo \
-${DT_VENDOR_PREFIX}BBORG_RELAY-00A2.dtbo \
-${DT_VENDOR_PREFIX}BB-SPIDEV0-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-SPIDEV1-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-UART1-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-UART2-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-UART4-00A0.dtbo \
-${DT_VENDOR_PREFIX}BB-W1-P9.12-00A0.dtbo \
-${DT_VENDOR_PREFIX}BONE-ADC.dtbo \
-${DT_VENDOR_PREFIX}M-BB-BBG-00A0.dtbo \
-${DT_VENDOR_PREFIX}M-BB-BBGG-00A0.dtbo \
-${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \
-${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \
+    ti/omap/AM335X-PRU-UIO-00A0.dtbo \
+    ti/omap/BB-ADC-00A0.dtbo \
+    ti/omap/BB-BBBW-WL1835-00A0.dtbo \
+    ti/omap/BB-BBGG-WL1835-00A0.dtbo \
+    ti/omap/BB-BBGW-WL1835-00A0.dtbo \
+    ti/omap/BB-BONE-4D5R-01-00A1.dtbo \
+    ti/omap/BB-BONE-eMMC1-01-00A0.dtbo \
+    ti/omap/BB-BONE-LCD4-01-00A1.dtbo \
+    ti/omap/BB-BONE-NH7C-01-A0.dtbo \
+    ti/omap/BB-CAPE-DISP-CT4-00A0.dtbo \
+    ti/omap/BB-HDMI-TDA998x-00A0.dtbo \
+    ti/omap/BB-I2C1-MCP7940X-00A0.dtbo \
+    ti/omap/BB-I2C1-RTC-DS3231.dtbo \
+    ti/omap/BB-I2C1-RTC-PCF8563.dtbo \
+    ti/omap/BB-I2C2-BME680.dtbo \
+    ti/omap/BB-I2C2-MPU6050.dtbo \
+    ti/omap/BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
+    ti/omap/BB-NHDMI-TDA998x-00A0.dtbo \
+    ti/omap/BBORG_COMMS-00A2.dtbo \
+    ti/omap/BBORG_FAN-A000.dtbo \
+    ti/omap/BBORG_RELAY-00A2.dtbo \
+    ti/omap/BB-SPIDEV0-00A0.dtbo \
+    ti/omap/BB-SPIDEV1-00A0.dtbo \
+    ti/omap/BB-UART1-00A0.dtbo \
+    ti/omap/BB-UART2-00A0.dtbo \
+    ti/omap/BB-UART4-00A0.dtbo \
+    ti/omap/BB-W1-P9.12-00A0.dtbo \
+    ti/omap/BONE-ADC.dtbo \
+    ti/omap/M-BB-BBG-00A0.dtbo \
+    ti/omap/M-BB-BBGG-00A0.dtbo \
+    ti/omap/PB-MIKROBUS-0.dtbo \
+    ti/omap/PB-MIKROBUS-1.dtbo \
 "

 S = "${WORKDIR}/git"

 # 6.6.58 version for 32-bit
-SRCREV:armv7a = "0d043a88f69f48789e43526d7a807ab744708071"
+SRCREV:armv7a = "3d519995234675748a38b1e3bc087baa03e3ac25"
 PV:armv7a = "6.6.58+git"
-BRANCH:armv7a = "v6.6.58-ti-arm32-r10"
+BRANCH:armv7a = "v6.6.58-ti-arm32-r12"

 # 6.6.58 version for 64-bit
-SRCREV:aarch64 = "0987ef737c9812374607475972f0868b8fecbbf7"
+SRCREV:aarch64 = "1de9481cd5749807550148086aea959295bd11db"
 PV:aarch64 = "6.6.58+git"
-BRANCH:aarch64 = "v6.6.58-ti-arm64-r23"
+BRANCH:aarch64 = "v6.6.58-ti-arm64-r30"

 KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"

--- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc
@@ -1,4 +1,4 @@
-
+# Generate list of DTBs from the kernel source
 def get_dtbs_from_kernel(dts_dir, dts_prefix):
    import os
    import glob
@@ -18,6 +18,8 @@ def get_dtbs_from_kernel(dts_dir, dts_prefix):
            matches.append(filename)
    return ' '.join(matches)

+# Generate list of "merged" DTBs from the kernel source
+# It is TI custom feature to merge DTB overlays into a single DTB
 def get_merge_dtbs_from_kernel(dts_dir, dts_pattern):
    import os
    matches = []
@@ -33,10 +35,9 @@ def get_merge_dtbs_from_kernel(dts_dir, dts_pattern):
                    matches.append(pattern)
    return ' '.join(matches)

-KERNEL_DEVICETREE_DTBMERGE ?= ""
-
 KERNEL_DEVICETREE = " \
-    ${@get_dtbs_from_kernel('${S}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_PREFIX}')} \
-    ${@get_merge_dtbs_from_kernel('${S}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_DTBMERGE}')} \
+    ${@get_dtbs_from_kernel('${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_PREFIX}')} \
+    ${@get_merge_dtbs_from_kernel('${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_DTBMERGE}')} \
 "

+do_image_wic[depends] += "virtual/kernel:do_shared_workdir"
--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -18,6 +18,14 @@ LAYERDEPENDS_meta-ti-bsp = " \
    meta-arm \
 "

+LAYERRECOMMENDS_meta-ti-bsp = " \
+    openembedded-layer \
+"
+
+BBFILES_DYNAMIC += " \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
+"
+
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
    mesa-pvr \
 "
@@ -28,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
@@ -10,11 +10,6 @@ UBOOT_CONFIG ??= "uart mmc"
 UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
 UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"

-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
 # FIT image for legacy secure devices
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
--- 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
@@ -6,11 +6,6 @@ require conf/machine/am437x-evm.conf

 UBOOT_MACHINE = "am43xx_hs_evm_config"

-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
 OPTEEMACHINE = "ti-am43xx"
 OPTEEFLAVOR = "am43xx"

--- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/am57xx-evm.conf

 UBOOT_MACHINE = "am57xx_hs_evm_config"

-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
 OPTEEMACHINE = "ti-am57xx"
 OPTEEFLAVOR = "am57xx"
 OPTEEPAGER = "y"
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -10,4 +10,4 @@ SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62ax_evm_r5_defconfig"

-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -11,6 +11,10 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-v3link \
 "

+KERNEL_DEVICETREE_DTBMERGE = " \
+    ti/k3-am62a7-sk-ub954-evm-ov2312.dtb \
+"
+
 KERNEL_DEVICETREE = " \
    ti/k3-am62a7-phyboard-lyra-rdk.dtb \
    ti/k3-am62a7-sk.dtb \
--- 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 = ""
@@ -15,4 +17,4 @@ FIT_CONF_DEFAULT_DTB = "ti/k3-am62d2-evm.dtb"

 UBOOT_MACHINE = "am62dx_evm_a53_defconfig"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-dac-fw"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-dac-fw ti-adc-fw"
--- 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,7 +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"
@@ -11,4 +10,4 @@ SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62px_evm_r5_defconfig"

-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
+UBOOT_CONFIG_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
@@ -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 \
 "

@@ -31,5 +31,3 @@ UBOOT_MACHINE = "am62px_evm_a53_defconfig"
 # 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_CONFIG_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_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
@@ -3,7 +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"
@@ -11,4 +10,4 @@ SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62x_evm_r5_defconfig"

-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
--- 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,7 +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"
@@ -11,4 +10,4 @@ SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"

-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
--- 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
@@ -9,9 +9,4 @@ 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_1 = "am62x_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -6,15 +6,12 @@ require conf/machine/include/am62xx.inc

 TFA_K3_BL32_BASE = "0x80080000"
 TFA_K3_BL32_BASE:bsp-ti-6_6 = ""
-TFA_K3_BL32_BASE:bsp-ti-6_1 = ""

 TFA_K3_PRELOADED_BL33 = "0x82000000"
 TFA_K3_PRELOADED_BL33:bsp-ti-6_6 = ""
-TFA_K3_PRELOADED_BL33:bsp-ti-6_1 = ""

 OPTEE_K3_TZDRAM_START = "0x80080000"
 OPTEE_K3_TZDRAM_START:bsp-ti-6_6 = ""
-OPTEE_K3_TZDRAM_START:bsp-ti-6_1 = ""

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am625 \
@@ -27,8 +24,6 @@ KERNEL_DEVICETREE = " \

 FIT_CONF_DEFAULT_DTB = "ti/k3-am6254xxl-sk.dtb"
 FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "ti/k3-am625-sk.dtb"
-FIT_CONF_DEFAULT_DTB:bsp-ti-6_1 = "ti/k3-am625-sk.dtb"

 UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig"
 UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig"
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_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
@@ -9,6 +9,3 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"

 UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
--- 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"

@@ -20,9 +20,6 @@ TFA_K3_SYSTEM_SUSPEND = "1"
 OPTEEMACHINE = "k3-am62x"

 UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"

 SPL_BINARY = "tispl.bin_unsigned"

--- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/dra7xx-evm.conf

 UBOOT_MACHINE = "dra7xx_hs_evm_config"

-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
 OPTEEMACHINE = "ti-dra7xx"
 OPTEEFLAVOR = "dra7xx"
 OPTEEPAGER = "y"
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -7,12 +7,6 @@ MACHINE_FEATURES += "screen touchscreen"

 TFA_K3_SYSTEM_SUSPEND = "1"

-# Default tiboot3.bin on AM62A is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
-
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"

--- a/meta-ti-bsp/conf/machine/include/am62dxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62dxx.inc
@@ -5,11 +5,5 @@ SOC_FAMILY:append = ":am62dxx"

 TFA_K3_SYSTEM_SUSPEND = "1"

-# Default tiboot3.bin on AM62D is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM62D is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-evm.bin"
-
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -3,17 +3,11 @@ 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}"

-# Default tiboot3.bin on AM62Px is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM62Px is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62px-hs-evm.bin"
-
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"

--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -3,20 +3,11 @@ 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}"

-# Default tiboot3.bin on AM62x is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
-
-# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
-
 # Bitmap image tarball for early splashscreen
 IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"

--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -5,6 +5,10 @@ SOC_FAMILY:append = ":am64xx"

 KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"

+KERNEL_DEVICETREE_DTBMERGE = " \
+    ti/k3-am642-evm-nand.dtb \
+"
+
 KERNEL_DEVICETREE = " \
    ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
    ti/k3-am642-evm-icssg1-dualemac.dtbo \
@@ -20,19 +24,10 @@ KERNEL_DEVICETREE = " \
    ti/k3-am642-tqma64xxl-mbax4xxl.dtb \
 "

-# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
-
-# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
-
 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"
+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,13 +3,21 @@ 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}"

 KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"

+KERNEL_DEVICETREE_DTBMERGE = " \
+    ti/k3-am654-gp-evm.dtb \
+    ti/k3-am654-evm.dtb \
+    ti/k3-am654-idk.dtb \
+    ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtb \
+    ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtb \
+"
+
 KERNEL_DEVICETREE = " \
    ti/k3-am654-base-board-rocktech-rk101-panel.dtbo \
    ti/k3-am654-base-board.dtb \
@@ -25,15 +33,8 @@ KERNEL_DEVICETREE = " \
    ti/k3-am6548-iot2050-advanced.dtb \
 "

-IMAGE_BOOT_FILES += "sysfw.itb"
-
-# Default on AM65x is for GP
-IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb"
-
-# Since default on AM65x is for GP, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
+# Deploy SYSFW and any variants
+IMAGE_BOOT_FILES += "sysfw.itb sysfw-*-evm.itb"

 TFA_BOARD = "generic"

--- a/meta-ti-bsp/conf/machine/include/am68.inc
+++ b/meta-ti-bsp/conf/machine/include/am68.inc
@@ -3,17 +3,11 @@ 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}"

-# Default tiboot3.bin on AM68 is for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
-
 TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-j784s4"
--- a/meta-ti-bsp/conf/machine/include/am69.inc
+++ b/meta-ti-bsp/conf/machine/include/am69.inc
@@ -3,17 +3,11 @@ 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}"

-# Default tiboot3.bin on AM69 is for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
-
 TFA_BOARD = "j784s4"

 OPTEEMACHINE = "k3-j784s4"
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -3,25 +3,6 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":j7200"

-# Default tiboot3.bin on J7200 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
-
-# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS
-IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
-IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
-
-# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
-IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
-
-# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"
-
 TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-j721e"
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -3,34 +3,13 @@ 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}"

-IMAGE_BOOT_FILES += "sysfw.itb"
-
-# Default on J721e is for GP
-IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
-
-# Since default on J721e is for GP, add a version for SR1.1 HS-FS
-IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
-IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
-
-# Since default on J721e is for GP, add a version for SR1.1 HS-SE
-IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
-
-# Since default on J721e is for GP, add a version for SR2.0 HS-FS
-IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
-
-# Since default on J721e is for GP, add a version for SR2.0 HS-SE
-IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
-IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
+# Deploy SYSFW and any variants
+IMAGE_BOOT_FILES += "sysfw.itb sysfw-*-evm.itb"

 TFA_BOARD = "generic"

@@ -38,6 +17,5 @@ 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_1 = ""

 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}"
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -3,20 +3,11 @@ 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}"

-# Default tiboot3.bin on J721S2 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
-
-# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
-
 TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-j784s4"
--- a/meta-ti-bsp/conf/machine/include/j722s.inc
+++ b/meta-ti-bsp/conf/machine/include/j722s.inc
@@ -3,20 +3,11 @@ 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}"

-# Default tiboot3.bin on J722S is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE
-IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
-IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
-IMAGE_SR1_HS_SE_FILES:bsp-next = ""
-IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
-
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"

--- a/meta-ti-bsp/conf/machine/include/j742s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j742s2.inc
@@ -3,17 +3,11 @@ 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}"

-# Default tiboot3.bin on J742S2 is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin"
-
 TFA_BOARD = "j784s4"

 OPTEEMACHINE = "k3-j784s4"
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -3,20 +3,11 @@ 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}"

-# Default tiboot3.bin on J784S4 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
-
-# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
-
 TFA_BOARD = "j784s4"

 OPTEEMACHINE = "k3-j784s4"
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -13,18 +13,18 @@ KERNEL_IMAGETYPES = "Image fitImage"
 KERNEL_CLASSES += "kernel-fitimage"

 UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x81000000"
-UBOOT_LOADADDRESS = "0x81000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
+UBOOT_DTB_LOADADDRESS = "0x88000000"
+UBOOT_DTBO_LOADADDRESS = "0x88080000"
 UBOOT_DTBO_OFFSET = "0x00010000"

 SPL_BINARY = "tispl.bin"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_SUFFIX = "img"

+UBOOT_SIGN_ENABLE = "1"
+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"

@@ -40,10 +40,11 @@ UBI_VOLNAME = "rootfs"

 # List common SoC features, may need to add touchscreen for specific machines
 MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm"
+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"
+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/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.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"
 KERNEL_IMAGETYPES = "zImage uImage"
@@ -19,15 +18,13 @@ UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","").replace("ti/","")}"
-
 # 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_FILE} \
+    ${DEVICETREE_FILES} \
 "

 SPL_BINARY = "MLO"
@@ -44,10 +41,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw"
 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"
+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-ipc-rtos: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, ti-6_1
+# Supported options are: mainline, next, 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,10 +30,6 @@ 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 available in next
 MACHINE_FEATURES:remove:bsp-next = "gc320"

@@ -52,10 +44,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,35 +59,13 @@ 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
 MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320"

-# ==========
-# ti-6_1
-# TI staging kernel 6.1, u-boot 2023.04
-# ==========
-BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging"
-BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1.%"
-BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging"
-BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023.04%"
-
-BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-ti-6_1 = "1.17%"
-BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%"
-BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%"
-
-# GC320 support requires out-of-tree drivers not yet available in 6.1
-MACHINE_FEATURES:remove:bsp-ti-6_1 = "gc320"
-
 # ==========
 # sane fallback defaults
 # if specific values are not defined or bsp is set incorrectly
@@ -112,8 +80,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 ?= ""

 # ==========
@@ -129,7 +95,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-falcon.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
@@ -1,6 +1,4 @@
 IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
 KERNEL_CLASSES:remove = "kernel-fitimage"
 KERNEL_CLASSES += "kernel-fitimage-legacyhs"
-UBOOT_DTB_LOADADDRESS = "0x88000000"
-UBOOT_LOADADDRESS = "0x82000000"
 FIT_KERNEL_COMP_ALG = "none"
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -2,7 +2,29 @@
 # 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"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"

 # TI platforms all use devicetrees with overlays
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
-KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
+
+# Tell the kernel class to install the DTBs in the same directory structure as
+# the kernel
+KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
+KERNEL_DTBVENDORED = "1"
+
+# Also build a non-vendored list w/o dir structure
+DEVICETREE_FILES = "${@' '.join([os.path.basename(f) for f in d.getVar("KERNEL_DEVICETREE").split()])}"
+
+KERNEL_DEVICETREE_DTBMERGE ?= ""
+
+# Dynamically build DTBs list based on prefix matching
+CLASS_DEVICETREE_PREFIX = "${@ 'ti-devicetree-prefix' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}"
+
+KERNEL_CLASSES += "${CLASS_DEVICETREE_PREFIX}"
+IMAGE_CLASSES += "${CLASS_DEVICETREE_PREFIX}"
--- 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"

@@ -64,8 +63,6 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
-
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
@@ -73,7 +70,7 @@ UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon"
 UBOOT_EXTLINUX_BOOT_FILES = " \
    extlinux.conf;extlinux/extlinux.conf \
    ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILE} \
+    ${DEVICETREE_FILES} \
 "

 SPL_BINARY = "MLO"
@@ -90,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"

@@ -37,15 +36,13 @@ UBOOT_MACHINE = "am43xx_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
-
 # 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_FILE} \
+    ${DEVICETREE_FILES} \
 "

 SPL_BINARY = "MLO"
@@ -62,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.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
@@ -6,6 +6,10 @@ require conf/machine/include/j7200.inc

 KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"

+KERNEL_DEVICETREE_DTBMERGE = " \
+    ti/k3-j7200-evm.dtb \
+"
+
 KERNEL_DEVICETREE = " \
    ti/k3-j7200-common-proc-board.dtb \
    ti/k3-j7200-evm-quad-port-eth-exp.dtbo \
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -10,6 +10,10 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-j7200-evm-mcspi-loopback \
 "

+KERNEL_DEVICETREE_DTBMERGE = " \
+    ti/k3-j721e-evm.dtb \
+"
+
 KERNEL_DEVICETREE = " \
    ti/k3-j721e-beagleboneai64.dtb \
    ti/k3-j721e-common-proc-board-infotainment.dtbo \
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -15,6 +15,10 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-v3link \
 "

+KERNEL_DEVICETREE_DTBMERGE = " \
+    ti/k3-j721s2-evm.dtb \
+"
+
 KERNEL_DEVICETREE = " \
    ti/k3-am68-sk-base-board.dtb \
    ti/k3-j721s2-common-proc-board.dtb \
--- 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/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend
+++ b/meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend
@@ -0,0 +1,5 @@
+
+inherit gitpkgv
+PKGV = "${PV}${GITPKGV}"
+UBOOT_VERSION = "${PKGV}-${PKGR}"
+
--- a/meta-ti-bsp/licenses/INSIDE-Secure
+++ b/meta-ti-bsp/licenses/INSIDE-Secure
@@ -0,0 +1,19 @@
+//---------------------------------------------------------------------
+//Inside Secure Copyright Notice for PKA Firmware
+//---------------------------------------------------------------------
+
+/* */
+/* Copyright (c) 2004-2015 INSIDE Secure B.V. All Rights Reserved */
+/* */
+/* This confidential and proprietary software may be used only as authorized */
+/* by a licensing agreement from INSIDE Secure. */
+/* */
+/* The entire notice above must be reproduced on all authorized copies that */
+/* may only be made to the extent permitted by a licensing agreement from */
+/* INSIDE Secure. */
+/* */
+/* For more information or support, please go to our online support system at */
+/* https://essoemsupport.insidesecure.com. */
+/* In case you do not have an account for this system, please send an e-mail */
+/* to ESSEmbeddedHW-Support.com. */
+/*----------------------------------------------------------------------------*/
--- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -27,3 +27,5 @@ do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/cnm
 	install -m 0644 ${S}/cnm/${SOURCE_WAVE521C} ${D}${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}
 }
+
+RDEPENDS:${PN} += "ti-multimedia-udev"
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
@@ -1,39 +0,0 @@
-SUMMARY =  "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
-HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver"
-LICENSE = "MIT | GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2"
-
-inherit module
-
-PROVIDES = "virtual/gpudriver"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
-
-DEPENDS = "virtual/kernel"
-
-BRANCH = "linuxws/kirkstone/k6.1/${PV}"
-
-SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-SRCREV = "c838bc06a163abad46dcc193c8fb9a4fb9e2e356"
-
-TARGET_PRODUCT:j721e = "j721e_linux"
-TARGET_PRODUCT:j721s2 = "j721s2_linux"
-TARGET_PRODUCT:j784s4 = "j784s4_linux"
-TARGET_PRODUCT:am62xx = "am62_linux"
-TARGET_PRODUCT:am62pxx = "am62p_linux"
-TARGET_PRODUCT:j722s = "j722s_linux"
-PVR_BUILD = "release"
-PVR_WS = "lws-generic"
-
-EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
-
-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
-}
-
-RRECOMMENDS:${PN} += "ti-img-rogue-umlibs"
--- 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
@@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;

 S = "${WORKDIR}/git"

-SRCREV = "8eaff654a8871118c08cfafe53795f57e3b6b396"
+SRCREV = "a838ac0074db640ebd1b64be6364417b1bbca3cd"

 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
--- 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-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-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,10 +14,12 @@ BRANCH = "scarthgap/k${PV}"

 SRC_URI = "git://git.ti.com/git/multimedia/img-vxe-vxd.git;protocol=https;branch=${BRANCH}"

-SRCREV = "038d9263c67900ea4eff631820b088a3dc3a6ad5"
+SRCREV = "0bcbb20af32ea13275b452f0e84f5a49966d0bf6"

 TARGET_PRODUCT:j721e = "j721e_linux"

 S = "${WORKDIR}/git"

 EXTRA_OEMAKE += 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
+
+RDEPENDS:${PN} += "ti-multimedia-udev"
--- 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,17 +9,20 @@ 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.00.09"
-TI_SYSFW_VERSION = "11.01.02"
+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"
+PCM6240_FW_VERSION = "1.0.0.0"

-TI_LINUX_FW_SRCREV ?= "1190654141a9604e21307555882d77eaaf8c5fac"
+TI_LINUX_FW_SRCREV ?= "8ec0c42b8ccf2c9e8bebfd7c4e03d93fed555442"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"
--- a/meta-ti-bsp/recipes-bsp/ti-pka-fw/ti-pka-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-pka-fw/ti-pka-fw_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "PKA prebuilt binary firmware image"
+
+LICENSE = "TI-TFL & INSIDE-Secure"
+LIC_FILES_CHKSUM = "file://LICENCE.pka_fw;md5=dc20391b287874f0dce069cf87917206"
+
+COMPATIBLE_MACHINE = "k3"
+
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+
+PV = "${TI_PKA_FW_VERSION}"
+PR = "${INC_PR}.0"
+
+PKA_FW_DIR = "ti-pka"
+
+INSTALL_PKA_FW_DIR = "${nonarch_base_libdir}/firmware"
+
+PKA_FW_NAME = "eip29t2_2.1.0.bin"
+
+do_install() {
+    # Install Firmware
+    install -d ${D}${INSTALL_PKA_FW_DIR}
+    install -m 0644 ${S}/${PKA_FW_DIR}/${PKA_FW_NAME} ${D}/${INSTALL_PKA_FW_DIR}/${PKA_FW_NAME}
+}
--- a/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb
@@ -23,7 +23,6 @@ PLAT_SFX:am62axx = "am62axx"
 PLAT_SFX:am62dxx = "am62dxx"
 PLAT_SFX:am62pxx = "am62pxx"

-FILESEXTRAPATHS:prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"
 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc

 PV = "${CORESDK_RTOS_VERSION}"
@@ -107,13 +106,13 @@ do_install:prepend:am62dxx() {
 }

 do_install() {
-    # IPC Firmware
+    # Sign Firmware
    for FW_NAME in ${IPC_FW_LIST}
    do
        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${IPC_FW_DIR}/${FW_NAME} ${S}/${IPC_FW_DIR}/${FW_NAME}.signed
    done

-    # IPC Firmware
+    # Install Firmware
    install -d ${D}${INSTALL_IPC_FW_DIR}
    for FW_NAME in ${IPC_FW_LIST}
    do
--- a/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-messageq-test-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-messageq-test-fw_git.bb
@@ -0,0 +1,67 @@
+SUMMARY = "TI MessageQ prebuilt binary firmware images"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
+
+COMPATIBLE_MACHINE = "am57xx"
+
+inherit update-alternatives
+inherit deploy
+
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+
+PV = "${TI_IPC_EXAMPLES_FW_VERSION}"
+PR = "${INC_PR}.0"
+
+INSTALL_IPC_FW_DIR = "${nonarch_base_libdir}/firmware/ipc"
+
+IPU_1_FW = "messageq_server_ipu1.xem4"
+IPU_2_FW = "messageq_server_ipu2.xem4"
+DSP_1_FW = "messageq_server_dsp1.xe66"
+DSP_2_FW = "messageq_server_dsp2.xe66"
+
+IPU_1_FW_DIR = "ti_platforms_evmDRA7XX_ipu1"
+IPU_2_FW_DIR = "ti_platforms_evmDRA7XX_ipu2"
+DSP_1_FW_DIR = "ti_platforms_evmDRA7XX_dsp1"
+DSP_2_FW_DIR = "ti_platforms_evmDRA7XX_dsp2"
+
+do_install() {
+    # Install Firmware
+    install -d ${D}${INSTALL_IPC_FW_DIR}/${IPU_1_FW_DIR}
+    install -d ${D}${INSTALL_IPC_FW_DIR}/${IPU_2_FW_DIR}
+    install -d ${D}${INSTALL_IPC_FW_DIR}/${DSP_1_FW_DIR}
+    install -d ${D}${INSTALL_IPC_FW_DIR}/${DSP_2_FW_DIR}
+
+    install -m 0644 ${S}/ti-ipc/am57xx/${IPU_1_FW} ${D}${INSTALL_IPC_FW_DIR}/${IPU_1_FW_DIR}
+    install -m 0644 ${S}/ti-ipc/am57xx/${IPU_2_FW} ${D}${INSTALL_IPC_FW_DIR}/${IPU_2_FW_DIR}
+    install -m 0644 ${S}/ti-ipc/am57xx/${DSP_1_FW} ${D}${INSTALL_IPC_FW_DIR}/${DSP_1_FW_DIR}
+    install -m 0644 ${S}/ti-ipc/am57xx/${DSP_2_FW} ${D}${INSTALL_IPC_FW_DIR}/${DSP_2_FW_DIR}
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/ipc
+    install -m 0644 ${S}/ti-ipc/am57xx/${IPU_1_FW} ${DEPLOYDIR}/ipc/dra7-ipu1-fw.xem4
+}
+
+addtask deploy after do_install
+
+# Set up names for the firmwares
+
+ALTERNATIVE:${PN} = "\
+                    dra7-ipu1-fw.xem4 \
+                    dra7-ipu2-fw.xem4 \
+                    dra7-dsp1-fw.xe66 \
+                    dra7-dsp2-fw.xe66 \
+                    "
+
+ALTERNATIVE_LINK_NAME[dra7-ipu1-fw.xem4] = "${nonarch_base_libdir}/firmware/dra7-ipu1-fw.xem4"
+ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/dra7-ipu2-fw.xem4"
+ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/dra7-dsp1-fw.xe66"
+ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${nonarch_base_libdir}/firmware/dra7-dsp2-fw.xe66"
+
+ALTERNATIVE_TARGET[dra7-ipu1-fw.xem4] = "${INSTALL_IPC_FW_DIR}/${IPU_1_FW_DIR}/${IPU_1_FW}"
+ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${INSTALL_IPC_FW_DIR}/${IPU_2_FW_DIR}/${IPU_2_FW}"
+ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${INSTALL_IPC_FW_DIR}/${DSP_1_FW_DIR}/${DSP_1_FW}"
+ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${INSTALL_IPC_FW_DIR}/${DSP_2_FW_DIR}/${DSP_2_FW}"
+
+ALTERNATIVE_PRIORITY = "30"
--- 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,12 +1,21 @@
 # NOTE: This .inc file with customizations only gets included for K3 platforms

-PV = "2.12+git"
-SRCREV_tfa = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
-SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
-SRCBRANCH = "ti-master"
+FILESEXTRAPATHS:prepend := "${THISDIR}/trusted-firmware-a:"
+
+PV = "2.13+git"
+
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+SRCREV_tfa = "e0c4d3903b382bf34f552af53e6d955fae5283ab"
+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 = "2efbddd1caaa8c2126261225fdfe333be03c22f1"
+SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+SRCBRANCH:am62lxx = "ti-master"
+
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"

-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
 COMPATIBLE_MACHINE = "k3"

 TFA_BUILD_TARGET = "all"
@@ -15,10 +24,20 @@ TFA_SPD = "opteed"

 # For am62lxx, install bl1 & bl31 using TFA_INSTALL_TARGET
 TFA_INSTALL_TARGET:am62lxx = "bl31 bl1"
-TFA_SPD:am62lxx = ""

 EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
 EXTRA_OEMAKE += "${@ 'BL32_BASE=' + d.getVar('TFA_K3_BL32_BASE') if d.getVar('TFA_K3_BL32_BASE') else ''}"
 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.04"
+PV = "2025.07"

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

-SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a"
+SRCREV_uboot = "e37de002fac3895e8d0b60ae2015e17bb33e2b5b"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
@@ -1,9 +0,0 @@
-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-2023.04"
-
-SRCREV = "0893e693e08f9fc864a6191051dccc818accf933"
--- 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
@@ -6,4 +6,4 @@ PR = "r0"

 BRANCH = "ti-u-boot-2024.04"

-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 = "5350f13b66393212475a15c4e107add1d38267d3"
+SRCREV_uboot = "0b920f7b18a52ab88985f95fc7d9eec1048de9af"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -14,7 +14,7 @@ require u-boot-mergeconfig.inc

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

-FILES:${PN}-falcon = "boot/tispl_falcon.bin"
+FILES:${PN}-falcon = "boot/tifalcon.bin"

 SUMMARY = "u-boot bootloader for TI devices"

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

@@ -105,31 +107,31 @@ SYSROOT_DIRS += "/boot"
 SPL_UART_BINARY = "u-boot-spl.bin"
 SPL_UART_BINARY:k3r5 = ""

-SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
+SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${UBOOT_VERSION}"
 SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"

 SPL_HS_MLO_BINARY = "u-boot-spl_HS_MLO"
-SPL_HS_MLO_IMAGE = "u-boot-spl_HS_MLO-${MACHINE}-${PV}-${PR}"
+SPL_HS_MLO_IMAGE = "u-boot-spl_HS_MLO-${MACHINE}-${UBOOT_VERSION}"
 SPL_HS_MLO_SYMLINK = "u-boot-spl_HS_MLO-${MACHINE}"

 # HS XLD
 UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER"
-UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${PV}-${PR}"
+UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${UBOOT_VERSION}"
 UBOOT_HS_XLD_SYMLINK = "u-boot-spl_HS_X-LOADER-${MACHINE}"

 # HS MLO
 UBOOT_HS_MLO_BINARY = "u-boot_HS_MLO"
-UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${PV}-${PR}"
+UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${UBOOT_VERSION}"
 UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}"

 # HS ISSW
 UBOOT_HS_ISSW_BINARY = "u-boot-spl_HS_ISSW"
-UBOOT_HS_ISSW_IMAGE = "u-boot-spl_HS_ISSW-${MACHINE}-${PV}-${PR}"
+UBOOT_HS_ISSW_IMAGE = "u-boot-spl_HS_ISSW-${MACHINE}-${UBOOT_VERSION}"
 UBOOT_HS_ISSW_SYMLINK = "u-boot-spl_HS_ISSW-${MACHINE}"

 # HS 2ND
 UBOOT_HS_2ND_BINARY = "u-boot-spl_HS_2ND"
-UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}"
+UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${UBOOT_VERSION}"
 UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}"

 uboot_compile:append () {
@@ -217,24 +219,24 @@ do_deploy:append:k3r5 () {
 	rm -f ${DEPLOYDIR}/${PN}-initial-env*
 	rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}*
 	rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}*
-	rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}*
-	rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}*
+	rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${UBOOT_VERSION}*
+	rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${UBOOT_VERSION}*
 }

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

 	for f in ${B}/${config}/sysfw*.itb; do
 		if [ -f "$f" ]; then
-            f_base=$(basename $f)
+			f_base=$(basename $f)
 			install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
-            ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
 		fi
 	done
 }
@@ -374,7 +376,7 @@ do_deploy:append:am62pxx() {
 }

 do_install:append:ti-falcon() {
-	install -m 0644 ${B}/tispl_falcon.bin ${D}/boot
+	install -m 0644 ${B}/tifalcon.bin ${D}/boot
 }

 FALCON_PKG = ""
--- 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,30 +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}"
-
-S = "${WORKDIR}/git"
-
-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,7 +10,7 @@ PV = "0.3+git"
 COMPATIBLE_MACHINE = "k3"

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

 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"

--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch
@@ -1,64 +0,0 @@
-From bb2db56ffec6e527d88751f75117ae690227cd6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org>
-Date: Sat, 11 Feb 2023 18:38:01 +0100
-Subject: [PATCH] fix: gallivm: fix LLVM #include of Host.h, moved to
- TargetParser
-
-Upstream moved Host.h from Support to TargetParser in LLVM 17.
-
-This shouldn't lead to a FTBFS, since there is a forwarding include left
-behind. Sadly the added deprecation warning #pragma is invalid and thus
-causes a build failure right away. But since we would have to follow the
-move anyway in the future, just do it right away.
-
-Reference: https://github.com/llvm/llvm-project/commit/d768bf994f508d7eaf9541a568be3d71096febf5
-Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
-Closes: #8275
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21263>
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/bb2db56ffec6e527d88751f75117ae690227cd6c]
-
---
- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 7 ++++++-
- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp  | 4 +++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index 54bc5d5ada36c..f78f04f042be8 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -35,9 +35,14 @@
- #include <llvm-c/Disassembler.h>
- #include <llvm/Support/raw_ostream.h>
- #include <llvm/Support/Format.h>
-#include <llvm/Support/Host.h>
- #include <llvm/IR/Module.h>
-
-+#if LLVM_VERSION_MAJOR >= 17
-+#include <llvm/TargetParser/Host.h>
-+#else
-+#include <llvm/Support/Host.h>
-+#endif
-+
- #include "util/u_math.h"
- #include "util/u_debug.h"
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 334c13530394b..5e7a30a6cc2e3 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -60,7 +60,11 @@
- #include <llvm/Analysis/TargetLibraryInfo.h>
- #include <llvm/ExecutionEngine/SectionMemoryManager.h>
- #include <llvm/Support/CommandLine.h>
-+#if LLVM_VERSION_MAJOR >= 17
-+#include <llvm/TargetParser/Host.h>
-+#else
- #include <llvm/Support/Host.h>
-+#endif
- #include <llvm/Support/PrettyStackTrace.h>
- #include <llvm/ExecutionEngine/ObjectCache.h>
- #include <llvm/Support/TargetSelect.h>
-
--
-GitLab
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch
@@ -1,128 +0,0 @@
-From 1a894699354f5f984f31e5d3418b651edf486df9 Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <reatmon@ti.com>
-Date: Fri, 22 Sep 2023 22:32:41 -0500
-Subject: [PATCH] fix: gallivm: limit usage of LLVMContextSetOpaquePointers()
- to LLVM 15
-
-LLVMContextSetOpaquePointers() was a temporary workaround offered to
-allow transitioning to opaque pointers. Mesa is ready for this now with
-recent versions of LLVM (16+). Therefore we limit the workaround of
-using LLVMContextSetOpaquePointers() to LLVM 15 now, that this C
-interface was removed in LLVM 17.
-
-Reference: https://github.com/llvm/llvm-project/commit/1270879376025457e266572c7cccc51eb5de9276
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21124]
-Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
- src/gallium/auxiliary/draw/draw_llvm.c        | 2 +-
- src/gallium/drivers/llvmpipe/lp_context.c     | 2 +-
- src/gallium/drivers/llvmpipe/lp_test_arit.c   | 2 +-
- src/gallium/drivers/llvmpipe/lp_test_blend.c  | 2 +-
- src/gallium/drivers/llvmpipe/lp_test_conv.c   | 2 +-
- src/gallium/drivers/llvmpipe/lp_test_format.c | 4 ++--
- src/gallium/drivers/llvmpipe/lp_test_printf.c | 2 +-
- 7 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
-index 50c157bc3cc..8b3a1522725 100644
--- a/src/gallium/auxiliary/draw/draw_llvm.c
-+++ b/src/gallium/auxiliary/draw/draw_llvm.c
-@@ -784,7 +784,7 @@ draw_llvm_create(struct draw_context *draw, LLVMContextRef context)
-    if (!llvm->context) {
-       llvm->context = LLVMContextCreate();
-
-#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR == 15
-       LLVMContextSetOpaquePointers(llvm->context, false);
- #endif
-
-diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c
-index 8309335aebc..0ef4317fc76 100644
--- a/src/gallium/drivers/llvmpipe/lp_context.c
-+++ b/src/gallium/drivers/llvmpipe/lp_context.c
-@@ -263,7 +263,7 @@ llvmpipe_create_context(struct pipe_screen *screen, void *priv,
-    if (!llvmpipe->context)
-       goto fail;
-
-#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR == 15
-    LLVMContextSetOpaquePointers(llvmpipe->context, false);
- #endif
-
-diff --git a/src/gallium/drivers/llvmpipe/lp_test_arit.c b/src/gallium/drivers/llvmpipe/lp_test_arit.c
-index 4118928d52e..565b1c47753 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_arit.c
-+++ b/src/gallium/drivers/llvmpipe/lp_test_arit.c
-@@ -434,7 +434,7 @@ test_unary(unsigned verbose, FILE *fp, const struct unary_test_t *test, unsigned
-    }
-
-    context = LLVMContextCreate();
-#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR == 15
-    LLVMContextSetOpaquePointers(context, false);
- #endif
-    gallivm = gallivm_create("test_module", context, NULL);
-diff --git a/src/gallium/drivers/llvmpipe/lp_test_blend.c b/src/gallium/drivers/llvmpipe/lp_test_blend.c
-index 37c3f731eaf..3d2899a78d4 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_blend.c
-+++ b/src/gallium/drivers/llvmpipe/lp_test_blend.c
-@@ -452,7 +452,7 @@ test_one(unsigned verbose,
-       dump_blend_type(stdout, blend, type);
-
-    context = LLVMContextCreate();
-#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR == 15
-    LLVMContextSetOpaquePointers(context, false);
- #endif
-    gallivm = gallivm_create("test_module", context, NULL);
-diff --git a/src/gallium/drivers/llvmpipe/lp_test_conv.c b/src/gallium/drivers/llvmpipe/lp_test_conv.c
-index c7ea9efc12d..83236f0c0ba 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_conv.c
-+++ b/src/gallium/drivers/llvmpipe/lp_test_conv.c
-@@ -223,7 +223,7 @@ test_one(unsigned verbose,
-    }
-
-    context = LLVMContextCreate();
-#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR == 15
-    LLVMContextSetOpaquePointers(context, false);
- #endif
-    gallivm = gallivm_create("test_module", context, NULL);
-diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c
-index 0a2a1e449e8..89f7d5dec1a 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_format.c
-+++ b/src/gallium/drivers/llvmpipe/lp_test_format.c
-@@ -150,7 +150,7 @@ test_format_float(unsigned verbose, FILE *fp,
-    unsigned i, j, k, l;
-
-    context = LLVMContextCreate();
-#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR == 15
-    LLVMContextSetOpaquePointers(context, false);
- #endif
-    gallivm = gallivm_create("test_module_float", context, NULL);
-@@ -254,7 +254,7 @@ test_format_unorm8(unsigned verbose, FILE *fp,
-    unsigned i, j, k, l;
-
-    context = LLVMContextCreate();
-#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR == 15
-    LLVMContextSetOpaquePointers(context, false);
- #endif
-    gallivm = gallivm_create("test_module_unorm8", context, NULL);
-diff --git a/src/gallium/drivers/llvmpipe/lp_test_printf.c b/src/gallium/drivers/llvmpipe/lp_test_printf.c
-index b3de9cb9e8b..850c0abfe22 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_printf.c
-+++ b/src/gallium/drivers/llvmpipe/lp_test_printf.c
-@@ -96,7 +96,7 @@ test_printf(unsigned verbose, FILE *fp,
-    boolean success = TRUE;
-
-    context = LLVMContextCreate();
-#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR == 15
-    LLVMContextSetOpaquePointers(context, false);
- #endif
-    gallivm = gallivm_create("test_module", context, NULL);
--
-2.17.1
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch
@@ -1,43 +0,0 @@
-From 8a5de0b6cf1090d7f29f3974ec79c32776cf2745 Mon Sep 17 00:00:00 2001
-From: Jami Kettunen <jami.kettunen@protonmail.com>
-Date: Tue, 31 Aug 2021 00:15:58 +0300
-Subject: [PATCH] freedreno/pm4: Use unsigned instead of uint to fix musl build
-
-Upstream-Status: Backport
-
-Fixes the following error I noticed when building against aarch64 with
-musl libc:
-
-  In file included from ../src/freedreno/decode/crashdec.h:38,
-                   from ../src/freedreno/decode/crashdec.c:40:
-  ../src/freedreno/common/freedreno_pm4.h:104:15: error: unknown type name 'uint'
-    104 | static inline uint
-        |               ^~~~
-  ../src/freedreno/common/freedreno_pm4.h:105:25: error: unknown type name 'uint'; did you mean 'int'?
-    105 | pm4_calc_odd_parity_bit(uint val)
-        |                         ^~~~
-        |                         int
-
-Signed-off-by: Jami Kettunen <jami.kettunen@protonmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19665>
---
- src/freedreno/common/freedreno_pm4.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/freedreno/common/freedreno_pm4.h b/src/freedreno/common/freedreno_pm4.h
-index 8f958953d693..091247e709a0 100644
--- a/src/freedreno/common/freedreno_pm4.h
-+++ b/src/freedreno/common/freedreno_pm4.h
-@@ -105,8 +105,8 @@ pm4_pkt7_hdr(uint8_t opcode, uint16_t cnt)
- #define cp_type3_opcode(pkt) (((pkt) >> 8) & 0xFF)
- #define type3_pkt_size(pkt)  ((((pkt) >> 16) & 0x3FFF) + 1)
-
-static inline uint
-pm4_calc_odd_parity_bit(uint val)
-+static inline unsigned
-+pm4_calc_odd_parity_bit(unsigned val)
- {
-    return (0x9669 >> (0xf & ((val) ^ ((val) >> 4) ^ ((val) >> 8) ^
-                              ((val) >> 12) ^ ((val) >> 16) ^ ((val) >> 20) ^
--
-2.39.2
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-17.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-17.patch
@@ -1,58 +0,0 @@
-From 2dfe0f899aeb415a5491b8c67e208673d2a2914f Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <reatmon@ti.com>
-Date: Fri, 22 Sep 2023 21:50:08 -0500
-Subject: [PATCH] gallium: Fix build with llvm 17
-
-These headers are not available for C files in llvm 17+
-and they seem to be not needed to compile after all with llvm 17
-so add conditions to exclude them for llvm >= 17
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21262]
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22980]
-Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
- src/gallium/auxiliary/gallivm/lp_bld_init.c   | 8 ++++----
- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-index 584ea738668..fe8bb2b11af 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-@@ -42,14 +42,14 @@
-
- #include <llvm/Config/llvm-config.h>
- #include <llvm-c/Analysis.h>
-#include <llvm-c/Transforms/Scalar.h>
-#if LLVM_VERSION_MAJOR >= 7
-#include <llvm-c/Transforms/Utils.h>
-#endif
- #include <llvm-c/BitWriter.h>
- #if GALLIVM_USE_NEW_PASS == 1
- #include <llvm-c/Transforms/PassBuilder.h>
- #elif GALLIVM_HAVE_CORO == 1
-+#include <llvm-c/Transforms/Scalar.h>
-+#if LLVM_VERSION_MAJOR >= 7
-+#include <llvm-c/Transforms/Utils.h>
-+#endif
- #if LLVM_VERSION_MAJOR <= 8 && (defined(PIPE_ARCH_AARCH64) || defined (PIPE_ARCH_ARM) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_MIPS64))
- #include <llvm-c/Transforms/IPO.h>
- #endif
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 2279e5acb28..0caeaf94263 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -56,7 +56,11 @@
- #include <llvm-c/ExecutionEngine.h>
- #include <llvm/Target/TargetOptions.h>
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
-+#if LLVM_VERSION_MAJOR >= 17
-+#include <llvm/TargetParser/Triple.h>
-+#else
- #include <llvm/ADT/Triple.h>
-+#endif
- #include <llvm/Analysis/TargetLibraryInfo.h>
- #include <llvm/ExecutionEngine/SectionMemoryManager.h>
- #include <llvm/Support/CommandLine.h>
--
-2.17.1
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch
@@ -1,52 +0,0 @@
-From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <reatmon@ti.com>
-Date: Mon, 4 Nov 2024 13:37:29 -0600
-Subject: [PATCH] gallium: Fix build with llvm 18 and 19
-
- CodeGenOpt::Level changed to CodeGenOoptLevel. [1]
- llvm::sys::getHostCPUFeatures() now returns the features instead of
-modifying the passed in argument. [2]
-
-Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179]
-Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
-
-Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 5e7a30a6cc2..dbc777e3096 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -368,7 +368,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
-    builder.setEngineKind(EngineKind::JIT)
-           .setErrorStr(&Error)
-           .setTargetOptions(options)
-+#if LLVM_VERSION_MAJOR >= 18
-+          .setOptLevel((CodeGenOptLevel)OptLevel);
-+#else
-           .setOptLevel((CodeGenOpt::Level)OptLevel);
-+#endif
-
- #ifdef _WIN32
-     /*
-@@ -392,8 +396,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
-     * which allows us to enable/disable code generation based
-     * on the results of cpuid on these architectures.
-     */
-   llvm::StringMap<bool> features;
-   llvm::sys::getHostCPUFeatures(features);
-+   #if LLVM_VERSION_MAJOR >= 19
-+      /* llvm-19+ returns StringMap from getHostCPUFeatures.
-+      */
-+      auto features = llvm::sys::getHostCPUFeatures();
-+   #else
-+      llvm::StringMap<bool> features;
-+      llvm::sys::getHostCPUFeatures(features);
-+   #endif
-
-    for (StringMapIterator<bool> f = features.begin();
-         f != features.end();
--
-2.17.1
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gbm-backend-fix-gbm-compile-without-dri.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gbm-backend-fix-gbm-compile-without-dri.patch
@@ -1,64 +0,0 @@
-From 25946100e21cf2095bea334e8d7096798561d0b7 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Wed, 28 Dec 2022 16:28:01 -0600
-Subject: [PATCH] gbm/backend: fix gbm compile without dri
-
-Upstream-Status: Backport
-
-https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20447
-https://gitlab.freedesktop.org/mesa/mesa/-/commit/842ca284650f066e58706741a7d22d67b5088e60
-
-At mesa version 22.2.3 patch wasn't introduced until after.
-
-Commit introduces a fix that allows for gbm to be built with an empty
-backend. There are situation especially in a Yocto/OE cross compilation
-environment where you want to build with an empty backend. The particular
-situation is as such:
-
-The mesa-gl recipe is the preferred provider for virtual/libgbm, virtual/libgl,
-virtual/mesa, etc... But the x11 DISTRO_FEATURE in't included this leads to build
-errors such as:
-
-| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o: in function `find_backend':
-| backend.c:(.text.find_backend+0xa4): undefined reference to `gbm_dri_backend'
-| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o:(.data.rel.ro.builtin_backends+0x4):
-                undefined reference to `gbm_dri_backend'
-| collect2: error: ld returned 1 exit status
-
-Issue should be replicable by setting -Ddri3=disabled and -Dgbm=enabled
-
-Add fix to bypasses compilation issue by excluding gbm dri backend. If
-HAVE_DRI || HAVE_DRIX not specified.
-
-Acked-by: David Heidelberg <david.heidelberg@collabora.com>
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
---
- src/gbm/main/backend.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c
-index 974d0a76a4e..feee0703495 100644
--- a/src/gbm/main/backend.c
-+++ b/src/gbm/main/backend.c
-@@ -42,7 +42,9 @@
- #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
- #define VER_MIN(a, b) ((a) < (b) ? (a) : (b))
-
-+#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3)
- extern const struct gbm_backend gbm_dri_backend;
-+#endif
-
- struct gbm_backend_desc {
-    const char *name;
-@@ -51,7 +53,9 @@ struct gbm_backend_desc {
- };
-
- static const struct gbm_backend_desc builtin_backends[] = {
-+#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3)
-    { "dri", &gbm_dri_backend },
-+#endif
- };
-
- #define BACKEND_LIB_SUFFIX "_gbm"
--
-2.34.1
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
@@ -1,25 +0,0 @@
-From 3ef37c63f03ad6f2af407de350486fdd25e9132a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Jan 2020 15:23:47 -0800
-Subject: [PATCH] meson misdetects 64bit atomics on mips/clang
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---
- src/util/u_atomic.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c
-index 5a5eab4..e499516 100644
--- a/src/util/u_atomic.c
-+++ b/src/util/u_atomic.c
-@@ -21,7 +21,7 @@
-  * IN THE SOFTWARE.
-  */
-
-#if defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD)
-+#if !defined(__clang__) && defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD)
-
- #include <stdint.h>
- #include <pthread.h>
--- a/Show More
+++ b/Show More