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

Updated the value(s) for: atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV k3conf: SRCREV 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=3c06cd621447331aeab0bbb2e5c063a2b1d79d1b..91c8a62c788c2d0efb733296336bf0e658727faf k3conf: https://git.ti.com/cgit/k3conf/k3conf/log/?qt=range&q=6dd352f234ef19c5cb92c924101e1eab29d2939a..f63ccd27cba9550de04e8dbb04bc6003d8b5168e linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=4235794ce373baf55d9ff5cf920b1d44b7e31455..e2b759994f9ed141d13b2f7a3ae8b9c51eb7e295 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=af3896fca24b7945db015d2ac411ef50e93a11c9..ccfe8fee8026cbb23dcd9c69a2bd961c99c58567 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
mesa-pvr: Use PREFERRED_PROVIDER directly for GPU selection
2026-01-12 01:20:20 +00:00 · 2025-09-18 12:57:12 -05:00 · 2025-09-17 17:42:13 -05:00 · 2025-09-17 17:42:13 -05:00 · 2025-09-17 17:42:13 -05:00 · 2025-09-17 17:42:13 -05:00
58 changed files with 564 additions and 292 deletions
--- a/meta-beagle/conf/machine/beagle-x15.conf
+++ b/meta-beagle/conf/machine/beagle-x15.conf
@@ -10,12 +10,35 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/omap/am57xx-idk-lcd \
 "

-KERNEL_DEVICETREE = " \
-    ti/omap/am57xx-beagle-x15.dtb \
-    ti/omap/am57xx-beagle-x15-revb1.dtb \
-    ti/omap/am57xx-beagle-x15-revc.dtb \
-    ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \
-    ti/omap/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.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64.conf
@@ -5,11 +5,6 @@
 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"

 SPL_BINARY = "tispl.bin_unsigned"
@@ -18,12 +13,78 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-j721e \
 "

-KERNEL_DEVICETREE = " \
+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-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.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"
--- a/meta-beagle/conf/machine/beaglebone.conf
+++ b/meta-beagle/conf/machine/beaglebone.conf
@@ -11,17 +11,49 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/omap/am335x-sancloud-bbe \
 "

-KERNEL_DEVICETREE = " \
-    ti/omap/am335x-bone.dtb \
-    ti/omap/am335x-boneblack.dtb \
-    ti/omap/am335x-boneblack-wireless.dtb \
-    ti/omap/am335x-boneblue.dtb \
-    ti/omap/am335x-bonegreen.dtb \
-    ti/omap/am335x-bonegreen-wireless.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_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.conf
+++ b/meta-beagle/conf/machine/beagleplay.conf
@@ -6,7 +6,7 @@ require conf/machine/beagleplay-ti.conf

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

-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 \
@@ -32,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.conf
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -5,18 +5,103 @@
 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_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config"
+
+UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"

 KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am67a \
    ti/k3-j722s \
 "

-KERNEL_DEVICETREE = ""
-
-KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
-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: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
@@ -18,10 +18,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""

 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_12 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%"
 BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%"

 # GC320 support requires out-of-tree drivers not yet available in bb.org 6.12
@@ -41,10 +39,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""

 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
 BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"

 # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
--- a/meta-beagle/conf/machine/pocketbeagle2.conf
+++ b/meta-beagle/conf/machine/pocketbeagle2.conf
@@ -20,9 +20,39 @@ UBOOT_MACHINE = "am6232_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.07+git/bootcmd-ti-mmc.cfg
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.07+git/bootcmd-ti-mmc.cfg
--- 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.07.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.07.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.07"
+
+UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
+UBOOT_GIT_PROTOCOL = "https"
+BRANCH = "v2025.07-Beagle"
+SRCREV = "919ec3cd84f39e6960d1705d4ba7f810bc1067fc"
+
+BRANCH:pocketbeagle2 = "v2025.07-am6232-pocketbeagle2"
+BRANCH:pocketbeagle2-k3r5 = "v2025.07-am6232-pocketbeagle2"
+SRCREV:pocketbeagle2 = "6d5b4abc28f036a4a83ccb234f04d72eceafdc4e"
+SRCREV:pocketbeagle2-k3r5 = "6d5b4abc28f036a4a83ccb234f04d72eceafdc4e"
+
+SRC_URI:append:pocketbeagle2 = " file://bootcmd-ti-mmc.cfg"
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
@@ -19,7 +19,6 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"

 # Extra DT overlays/capes
 KERNEL_DEVICETREE:append:armv7a = " \
-    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 \
@@ -53,16 +52,22 @@ KERNEL_DEVICETREE:append:armv7a = " \
    ti/omap/PB-MIKROBUS-1.dtbo \
 "

+KERNEL_DEVICETREE:append:aarch64 = " \
+    ti/BONE-I2C1.dtbo \
+    ti/BONE-I2C2.dtbo \
+    ti/BONE-I2C3.dtbo \
+"
+
 S = "${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.34 version for 64-bit
+SRCREV:aarch64 = "9ca36b8c54806a037f357efcd40eaa8399798b05"
+PV:aarch64 = "6.12.34+git"
+BRANCH:aarch64 = "v6.12.34-ti-arm64-r46"

 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
@@ -56,14 +56,14 @@ KERNEL_DEVICETREE:append:armv7a = " \
 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/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/beagleplay-ti.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
@@ -7,7 +7,7 @@ require conf/machine/include/mc_k3r5.inc

 SOC_FAMILY:append = ":am62xx"

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

 SERIAL_CONSOLES = "115200;ttyS2"

--- a/meta-ti-bsp/conf/machine/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,15 +24,6 @@ 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"
--- 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"

--- 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
@@ -44,7 +44,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-pka-fw"

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

-IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
+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"
@@ -42,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
@@ -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_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"

 # ==========
@@ -69,10 +59,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"

 BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%"
 BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"

 # GC320 support requires out-of-tree drivers not yet available in 6.6
@@ -92,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 ?= ""

 # ==========
@@ -109,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/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -9,7 +9,6 @@ require conf/machine/include/ti-bsp.inc
 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
-PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"

 KERNEL_IMAGETYPE = "zImage"

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

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

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -9,7 +9,6 @@ require conf/machine/include/ti-bsp.inc
 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
-PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"

 KERNEL_IMAGETYPE = "zImage"

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

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

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
--- a/meta-ti-bsp/conf/machine/j7200-evm.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/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/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
@@ -19,8 +19,9 @@ TI_SYSFW_VERSION = "11.01.05"
 TI_HSM_DEMO_FW_VERSION = "11.00.09"
 TAD5212_FW_VERSION = "1.0.0.0"
 TI_PKA_FW_VERSION = "2.1.0"
+TI_IPC_EXAMPLES_FW_VERSION = "3.52.00.01"

-TI_LINUX_FW_SRCREV ?= "e89a348f4618a26812fb353a04ed9532ef890a2f"
+TI_LINUX_FW_SRCREV ?= "bb242f4eee42835066d83345e4d64bc02307f855"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"
--- 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
@@ -8,7 +8,7 @@ SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmwar
 SRCBRANCH = "master"

 LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
-SRCREV_tfa:am62lxx = "ed89d963b00e8dbdb91cea87e1ba43db0a64fba9"
+SRCREV_tfa:am62lxx = "abb57dd3c9b38718caa63df711d9675e2bc7e789"
 SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
 SRCBRANCH:am62lxx = "ti-master"

@@ -22,7 +22,6 @@ 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 ''}"
--- 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 = "05d141ca0739756a0cdd7a19268e3ad07279a17e"
+SRCREV = "91c8a62c788c2d0efb733296336bf0e658727faf"
--- 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 = "b35ec6f6c6e11471c5d06f8c24ac396077f893be"
+SRCREV = "f63ccd27cba9550de04e8dbb04bc6003d8b5168e"

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

--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
@@ -23,25 +23,15 @@ SRC_URI = " \

 S = "${WORKDIR}/git"

-PACKAGECONFIG:append = " \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
-"
-
-SRCREV = "82e6a9293c476267417c5b6b906b01fb73a34e38"
+SRCREV = "68af6a102c2298569e77d1aa8bccc1ff61438b3e"
 PV = "24.0.1"

-PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
-PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
-PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
-
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}"
-GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'sgx', ',sgx', '', d)}"
+GALLIUMDRIVERS:append = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', ',pvr', '', d)}"
+GALLIUMDRIVERS:append = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', ',sgx', '', d)}"

-VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}"
+VULKAN_DRIVERS:append = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', ',pvr', '', d)}"

 do_install:append () {
    # remove pvr custom pkgconfig
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
@@ -40,9 +40,7 @@ TARGET_PRODUCT:ti43x = "ti437x_linux"
 TARGET_PRODUCT:omap-a15 = "ti572x_linux"
 TARGET_PRODUCT:am65xx = "ti654x_linux"

-RDEPENDS:${PN} += "libdrm"
-
-RRECOMMENDS:${PN} += "ti-sgx-ddk-km"
+RDEPENDS:${PN} += "libdrm ti-sgx-ddk-km"

 S = "${WORKDIR}/git"

--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb
@@ -10,8 +10,8 @@ BRANCH_ARM64 = "ti-linux-6.12.y"
 BRANCH = "${BRANCH_ARM64}"

 BRANCH_ARM32 = "ti-rt-linux-6.12.y-arm32"
-SRCREV_ARM32 = "2bcb6e9caabf65ef182dde7dc0332a7fe53622a2"
-PV_ARM32 = "6.12.35+git"
+SRCREV_ARM32 = "e2b759994f9ed141d13b2f7a3ae8b9c51eb7e295"
+PV_ARM32 = "6.12.43+git"

 BRANCH:ti33x = "${BRANCH_ARM32}"
 BRANCH:ti43x = "${BRANCH_ARM32}"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
@@ -22,8 +22,8 @@ S = "${WORKDIR}/git"

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

-SRCREV ?= "c94f90807b390a224fd087549b4bd5d84d5fc971"
-PV = "6.12.35+git"
+SRCREV ?= "ccfe8fee8026cbb23dcd9c69a2bd961c99c58567"
+PV = "6.12.43+git"

 # Special configuration for remoteproc/rpmsg IPC modules
 module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
--- a/meta-ti-bsp/recipes-multimedia/ti-multimedia-udev/files/67-multimedia.rules
+++ b/meta-ti-bsp/recipes-multimedia/ti-multimedia-udev/files/67-multimedia.rules
@@ -0,0 +1,5 @@
+SUBSYSTEM=="video4linux", DEVPATH=="/devices/*/*210000.video-codec/video4linux/video*", ATTR{name}=="C&M Wave5 VPU decoder", SYMLINK+="video-dec0"
+SUBSYSTEM=="video4linux", DEVPATH=="/devices/*/*210000.video-codec/video4linux/video*", ATTR{name}=="C&M Wave5 VPU encoder", SYMLINK+="video-enc0"
+SUBSYSTEM=="video4linux", DEVPATH=="/devices/*/4220000.video-codec/video4linux/video*", ATTR{name}=="C&M Wave5 VPU decoder", SYMLINK+="video-dec1"
+SUBSYSTEM=="video4linux", DEVPATH=="/devices/*/4220000.video-codec/video4linux/video*", ATTR{name}=="C&M Wave5 VPU encoder", SYMLINK+="video-enc1"
+SUBSYSTEM=="video4linux", DEVPATH=="/devices/*/fd20000.jpeg-encoder/video4linux/video*", ATTR{name}=="e5010", SYMLINK+="jpeg-enc0"
--- a/meta-ti-bsp/recipes-multimedia/ti-multimedia-udev/ti-multimedia-udev.bb
+++ b/meta-ti-bsp/recipes-multimedia/ti-multimedia-udev/ti-multimedia-udev.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Udev rules for device naming of VPU devices and JPEG encoder"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI += "file://67-multimedia.rules"
+
+do_install() {
+    install -d ${D}${sysconfdir}/udev/rules.d
+    install -m 0644 ${WORKDIR}/67-multimedia.rules ${D}${sysconfdir}/udev/rules.d/
+}
--- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.6.0+git"
-SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
+PV = "4.7.0+git"
+SRCREV = "23c112a6f05cc5e39bd4aaf52ad515cad532237d"
--- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.6.0+git"
-SRCREV = "5306d2c7c618bb4a91df17a2d5d79ae4701af4a3"
+PV = "4.7.0+git"
+SRCREV = "14321a0607db16099d158478b21a2b2e37b3a935"
--- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
@@ -6,4 +6,8 @@ require ${OPTEE_TI_VERSION}
 OPTEE_TI_OVERRIDES = ""
 OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc"

+SRC_URI:remove = " \
+    file://0003-optee-enable-clang-support.patch \
+"
+
 require ${OPTEE_TI_OVERRIDES}
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
@@ -1,6 +1,5 @@
-PV = "4.6.0+git"
-SRCREV = "71785645fa6ce42db40dbf5a54e0eaedc4f61591"
-
+PV = "4.7.0+git"
+SRCREV = "a9690ae39995af36a31b7a4f446f27ea0787e3a4"
 SRC_URI:remove = " \
    file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \
    file://0001-arm64.h-fix-compile-error-with-Clang.patch \
--- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
@@ -6,4 +6,8 @@ require ${OPTEE_TI_VERSION}
 OPTEE_TI_OVERRIDES = ""
 OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc"

+SRC_URI:remove = " \
+    file://0003-optee-enable-clang-support.patch \
+"
+
 require ${OPTEE_TI_OVERRIDES}
--- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
@@ -1,7 +1,7 @@
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"

-PV = "4.6.0+git"
-SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d"
+PV = "4.7.0+git"
+SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb"

 SRC_URI:remove = " \
    file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc
@@ -9,8 +9,8 @@ TI_IPC_GIT_URI = "git://git.ti.com/git/ipc/ipcdev.git"
 TI_IPC_GIT_PROTOCOL = "https"
 TI_IPC_GIT_BRANCH = "master"

-#Corresponds to 3.51.00.00A
-TI_IPC_SRCREV = "7a6e343a208d2849139b7272a67abc01db806e00"
+#Corresponds to 3.52.00.01
+TI_IPC_SRCREV = "7f76e5cc15c634b70efee18d1aa0474d603224a6"

 BRANCH = "${TI_IPC_GIT_BRANCH}"
 SRC_URI = "${TI_IPC_GIT_URI};protocol=${TI_IPC_GIT_PROTOCOL};branch=${BRANCH};name=ipcdev"
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb
+++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb
@@ -0,0 +1,66 @@
+DESCRIPTION = "TI Inter Processor Communication (IPC) MessageQ Application for Linux Host"
+SUMMARY = "TI IPC MessageQ Application for Linux Host"
+
+require recipes-ti/ipc/ti-ipc-common.inc
+require ti-ipc-rtos.inc
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${S_ipc-examples}/src/makefile;beginline=1;endline=30;md5=a52324bd5033bb49ea07bade1244ac9a"
+
+IPC_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
+INHIBIT_PACKAGE_STRIP = "1"
+
+DEPENDS = "ti-ipc ti-ipc-rtos ti-xdctools-native zip-native"
+
+EX02_PATH = "examples/DRA7XX_linux_elf/ex02_messageq/host"
+
+do_compile() {
+  cd ${S_ipc-examples}/src
+  oe_runmake .examples \
+    IPCTOOLS="${S_ipc-metadata}/src/etc"
+
+  for alt_platform in ${ALT_PLATFORM}; do
+    oe_runmake .examples "PLATFORM=${alt_platform}" \
+      IPCTOOLS="${S_ipc-metadata}/src/etc"
+  done
+
+  if [  "${PLATFORM}" != "UNKNOWN" ]; then
+    oe_runmake extract HOSTOS="linux" IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
+
+    if [ ! -z ${ALT_PLATFORM} ]; then
+      oe_runmake extract PLATFORM="${ALT_PLATFORM}" HOSTOS="linux" \
+         IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
+    fi
+    oe_runmake -C ${EX02_PATH} all HOSTOS="linux" \
+      LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
+      IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
+
+    if [ ! -z ${ALT_PLATFORM} ]; then
+      oe_runmake -C ${EX02_PATH} all HOSTOS="linux" \
+        LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
+        IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
+        PLATFORM="${ALT_PLATFORM}"
+    fi
+  fi
+}
+
+do_install() {
+  cd ${S_ipc-examples}/src
+
+  if [  "${PLATFORM}" != "UNKNOWN" ]; then
+    # Install directory for linux examples
+    install -d ${D}${bindir}/ipc/examples/ex02_messageq
+    oe_runmake -C ${EX02_PATH} install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
+      LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
+      HOSTOS="linux" EXEC_DIR="${D}/${bindir}/ipc/examples/ex02_messageq"
+
+    if [ ! -z ${ALT_PLATFORM} ]; then
+      oe_runmake -C ${EX02_PATH} install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
+        LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
+        HOSTOS="linux" EXEC_DIR="${D}/${bindir}/ipc/examples/ex02_messageq" \
+        PLATFORM="${ALT_PLATFORM}"
+    fi
+  fi
+}
+
+FILES:${PN} += "${bindir}/*"
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
+++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
@@ -2,7 +2,6 @@ require recipes-ti/ipc/ti-ipc.inc
 require recipes-ti/ipc/ti-ipc-common.inc
 require ti-ipc-rtos.inc

-inherit deploy
 inherit update-alternatives

 DEPENDS = "ti-xdctools-native ti-sysbios doxygen-native zip-native"
@@ -100,17 +99,6 @@ ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${nonarch_base_libdir}/firmware/ipc/ti_
 ALTERNATIVE_TARGET[dra7-ipu1-fw.xem4] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4"
 ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4"

-do_deploy() {
-  install -d ${DEPLOYDIR}
-}
-
-do_deploy:append:omap-a15() {
-  install -d ${DEPLOYDIR}/ipc
-  install -m 0644 ${S}/packages/ti/ipc/tests/bin/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${DEPLOYDIR}/ipc/dra7-ipu1-fw.xem4
-}
-
-addtask deploy after do_install
-
 # Disable the "buildpaths" check while we figure out how we are
 # going to address this issue.
 #
Author	SHA1	Message	Date
LCPD Automation Script	d99cff5534	CI/CD Auto-Merger: cicd.scarthgap.202509181257 Updated the value(s) for: atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV k3conf: SRCREV 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=3c06cd621447331aeab0bbb2e5c063a2b1d79d1b..91c8a62c788c2d0efb733296336bf0e658727faf k3conf: https://git.ti.com/cgit/k3conf/k3conf/log/?qt=range&q=6dd352f234ef19c5cb92c924101e1eab29d2939a..f63ccd27cba9550de04e8dbb04bc6003d8b5168e linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=4235794ce373baf55d9ff5cf920b1d44b7e31455..e2b759994f9ed141d13b2f7a3ae8b9c51eb7e295 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=af3896fca24b7945db015d2ac411ef50e93a11c9..ccfe8fee8026cbb23dcd9c69a2bd961c99c58567 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-09-18 12:57:12 -05:00
Andrew Davis	d89a382c3a	mesa-pvr: Use PREFERRED_PROVIDER directly for GPU selection Now that display controller aliases are not set using PACKAGECONFIG, instead of using PREFERRED_PROVIDER to add either "sgx" or "pvr" to PACKAGECONFIG, followed by reading it back out, simply use PREFERRED_PROVIDER directly. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-09-17 17:42:13 -05:00
Andrew Davis	f7230c4868	mesa-pvr: Remove need for PVR/SGX display aliases Update mesa-pvr which includes a default set of display controller aliases for the supported display controllers. This means we do not have to manually set the alias for each device here in the integration layer. Remove that here. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-09-17 17:42:13 -05:00
Andrew Davis	903bc12962	ti-bsp: Use same version for both UM and KM driver The DRIVER and matching UMLIBS must always match, no need to define a version number for both. Keep this simple and remove the extra defines. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-09-17 17:42:13 -05:00
Andrew Davis	51cf5738f7	ti-bsp: Do not remove gpu MACHINE_FEATURE conditionally on BSP version Setting or removing the gpu MACHINE_FEATURE does not actually change if the GPU driver is built or not. That is done based on the setting of the BSP_{SGX,ROGUE}_{DRIVER,UMLIBS}_{PROVIDER,VERSION} vars. These are default empty for BSP versions without supported GPU drivers, which will correctly cause a fallback to SW rendering when the GPU driver is not available. As the "gpu" MACHINE_FEATURE now has no uses, remove it from all the machine config include files. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-09-17 17:42:13 -05:00
Andrew Davis	954a631aa3	ti-sgx-ddk-um: UM side driver depends on KM side driver This also matches what is done for ti-img-rogue-umlibs. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-09-17 17:42:13 -05:00
Suhaas Joshi	f99bb55265	optee: Update to 4.7.0 tag Update optee_client, optee_examples, optee_os and optee_test to the newer 4.7.0 tag from the previous 4.6.0 one. Further: meta-arm applies 0003-optee-enable-clang-support patch to optee_os. However, in a recent upstream commit [0], the line to which the patch applies was removed. Therefore the patch is no longer required. As a result, tell optee_os.bbappend file to remove it. [0] `3d5c2dd8b5` Signed-off-by: Suhaas Joshi <s-joshi@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-09-16 07:28:15 -05:00
LCPD Automation Script	0e2876e2ea	CI/CD Auto-Merger: cicd.scarthgap.202509111148 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV k3conf: SRCREV linux-ti-staging-rt_6.12: SRCREV_ARM32 linux-ti-staging_6.12: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=fb492164151831b90e961dd37fccc57a8fdc1257..bb242f4eee42835066d83345e4d64bc02307f855 u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=252b02299cf637f96be9c735a86ed5aad328e00c..3c06cd621447331aeab0bbb2e5c063a2b1d79d1b k3conf: https://git.ti.com/cgit/k3conf/k3conf/log/?qt=range&q=3de294db4f2cd75404f358768f4be8f8fa3132d7..6dd352f234ef19c5cb92c924101e1eab29d2939a linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=c0845caeb62fc6ea82d85a65f52efcfebb9b2c75..4235794ce373baf55d9ff5cf920b1d44b7e31455 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=26482216a39c9653ea319cd1d6e609b8d1f0fc12..af3896fca24b7945db015d2ac411ef50e93a11c9 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-09-11 11:48:40 -05:00
LCPD Automation Script	11a60314cf	CI/CD Auto-Merger: cicd.scarthgap.202508281316 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV u-boot-ti-staging_2025.01: SRCREV k3conf: SRCREV linux-ti-staging-rt_6.12: SRCREV_ARM32 linux-ti-staging_6.12: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=33b0116556a8a57e8e456a99e45e8736db7652f3..fb492164151831b90e961dd37fccc57a8fdc1257 u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=f3f8c664b3001e40cbdf46687732b2c37e1b6b33..252b02299cf637f96be9c735a86ed5aad328e00c k3conf: https://git.ti.com/cgit/k3conf/k3conf/log/?qt=range&q=4e8df1a41a1437b61562836e9478e8069d1a071c..3de294db4f2cd75404f358768f4be8f8fa3132d7 linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=9085e19579dfb5074d05000dcca3b9b7d8afb106..c0845caeb62fc6ea82d85a65f52efcfebb9b2c75 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=10c7960f9cf6c5e3ed0c8865596e07540bf9ba1b..26482216a39c9653ea319cd1d6e609b8d1f0fc12 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-08-28 13:16:26 -05:00
Telukula Jeevan Kumar Sahu	a0a480a189	conf: machine: Include merged device trees in the list of generated dtbs Add support for dtbs that are generated by merging multiple .dtb and .dtbo files in the /boot directory of the root filesystem.These merged device trees are defined in ti-linux-kernel Makefile[1]. Include them using the KERNEL_DEVICETREE_DTBMERGE variable. [1]: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/arch/arm64/boot/dts/ti/Makefile?h=ti-linux-6.12.y Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-26 19:02:09 -05:00
Bryan Brattlof	eb8b398f65	meta-ti-bsp: conf: drop BL32_BASE override for am62lxx-evm The BL32_BASE address is properly set in TF-A to jump to OP-TEE's entrypoint for the am62lxx SoC family, so we can safily drop this. Signed-off-by: Bryan Brattlof <bb@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-25 15:02:51 -05:00
Thorsten Lannynd	813a58e1ca	ti-bsp: recipes-multimedia: Add udev rules for VPU and JPEG encoder symlinks This patch introduces udev rules to ensure consistent device naming for VPU decoders, encoders, and the JPEG encoder. These rules are essential for enabling hardware-accelerated video decoding in Chromium using the V4L2 Stateful decoder. The following udev rules are added: - Map vpu and vpu0 to /dev/video-dec0 and /dev/video-enc0. - Map vpu1 to /dev/video-dec1 and /dev/video-enc1. - Map the JPEG encoder to /dev/jpeg-enc0. These changes ensure proper operation of the VPU and JPEG encoder, especially when other video devices are connected, avoiding mismatches. Signed-off-by: Thorsten Lannynd <t-lannynd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-25 08:40:53 -05:00
LCPD Automation Script	2e648fa3fd	CI/CD Auto-Merger: cicd.scarthgap.202508220021 Updated the value(s) for: u-boot-ti-staging_2025.01: SRCREV linux-ti-staging-rt_6.12: PV_ARM32,SRCREV_ARM32 linux-ti-staging_6.12: PV,SRCREV Changelogs: u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=935b381a868777ce757ae732543b219b7ffba226..f3f8c664b3001e40cbdf46687732b2c37e1b6b33 linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=95eefa7f7f59e2fe2929d2edbc0e21793b9d79c6..9085e19579dfb5074d05000dcca3b9b7d8afb106 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=47b05100094a1b6ba8b1cba913a17ed73a47f581..10c7960f9cf6c5e3ed0c8865596e07540bf9ba1b Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-08-22 00:21:13 -05:00
Ryan Eatmon	fbd924cfb1	ti-ipc-examples-linux: Add missing SUMMARY The PRC script missed this. All recipes need a SUMMARY. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-21 19:48:45 -05:00
LCPD Automation Script	fec8c90525	CI/CD Auto-Merger: cicd.scarthgap.202508211416 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV linux-ti-staging-rt_6.12: SRCREV_ARM32 linux-ti-staging_6.12: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=6506f9e1e5d8d62e9dd70123fae04bd07b90bcd5..33b0116556a8a57e8e456a99e45e8736db7652f3 u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=556593b8d5f39ad77327d2e7aa190d3faae5a350..935b381a868777ce757ae732543b219b7ffba226 linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=6246158ffbe4dfc005258a52780956f8baf04574..95eefa7f7f59e2fe2929d2edbc0e21793b9d79c6 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=fe4718a972cfcac11933e98f5a3986e084a7c43f..47b05100094a1b6ba8b1cba913a17ed73a47f581 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-08-21 14:16:37 -05:00
LCPD Automation Script	76f78bab9b	CI/CD Auto-Merger: cicd.scarthgap.202508201111 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV linux-ti-staging-rt_6.12: PV_ARM32,SRCREV_ARM32 linux-ti-staging_6.12: PV,SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=e89a348f4618a26812fb353a04ed9532ef890a2f..6506f9e1e5d8d62e9dd70123fae04bd07b90bcd5 u-boot-ti-staging_2025.01: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=c5737097b4859362aa22260c5a1f2becd62af65c..556593b8d5f39ad77327d2e7aa190d3faae5a350 linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=90225824e8382c00e9628168922838a0702443eb..6246158ffbe4dfc005258a52780956f8baf04574 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=adbec2562ad14236717dc1c9dc3020c94ba27f7d..fe4718a972cfcac11933e98f5a3986e084a7c43f Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-08-20 11:11:41 -05:00
Bryan Brattlof	0a02cd559a	conf: machine: add optee-os into am62lxx-evm builds Newer silicon revision of the AM62L family are capable of reliably booting with OP-TEE integrated in the bootflow with all bootmedia. However to support as many DDR densities as possible we cannot use the default 0x9e78000 location as with other K3 devices. So add OP-TEE back into the default build but modify the BL32 base address for TF-A so it will jump to the correct location. Signed-off-by: Bryan Brattlof <bb@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-19 16:00:22 -05:00
Beleswar Padhi	7ea7feede0	ti-ipc.inc: Bump SRCREV to latest for ipcdev project The latest tag in ipcdev project is 3.52.00.01. Update SRCREV to the latest tag. Signed-off-by: Beleswar Padhi <b-padhi@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-19 09:01:02 -05:00
Beleswar Padhi	53ba440227	ti-rtos-messageq-test-fw: Add a recipe to package prebuilt IPC firmware The messageq IPC firmware example for AM57xx SoCs is available in ti-linux-firmware repository. Add a recipe to package the prebuilt messageq firmware into the rootfs. Additionally, make sure the firmware for IPU1 rproc is copied into boot partition by updating the dependency in omap-a15 machine conf to the above recipe. This is needed for Early Boot use cases and gets rid of dependency on meta-ti-extras layer. There is no need to deploy the vayu IPC firmware anymore. Remove the deploy task from ti-ipc-rtos recipe. Signed-off-by: Beleswar Padhi <b-padhi@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-19 09:01:02 -05:00
Beleswar Padhi	b2e9a43534	ti-ipc-examples-linux: Add a recipe to build messageq app_host Add a recipe to build the Application Host (for A15 core) to demonstrate IPC with remote processors through messageq firmware. Also package this in the /usr/bin directory for testing IPC. This recipe only builds the app_host, and the firmwares are available in ti-linux-firmware repository. Signed-off-by: Beleswar Padhi <b-padhi@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-19 09:01:02 -05:00
Andrew Davis	a09b2e73e7	meta-ti-bsp: Add all tiboot3.bin and sysfw.itb variants by wildcard U-Boot generates all the valid versions of tiboot3.bin and sysfw.itb based on the given defconfig. The defaults are also picked based on the board's binman files. No need to duplicate this logic here, simply deploy what U-Boot generates. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-19 09:00:36 -05:00
Brandon Brnich	49354b88a8	ti-bsp: ti-img-encode-decode: Update SRCREV V4L2 has updated fh_add/delete to take another parameter in linux-next. The update has been made in out-of-tree module to fix build failure. Signed-off-by: Brandon Brnich <b-brnich@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-15 10:25:23 -05:00
LCPD Automation Script	d9556f3fd7	CI/CD Auto-Merger: cicd.scarthgap.202508131800 Updated the value(s) for: atf: SRCREV_tfa:am62lxx u-boot-ti-staging_2025.01: SRCREV k3conf: SRCREV 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=05d141ca0739756a0cdd7a19268e3ad07279a17e..c5737097b4859362aa22260c5a1f2becd62af65c k3conf: https://git.ti.com/cgit/k3conf/k3conf/log/?qt=range&q=b35ec6f6c6e11471c5d06f8c24ac396077f893be..4e8df1a41a1437b61562836e9478e8069d1a071c linux-ti-staging-rt_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=2bcb6e9caabf65ef182dde7dc0332a7fe53622a2..90225824e8382c00e9628168922838a0702443eb linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=c94f90807b390a224fd087549b4bd5d84d5fc971..adbec2562ad14236717dc1c9dc3020c94ba27f7d Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2025-08-13 18:00:08 -05:00
Denys Dmytriyenko	72b2e09640	meta-beagle: conf/machine rework all DTB lists Improve KERNEL_DEVICETREE lists for all Beagle platforms: * Expand the list with more overlays and related DTBs * Since in many cases the lists are slightly different between 6.6 and 6.12 kernels, explicitly provide both separate lists * PocketBeagle2 is only supported by 6.12, so one list for now Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-10 14:33:18 -05:00
Denys Dmytriyenko	eeaade3f1d	linux-bb.org_6.12: upgrade to the latest 6.12.34 Upgrade BB.org 6.12 kernel to the latest 6.12.34 tags. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-10 14:33:18 -05:00
Denys Dmytriyenko	12a5234ea4	u-boot-bb.org: upgrade 2025.04 -> 2025.07 Upgrade BB.org U-boot from 2025.04 to 2025.07 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-10 14:33:18 -05:00
Denys Dmytriyenko	5632ab93f4	linux-bb.org_6.6: update to the latest Update BB.org 6.6 kernel to the latest tags. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2025-08-10 14:33:18 -05:00