ti-img-rogue-driver_24.1: gcc 14 compat

Bump this recipe to add a change to help with GCC 14 compatibility in the check-cc script used to check compiler flags before use. Signed-off-by: Randolph Sapp <rs@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
ti-img-rogue-*_23.3: gcc 14 compat and branch sel
2026-04-18 10:42:32 +00:00 · 2024-07-01 08:58:02 -05:00 · 2024-07-01 08:58:02 -05:00 · 2024-07-01 08:58:02 -05:00 · 2024-07-01 08:58:02 -05:00 · 2024-07-01 08:58:02 -05:00
234 changed files with 1438 additions and 2592 deletions
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+This TODO list allows us to track certain actions and lists of patches that
+need to be removed at a future date.
--- a/check_yocto_rules.json
+++ b/check_yocto_rules.json
@@ -1,31 +0,0 @@
-{
-    "APPEND-1" : {
-        "skip_vars" : [ "ALTERNATIVE", "FILES", "INSANE_SKIP", "RDEPENDS", "RRECOMMENDS" ]
-    },
-    "APPEND-2" : {
-        "skip_vars" : [ "KERNEL_LOCALVERSION", "PR", "PV" ],
-        "file_regex" : {
-            "meta-ti-bsp\\/recipes-graphics\\/mesa\\/mesa-pvr_\\S+\\.bb" : {
-                "skip_vars": [ "GALLIUMDRIVERS", "VULKAN_DRIVERS" ]
-            },
-            "meta-ti-bsp\\/recipes-graphics\\/mesa\\/mesa-pvr\\.inc" : {
-                "skip_vars": [ "TOOLS", "TOOLS_DEPS", "GALLIUMDRIVERS", "VULKAN_DRIVERS" ]
-            }
-        }
-    },
-    "GUARD-1" : {
-        "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"
-        ]
-    },
-    "GUARD-2" : {
-        "skip_vars" : [ "k3" , "ti-soc" ]
-    },
-    "SUMMARY-1" : {
-        "skip_files" : [
-            "meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb"
-        ]
-    }
-}
--- a/meta-beagle/COPYING.MIT
+++ b/meta-beagle/COPYING.MIT
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--- a/meta-beagle/README
+++ b/meta-beagle/README
@@ -1,31 +0,0 @@
-OpenEmbedded/Yocto layer that extends meta-ti-bsp with BeagleBoard.org platforms.
-
-It is hosted on http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/ with the
-source repository at git://git.yoctoproject.org/meta-ti
-
-
-This layer depends on:
-
-URI: git://git.openembedded.org/openembedded-core
-layers: meta
-branch: master
-
-URI: git://git.yoctoproject.org/meta-arm
-layers: meta-arm
-branch: master
-
-URI: git://git.yoctoproject.org/meta-ti
-branch: master
-revision: HEAD
-layers: meta-ti-bsp
-
-
-Send pull requests, patches, comments or questions to:
-meta-ti@lists.yoctoproject.org
-
-Please note - meta-ti mailing list requires subscription for posting:
-https://lists.yoctoproject.org/g/meta-ti
-
-Maintainers:
-Denys Dmytriyenko <denys@konsulko.com>
-Ryan Eatmon <reatmon@ti.com>
--- a/meta-beagle/SECURITY
+++ b/meta-beagle/SECURITY
@@ -1,20 +0,0 @@
-How to Report a Potential Vulnerability?
-========================================
-
-If you would like to report a public issue (for example, one with a released
-CVE number), please report it to the mailing list:
-
-  https://lists.yoctoproject.org/g/meta-ti
-
-If you are dealing with a not-yet released or urgent issue, please send a
-message to one of the maintainers listed in the README.  Include as many
-details as possible:
-  - the layer or software module affected
-  - the recipe and its version
-  - any example code, if available
-
-Branches maintained with security fixes
---------------------------------------
-
-See https://wiki.yoctoproject.org/wiki/Releases for the list of current
-releases.  We only accept patches for the LTS releases and the master branch.
--- a/meta-beagle/conf/layer.conf
+++ b/meta-beagle/conf/layer.conf
@@ -1,17 +0,0 @@
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "meta-beagle"
-BBFILE_PATTERN_meta-beagle := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-beagle = "6"
-
-LAYERSERIES_COMPAT_meta-beagle = "scarthgap"
-
-LAYERDEPENDS_meta-beagle = " \
-    meta-ti-bsp \
-"
-
-HOSTTOOLS_NONFATAL += "lz4c"
--- a/meta-beagle/conf/machine/beagleplay-k3r5.conf
+++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeaglePlay (R5F)
-#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
-
-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/beagley-ai-k3r5.conf
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleY AI (R5F)
-#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
-
-require conf/machine/include/k3r5.inc
-require conf/machine/include/beagle-bsp.inc
-
-SYSFW_SOC = "j722s"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "j722s_evm_r5_defconfig"
-UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
--- a/meta-beagle/conf/machine/beagley-ai.conf
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -1,29 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleY AI (A53)
-#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
-
-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"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-j722s \
-"
-
-KERNEL_DEVICETREE = ""
-
-KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
-ti/k3-j722s-evm.dtb \
-ti/k3-am67a-beagley-ai.dtb \
-"
-
-KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
-ti/k3-j722s-evm.dtb \
-ti/k3-am67a-beagley-ai.dtb \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-beagle/conf/machine/include/beagle-bsp.inc
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -1,71 +0,0 @@
-# Use meta-ti-bsp "multi-BSP" facility to create a custom "bb_org" BSP profile
-# with default preferences for Beagle platforms
-
-# 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
-# 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.%"
-
-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.6
-MACHINE_FEATURES:remove:bsp-bb_org-6_12 = "gc320"
-
-# ==========
-# bb_org-6_6
-# BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07
-# 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_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.%"
-
-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
-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
@@ -1,12 +0,0 @@
-#@TYPE: Machine
-#@NAME: PocketBeagle2 (R5F)
-#@DESCRIPTION: Machine configuration for the PocketBeagle2 (R5F core)
-
-require conf/machine/include/k3r5.inc
-require conf/machine/include/beagle-bsp.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am6232_pocketbeagle2_r5_defconfig"
--- a/meta-beagle/conf/machine/pocketbeagle2.conf
+++ b/meta-beagle/conf/machine/pocketbeagle2.conf
@@ -1,28 +0,0 @@
-#@TYPE: Machine
-#@NAME: PocketBeagle2 (A53)
-#@DESCRIPTION: Machine configuration for the PocketBeagle2 board (A53 core)
-
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-require conf/machine/include/beagle-bsp.inc
-
-SOC_FAMILY:append = ":am62xx"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
-UBOOT_MACHINE = "am6232_pocketbeagle2_a53_defconfig"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am6232 \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am6232-pocketbeagle2.dtb \
-    ti/k3-am6232-pocketbeagle2-techlab-cape.dtbo \
-"
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
@@ -1 +0,0 @@
-CONFIG_BOOTCOMMAND="run bootcmd_ti_mmc"
--- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb
@@ -1,12 +0,0 @@
-require recipes-bsp/u-boot/u-boot-ti.inc
-
-SUMMARY = "BeagleBoard.org U-Boot"
-
-COMPATIBLE_MACHINE = "beagle.*"
-
-PV = "2024.10"
-
-UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
-UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2024.10-Beagle"
-SRCREV = "bf0e9d0b7274d2b561bd24c858affec2038250f9"
--- 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-kernel/linux/linux-bb.org-6.12/defconfig
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.12/defconfig
@@ -1 +0,0 @@
-use-kernel-config=bb.org_defconfig
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig
@@ -1 +0,0 @@
-use-kernel-config=bb.org_defconfig
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg
@@ -1 +0,0 @@
-CONFIG_FORTIFY_SOURCE=n
--- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
@@ -1,68 +0,0 @@
-# Look in the generic major.minor directory for files
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
-
-SECTION = "kernel"
-SUMMARY = "BeagleBoard.org Linux kernel"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-COMPATIBLE_MACHINE = "pocketbeagle2|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 = " \
-${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 \
-"
-
-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.22 version for 64-bit
-SRCREV:aarch64 = "9e43fd19ece3affb9406e87ec3df733b91b77a4f"
-PV:aarch64 = "6.12.22+git"
-BRANCH:aarch64 = "v6.12.22-ti-arm64-r35"
-
-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
@@ -1,71 +0,0 @@
-# Look in the generic major.minor directory for files
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
-
-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 = " \
-${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 \
-"
-
-S = "${WORKDIR}/git"
-
-# 6.6.58 version for 32-bit
-SRCREV:armv7a = "0d043a88f69f48789e43526d7a807ab744708071"
-PV:armv7a = "6.6.58+git"
-BRANCH:armv7a = "v6.6.58-ti-arm32-r10"
-
-# 6.6.58 version for 64-bit
-SRCREV:aarch64 = "0987ef737c9812374607475972f0868b8fecbbf7"
-PV:aarch64 = "6.6.58+git"
-BRANCH:aarch64 = "v6.6.58-ti-arm64-r23"
-
-KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
-
-SRC_URI += "file://no-fortify.cfg"
-KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/no-fortify.cfg"
--- a/meta-ti-bsp/README
+++ b/meta-ti-bsp/README
@@ -8,11 +8,11 @@ This layer depends on:

 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: scarthgap
+branch: master

 URI: git://git.yoctoproject.org/meta-arm
 layers: meta-arm
-branch: scarthgap
+branch: master


 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
--- a/meta-ti-bsp/SECURITY
+++ b/meta-ti-bsp/SECURITY
@@ -1,20 +0,0 @@
-How to Report a Potential Vulnerability?
-========================================
-
-If you would like to report a public issue (for example, one with a released
-CVE number), please report it to the mailing list:
-
-  https://lists.yoctoproject.org/g/meta-ti
-
-If you are dealing with a not-yet released or urgent issue, please send a
-message to one of the maintainers listed in the README.  Include as many
-details as possible:
-  - the layer or software module affected
-  - the recipe and its version
-  - any example code, if available
-
-Branches maintained with security fixes
---------------------------------------
-
-See https://wiki.yoctoproject.org/wiki/Releases for the list of current
-releases.  We only accept patches for the LTS releases and the master branch.
--- a/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass
+++ b/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass
@@ -316,7 +316,6 @@ EOF
 # $4 ... ramdisk ID
 # $5 ... config ID
 # $6 ... tee ID/name
-# $7 ... default DTB ID
 fitimage_emit_section_config() {

 	conf_csum=${FITIMAGE_HASH_ALGO}
@@ -371,16 +370,6 @@ fitimage_emit_section_config() {
 		final_conf_desc="${conf_desc}"
 	fi

-	default_dtb_count=${7}
-	if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then
-		default_conf_name="${FIT_CONF_DEFAULT_DTB}"
-	else
-		default_conf_name="conf-${default_dtb_count}"
-	fi
-	cat << EOF >> ${1}
-        default = "${default_conf_name}";
-EOF
-
 	dtbcount=1
 	for DTB in ${KERNEL_DEVICETREE}; do
 		DTB=$(basename "${DTB}")
@@ -397,6 +386,12 @@ EOF
 			fdt_line="fdt = \"fdt-${dtbcount}\";"
 		fi

+		if [ "x${dtbcount}" = "x1" ]; then
+			cat << EOF >> ${1}
+                default = "${conf_name}";
+EOF
+		fi
+
 # Generate a single configuration section
 			cat << EOF >> ${1}
                ${conf_name} {
@@ -529,7 +524,6 @@ fitimage_assemble() {
 	ramdiskcount=${3}
 	setupcount=""
 	teecount=1
-	default_dtb_count=1
 	rm -f ${1} arch/${ARCH}/boot/${2}

 	fitimage_emit_fit_header ${1}
@@ -550,9 +544,6 @@ fitimage_assemble() {
 		dtbcount=1
 		dtboaddress="${UBOOT_DTBO_LOADADDRESS}"
 		for DTB in ${KERNEL_DEVICETREE}; do
-			if [ "${DTB}" = "${FIT_CONF_DEFAULT_DTB}" ]; then
-				default_dtb_count=${dtbcount}
-			fi
 			if echo ${DTB} | grep -q '/dts/'; then
 				bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
 				DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
@@ -669,7 +660,7 @@ fitimage_assemble() {
 	else
 		teeref="${teecount}"
 	fi
-	fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}" "${default_dtb_count}"
+	fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}"

 	fitimage_emit_section_maint ${1} sectend

--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-bsp"
 BBFILE_PATTERN_meta-ti-bsp := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti-bsp = "6"

-LAYERSERIES_COMPAT_meta-ti-bsp = "scarthgap"
+LAYERSERIES_COMPAT_meta-ti-bsp = "scarthgap styhead"

 LICENSE_PATH += "${LAYERDIR}/licenses"

@@ -18,6 +18,10 @@ LAYERDEPENDS_meta-ti-bsp = " \
    meta-arm \
 "

+BBFILES_DYNAMIC += " \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes*/*/*.bbappend \
+"
+
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
    mesa-pvr \
 "
--- 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 13000"

 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
--- a/meta-ti-bsp/conf/machine/am57xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf
@@ -25,22 +25,13 @@ KERNEL_DEVICETREE_DTBMERGE = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/omap/am571x-idk-touchscreen.dtbo \
-    ti/omap/am571x-idk.dtb \
-    ti/omap/am5729-beagleboneai.dtb \
-    ti/omap/am572x-idk-touchscreen.dtbo \
-    ti/omap/am572x-idk.dtb \
-    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-beagle-x15.dtb \
-    ti/omap/am57xx-cl-som-am57x.dtb \
-    ti/omap/am57xx-evm-reva3.dtb \
-    ti/omap/am57xx-evm.dtb \
-    ti/omap/am57xx-evm.dtbo \
-    ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \
-    ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \
-    ti/omap/am57xx-sbc-am57x.dtb \
+    ti/omap/am5729-beagleboneai.dtb \
+    ti/omap/am571x-idk.dtb \
+    ti/omap/am572x-idk.dtb \
+    ti/omap/am574x-idk.dtb \
 "

 UBOOT_MACHINE = "am57xx_evm_config"
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -12,14 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/k3-am62a7-phyboard-lyra-rdk.dtb \
    ti/k3-am62a7-sk.dtb \
-    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-hdmi-audio.dtbo \
 "

-FIT_CONF_DEFAULT_DTB = "ti/k3-am62a7-sk.dtb"
-
 UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62D HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62D EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62dx"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62dx_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am62dxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm.conf
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62DXX EVM
-#@DESCRIPTION: Machine configuration for the TI AM62DXX EVM
-
-require conf/machine/include/am62dxx.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62d2 \
-    ti/k3-am62a7-sk-edgeai \
-"
-
-KERNEL_DEVICETREE = ""
-
-FIT_CONF_DEFAULT_DTB = "ti/k3-am62d2-evm.dtb"
-
-UBOOT_MACHINE = "am62dx_evm_a53_defconfig"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-dac-fw"
--- a/meta-ti-bsp/conf/machine/am62lxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62lxx-evm.conf
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62L EVM
-#@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"
-
-MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"
-
-UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62l \
-"
-
-KERNEL_DEVICETREE = ""
-
-UBOOT_MACHINE = "am62lx_evm_defconfig"
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -10,5 +10,3 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62px_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -10,26 +10,17 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62x-sk-csi2 \
    ti/k3-am62x-sk-hdmi \
    ti/k3-am62x-sk-lpm \
-    ti/k3-v3link \
 "

 KERNEL_DEVICETREE = " \
    ti/k3-am62p5-sk.dtb \
-    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-hdmi-audio.dtbo \
 "

-FIT_CONF_DEFAULT_DTB = "ti/k3-am62p5-sk.dtb"
-
 UBOOT_MACHINE = "am62px_evm_a53_defconfig"

 # UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
 # along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
 # under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
 # For AM62P tisdk-display-cluster image, splash screen is handled by SBL.
-# Hence, disable the A53 based splash screen using the am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree
-UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
+# Hence, disable the A53 based splash screen using the am62px_evm_prune_splashscreen.config fragment present in ti-u-boot tree
+UBOOT_CONFIG_FRAGMENTS = "${@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
@@ -10,5 +10,3 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -11,26 +11,7 @@ KERNEL_DEVICETREE_PREFIX = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-    ti/k3-am625-beagleplay.dtb \
-    ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo \
-    ti/k3-am625-phyboard-lyra-rdk.dtb \
    ti/k3-am625-sk.dtb \
-    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
-    ti/k3-am625-verdin-nonwifi-dev.dtb \
-    ti/k3-am625-verdin-nonwifi-mallow.dtb \
-    ti/k3-am625-verdin-nonwifi-yavia.dtb \
-    ti/k3-am625-verdin-wifi-dahlia.dtb \
-    ti/k3-am625-verdin-wifi-dev.dtb \
-    ti/k3-am625-verdin-wifi-mallow.dtb \
-    ti/k3-am625-verdin-wifi-yavia.dtb \
-    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-hdmi-audio.dtbo \
 "

-FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
-
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -10,5 +10,3 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"

 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -8,21 +8,13 @@ require conf/machine/include/ti-extras.inc
 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62-lp \
    ti/k3-am625-sk \
-    ti/k3-am62x-sk-dmtimer-pwm \
-    ti/k3-am62x-sk-eqep \
    ti/k3-am62x-sk-hdmi \
    ti/k3-am62x-sk-lpm \
    ti/k3-am62x-sk-mcan \
-    ti/k3-am62x-sk-pwm \
 "

 KERNEL_DEVICETREE = " \
-    ti/k3-am62-lp-sk-nand.dtbo \
    ti/k3-am62-lp-sk.dtb \
-    ti/k3-am625-sk.dtb \
-    ti/k3-am62x-sk-hdmi-audio.dtbo \
 "

-FIT_CONF_DEFAULT_DTB = "ti/k3-am62-lp-sk.dtb"
-
 UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -13,8 +13,6 @@ KERNEL_DEVICETREE = " \
    ti/k3-am625-sk.dtb \
 "

-FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
-
 UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"

 UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am68-sk.conf
+++ b/meta-ti-bsp/conf/machine/am68-sk.conf
@@ -11,13 +11,10 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am68-sk \
    ti/k3-fpdlink \
    ti/k3-v3link \
-    ti/k3-j721e-sk-csi2-dual-imx219 \
-    ti/k3-j721e-sk-fpdlink-fusion \
 "

 KERNEL_DEVICETREE = " \
    ti/k3-am68-sk-base-board.dtb \
-    ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
 "

 UBOOT_MACHINE = "am68_sk_a72_defconfig"
--- a/meta-ti-bsp/conf/machine/am69-sk.conf
+++ b/meta-ti-bsp/conf/machine/am69-sk.conf
@@ -11,14 +11,10 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am69-sk \
    ti/k3-fpdlink \
    ti/k3-v3link \
-    ti/k3-am68-sk-v3link-fusion \
-    ti/k3-j721e-sk-csi2-dual-imx219 \
-    ti/k3-j721e-sk-fpdlink-fusion \
 "

 KERNEL_DEVICETREE = " \
    ti/k3-am69-sk.dtb \
-    ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
 "

 UBOOT_MACHINE = "am69_sk_a72_defconfig"
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
@@ -2,12 +2,13 @@
 #@NAME: BeagleBoard X15
 #@DESCRIPTION: Machine configuration for the BeagleBoard X15

+TI_PREFERRED_BSP ?= "bb_org"
+
 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 = ""
+DT_VENDOR_PREFIX:bsp-bb_org = ""

 KERNEL_DEVICETREE_PREFIX = " \
 ${DT_VENDOR_PREFIX}am57xx-beagle-x15 \
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
@@ -2,8 +2,9 @@
 #@NAME: BeagleBone AI-64 (R5F)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core)

+TI_PREFERRED_BSP ?= "bb_org"
+
 require conf/machine/include/k3r5.inc
-require conf/machine/include/beagle-bsp.inc

 SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
@@ -15,10 +16,8 @@ UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
 UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"

-UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"
+UBOOT_MACHINE = "j721e_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_r5_defconfig"

-UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_r5_defconfig"
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
 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-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -2,23 +2,21 @@
 #@NAME: BeagleBone AI-64 (A72)
 #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)

+TI_PREFERRED_BSP ?= "bb_org"
+
 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 = ""
+IMAGE_SR1_1_HS_FS_FILES:bsp-bb_org = ""
+IMAGE_SR2_HS_SE_FILES:bsp-bb_org = ""

-UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig"
+UBOOT_MACHINE = "j721e_evm_a72_config"
+UBOOT_MACHINE:bsp-ti-6_6 = "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_CONFIG_FRAGMENTS:bsp-bb_org = "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"
+SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
+SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-j721e \
@@ -32,7 +30,7 @@ ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
 ti/k3-j721e-sk.dtb \
 "

-KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
+KERNEL_DEVICETREE:append:bsp-bb_org = " \
 ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
 ti/k3-j721e-common-proc-board-infotainment.dtbo \
 ti/k3-j721e-evm-csi2-ov5640.dtbo \
@@ -46,9 +44,3 @@ ti/k3-j721e-sk-rpi-hdr-ehrpwm.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-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
@@ -2,12 +2,13 @@
 #@NAME: BeagleBone machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board

+TI_PREFERRED_BSP ?= "bb_org"
+
 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 = ""
+DT_VENDOR_PREFIX:bsp-bb_org = ""

 KERNEL_DEVICETREE_PREFIX = " \
 ${DT_VENDOR_PREFIX}am335x-bone \
--- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
@@ -8,7 +8,9 @@ SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"

-UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig"

+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
 UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"
--- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
@@ -1,46 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeaglePlay (A53)
-#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
-
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-SOC_FAMILY:append = ":am62xx"
-
-MACHINE_FEATURES += "screen gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
-UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
-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"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am625-beagle \
-    ti/k3-am625-sk \
-    ti/k3-am62x-sk \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-    ti/k3-am625-beagleplay.dtb \
-    ti/k3-am625-sk.dtb \
-    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-hdmi-audio.dtbo \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -2,15 +2,43 @@
 #@NAME: BeaglePlay (A53)
 #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)

-require conf/machine/beagleplay-ti.conf
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":am62xx"

-require conf/machine/include/beagle-bsp.inc
+MACHINE_FEATURES += "screen gpu"

-UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig"
+SERIAL_CONSOLES = "115200;ttyS2"

-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config"
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

-KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_a53.config"
+
+SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
+SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+ti/k3-am625-beagleplay.dtb \
+ti/k3-am625-sk.dtb \
+ti/k3-am62x-sk-hdmi-audio.dtbo \
+"
+
+KERNEL_DEVICETREE:append:bsp-bb_org = " \
 ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
 ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
 ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
@@ -47,29 +75,4 @@ ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
 ti/k3-am62x-sk-mcan.dtbo \
 "

-KERNEL_DEVICETREE:append: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 \
-ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-minimal.dtb \
-ti/k3-am625-sk.dtb \
-ti/k3-am625-sk-ecap-capture.dtbo \
-ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk-m2-cc3301.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-eqep.dtbo \
-ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \
-ti/k3-am62x-sk-hdmi-audio.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 \
-"
+MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am62axx"

 MACHINE_FEATURES += "screen touchscreen"
@@ -10,6 +8,9 @@ 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 GP
+IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-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"

--- a/meta-ti-bsp/conf/machine/include/am62dxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62dxx.inc
@@ -1,15 +0,0 @@
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-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/am62lxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62lxx.inc
@@ -1,9 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am62lxx"
-
-MACHINE_FEATURES += "screen"
-
-TFA_BOARD = "am62l"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62lx"
--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am62pxx"

 MACHINE_FEATURES += "screen gpu"
@@ -11,9 +9,6 @@ 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
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am62xx"

 MACHINE_FEATURES += "screen gpu"
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -1,23 +1,11 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am64xx"

 KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"

 KERNEL_DEVICETREE = " \
-    ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
-    ti/k3-am642-evm-icssg1-dualemac.dtbo \
-    ti/k3-am642-evm-nand.dtbo \
    ti/k3-am642-evm.dtb \
-    ti/k3-am642-hummingboard-t-pcie.dtbo \
-    ti/k3-am642-hummingboard-t-usb3.dtbo \
-    ti/k3-am642-hummingboard-t.dtb \
-    ti/k3-am642-phyboard-electra-gpio-fan.dtbo \
-    ti/k3-am642-phyboard-electra-pcie-usb2.dtbo \
-    ti/k3-am642-phyboard-electra-rdk.dtb \
    ti/k3-am642-sk.dtb \
-    ti/k3-am642-tqma64xxl-mbax4xxl.dtb \
 "

 # Default tiboot3.bin on AM64x is for SR2.0 HS-FS
@@ -34,5 +22,3 @@ TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am64x"

 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw"
-
-TI_WKS_BOOTLOADER_APPEND="console=ttyS2,115200n8"
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am65xx"

 MACHINE_FEATURES += "screen touchscreen gpu"
@@ -11,18 +9,7 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
 KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"

 KERNEL_DEVICETREE = " \
-    ti/k3-am654-base-board-rocktech-rk101-panel.dtbo \
    ti/k3-am654-base-board.dtb \
-    ti/k3-am654-icssg2.dtbo \
-    ti/k3-am654-idk.dtbo \
-    ti/k3-am654-pcie-usb2.dtbo \
-    ti/k3-am654-pcie-usb3.dtbo \
-    ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtbo \
-    ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtbo \
-    ti/k3-am6548-iot2050-advanced-m2.dtb \
-    ti/k3-am6548-iot2050-advanced-pg2.dtb \
-    ti/k3-am6548-iot2050-advanced-sm.dtb \
-    ti/k3-am6548-iot2050-advanced.dtb \
 "

 IMAGE_BOOT_FILES += "sysfw.itb"
--- a/meta-ti-bsp/conf/machine/include/am68.inc
+++ b/meta-ti-bsp/conf/machine/include/am68.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j721s2"

 MACHINE_FEATURES += "screen gpu"
--- a/meta-ti-bsp/conf/machine/include/am69.inc
+++ b/meta-ti-bsp/conf/machine/include/am69.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j784s4"

 MACHINE_FEATURES += "screen gpu"
@@ -18,4 +16,4 @@ TFA_BOARD = "j784s4"

 OPTEEMACHINE = "k3-j784s4"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j7200"

 # Default tiboot3.bin on J7200 is for GP
@@ -26,4 +24,4 @@ TFA_BOARD = "generic"

 OPTEEMACHINE = "k3-j721e"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw-j7200"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw"
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j721e"

 MACHINE_FEATURES += "screen gpu"
@@ -36,8 +34,4 @@ TFA_BOARD = "generic"

 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}"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j721s2"

 MACHINE_FEATURES += "screen gpu"
--- a/meta-ti-bsp/conf/machine/include/j722s.inc
+++ b/meta-ti-bsp/conf/machine/include/j722s.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j722s"

 MACHINE_FEATURES += "screen gpu"
@@ -13,7 +11,6 @@ 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}"

--- a/meta-ti-bsp/conf/machine/include/j742s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j742s2.inc
@@ -1,21 +0,0 @@
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-SOC_FAMILY:append = ":j742s2"
-
-MACHINE_FEATURES += "screen gpu"
-
-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"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw"
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -1,6 +1,4 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j784s4"

 MACHINE_FEATURES += "screen gpu"
@@ -21,4 +19,4 @@ TFA_BOARD = "j784s4"

 OPTEEMACHINE = "k3-j784s4"

-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -3,8 +3,9 @@
 require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":k3"

-DEFAULTTUNE ?= "aarch64"
-require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+BBMULTICONFIG += "k3r5"

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

@@ -25,6 +26,10 @@ 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"

@@ -39,7 +44,7 @@ TFA_PLATFORM = "k3"
 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_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci"

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

@@ -51,13 +56,7 @@ MACHINE_FEATURES += "efi"

 WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"

-TI_WKS_BOOTLOADER_APPEND ?= ""
-
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
+do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"

 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
-
-FALCON_INCLUDE = ""
-FALCON_INCLUDE:ti-falcon = "conf/machine/include/ti-falcon.inc"
-
-require ${FALCON_INCLUDE}
--- a/meta-ti-bsp/conf/machine/include/mc_k3r5.inc
+++ b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc
@@ -1,3 +0,0 @@
-BBMULTICONFIG += "k3r5"
-
-do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -48,6 +48,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc3

 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"
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[depends] += "ti-ipc-rtos:do_deploy"
--- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
@@ -3,8 +3,8 @@
 # preferences for kernel, bootloader and graphics components, as
 # well as a dedicated machine override.

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

 # Use bsp-* namespace for overrides
 MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:"
@@ -22,70 +22,42 @@ BSP_BOOTLOADER_VERSION:bsp-mainline = "%"
 # 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"
-
 # ==========
 # next
 # upcoming upstream/mainline kernel, u-boot
 # ==========
 BSP_KERNEL_PROVIDER:bsp-next = "linux-ti-next"
 BSP_KERNEL_VERSION:bsp-next = "%"
-BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-next"
+BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-mainline"
 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"
-
-# ==========
-# ti-6_12
-# TI staging kernel 6.12, u-boot 2025.01
-# ==========
-BSP_KERNEL_PROVIDER:bsp-ti-6_12 = "linux-ti-staging"
-BSP_KERNEL_VERSION:bsp-ti-6_12 = "6.12%"
-BSP_BOOTLOADER_PROVIDER:bsp-ti-6_12 = "u-boot-ti-staging"
-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%"
-
 # ==========
 # ti-6_6
 # TI staging kernel 6.6, u-boot 2024.04
 # ==========
 BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging"
-BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6.%"
+BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%"
 BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging"
-BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"
+BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024%"

-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%"
+# Only Rogue is enabled so far, SGX falls back to SW rendering
 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
-MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320"
+BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%"

 # ==========
 # 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_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_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023%"

 BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%"
@@ -95,8 +67,24 @@ 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"
+# ==========
+# bb_org
+# 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 = "linux-bb.org"
+BSP_KERNEL_VERSION:bsp-bb_org = "%"
+BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org"
+BSP_BOOTLOADER_VERSION:bsp-bb_org = "%"
+
+BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%"
+BSP_MESA_PVR_VERSION:bsp-bb_org = "22%"

 # ==========
 # sane fallback defaults
@@ -121,7 +109,6 @@ BSP_MESA_PVR_VERSION ?= ""
 # ==========
 PREFERRED_PROVIDER_virtual/kernel ?= "${BSP_KERNEL_PROVIDER}"
 PREFERRED_VERSION_${BSP_KERNEL_PROVIDER} ?= "${BSP_KERNEL_VERSION}"
-PREFERRED_VERSION_${BSP_KERNEL_PROVIDER}-rt ?= "${BSP_KERNEL_VERSION}"
 PREFERRED_PROVIDER_virtual/bootloader ?= "${BSP_BOOTLOADER_PROVIDER}"
 PREFERRED_PROVIDER_u-boot ?= "${BSP_BOOTLOADER_PROVIDER}"
 PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
--- a/meta-ti-bsp/conf/machine/include/ti-falcon.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
@@ -1,6 +0,0 @@
-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/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -19,43 +19,17 @@ KERNEL_DEVICETREE_PREFIX = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/omap/am335x-baltos-ir2110.dtb \
-    ti/omap/am335x-baltos-ir3220.dtb \
-    ti/omap/am335x-baltos-ir5221.dtb \
-    ti/omap/am335x-base0033.dtb \
-    ti/omap/am335x-bone.dtb \
-    ti/omap/am335x-boneblack-wireless.dtb \
-    ti/omap/am335x-boneblack.dtb \
-    ti/omap/am335x-boneblue.dtb \
-    ti/omap/am335x-bonegreen-wireless.dtb \
-    ti/omap/am335x-bonegreen.dtb \
-    ti/omap/am335x-chiliboard.dtb \
-    ti/omap/am335x-cm-t335.dtb \
    ti/omap/am335x-evm.dtb \
    ti/omap/am335x-evmsk.dtb \
-    ti/omap/am335x-guardian.dtb \
    ti/omap/am335x-icev2.dtb \
-    ti/omap/am335x-lxm.dtb \
-    ti/omap/am335x-moxa-uc-2101.dtb \
-    ti/omap/am335x-moxa-uc-8100-me-t.dtb \
-    ti/omap/am335x-myirtech-myd.dtb \
-    ti/omap/am335x-nano.dtb \
-    ti/omap/am335x-netcan-plus-1xx.dtb \
-    ti/omap/am335x-netcom-plus-2xx.dtb \
-    ti/omap/am335x-netcom-plus-8xx.dtb \
-    ti/omap/am335x-osd3358-sm-red.dtb \
-    ti/omap/am335x-pdu001.dtb \
-    ti/omap/am335x-pepper.dtb \
-    ti/omap/am335x-phycore-rdk.dtb \
    ti/omap/am335x-pocketbeagle.dtb \
-    ti/omap/am335x-regor-rdk.dtb \
-    ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \
-    ti/omap/am335x-sancloud-bbe-lite.dtb \
+    ti/omap/am335x-bone.dtb \
+    ti/omap/am335x-boneblue.dtb \
+    ti/omap/am335x-bonegreen.dtb \
+    ti/omap/am335x-bonegreen-wireless.dtb \
+    ti/omap/am335x-boneblack.dtb \
+    ti/omap/am335x-boneblack-wireless.dtb \
    ti/omap/am335x-sancloud-bbe.dtb \
-    ti/omap/am335x-sbc-t335.dtb \
-    ti/omap/am335x-shc.dtb \
-    ti/omap/am335x-sl50.dtb \
-    ti/omap/am335x-wega-rdk.dtb \
 "

 UBOOT_ARCH = "arm"
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -21,11 +21,9 @@ KERNEL_DEVICETREE_PREFIX = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/omap/am437x-cm-t43.dtb \
    ti/omap/am437x-gp-evm.dtb \
-    ti/omap/am437x-idk-evm.dtb \
-    ti/omap/am437x-sbc-t43.dtb \
    ti/omap/am437x-sk-evm.dtb \
+    ti/omap/am437x-idk-evm.dtb \
    ti/omap/am43x-epos-evm.dtb \
 "

--- a/meta-ti-bsp/conf/machine/j7200-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
@@ -8,7 +8,6 @@ KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"

 KERNEL_DEVICETREE = " \
    ti/k3-j7200-common-proc-board.dtb \
-    ti/k3-j7200-evm-quad-port-eth-exp.dtbo \
 "

 UBOOT_MACHINE = "j7200_evm_a72_config"
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -11,13 +11,7 @@ KERNEL_DEVICETREE_PREFIX = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/k3-j721e-beagleboneai64.dtb \
-    ti/k3-j721e-common-proc-board-infotainment.dtbo \
    ti/k3-j721e-common-proc-board.dtb \
-    ti/k3-j721e-evm-gesi-exp-board.dtbo \
-    ti/k3-j721e-evm-pcie0-ep.dtbo \
-    ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
-    ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
    ti/k3-j721e-sk.dtb \
 "

--- a/meta-ti-bsp/conf/machine/j721e-sk.conf
+++ b/meta-ti-bsp/conf/machine/j721e-sk.conf
@@ -10,7 +10,6 @@ KERNEL_DEVICETREE_PREFIX = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
    ti/k3-j721e-sk.dtb \
 "

--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -16,10 +16,7 @@ KERNEL_DEVICETREE_PREFIX = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/k3-am68-sk-base-board.dtb \
    ti/k3-j721s2-common-proc-board.dtb \
-    ti/k3-j721s2-evm-gesi-exp-board.dtbo \
-    ti/k3-j721s2-evm-pcie1-ep.dtbo \
 "

 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
--- a/meta-ti-bsp/conf/machine/j722s-evm.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm.conf
@@ -7,12 +7,9 @@ require conf/machine/include/j722s.inc
 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-j722s \
    ti/k3-fpdlink \
-    ti/k3-am625-sk-mcspi-loopback \
    ti/k3-v3link \
 "

-KERNEL_DEVICETREE = " \
-    ti/k3-j722s-evm.dtb \
-"
+KERNEL_DEVICETREE = ""

 UBOOT_MACHINE = "j722s_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J742S2 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J742S2 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j742s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "j742s2_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j742s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j742s2-evm.conf
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: J742S2 EVM
-#@DESCRIPTION: Machine configuration for the TI J742S2 EVM
-
-require conf/machine/include/j742s2.inc
-
-TFA_K3_USART = "0x8"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-j742s2 \
-    ti/k3-j784s4 \
-    ti/k3-fpdlink \
-    ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-j721s2-evm-csi2-ov5640 \
-    ti/k3-j721s2-evm-fusion \
-    ti/k3-v3link \
-"
-
-KERNEL_DEVICETREE = ""
-
-UBOOT_MACHINE = "j742s2_evm_a72_defconfig"
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -11,18 +11,11 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-j784s4 \
    ti/k3-fpdlink \
    ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-j721s2-evm-csi2-ov5640 \
-    ti/k3-j721s2-evm-fusion \
-    ti/k3-j721s2-evm-ub954 \
    ti/k3-am69-sk \
    ti/k3-v3link \
 "

 KERNEL_DEVICETREE = " \
-    ti/k3-am69-sk.dtb \
-    ti/k3-j784s4-evm-pcie0-pcie1-ep.dtbo \
-    ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \
-    ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \
    ti/k3-j784s4-evm.dtb \
 "

--- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
+++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
@@ -21,6 +21,6 @@ KERNEL_DEVICETREE_PREFIX = " \
 "

 KERNEL_DEVICETREE = " \
-    ti/davinci/da850-evm.dtb \
-    ti/davinci/da850-lcdk.dtb \
+    da850-evm.dtb \
+    da850-lcdk.dtb \
 "
--- a/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend
+++ b/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend
@@ -0,0 +1,14 @@
+# This is a copy of meta-clang/recipes-graphics/mesa/mesa_%.bbappend required
+# for llvmpipe when using pvr-mesa since we aren't caught by that glob.
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+LDFLAGS:append:toolchain-clang = " -latomic -lm"
+DEPENDS:append:toolchain-clang = " libatomic-ops"
+
+EXTRA_OEMASON:append:toolchain-clang:x86 = " -Dasm=false"
+EXTRA_OEMASON:append:toolchain-clang:x86-64 = " -Dasm=false"
+
+export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
+
+PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true -Ddraw-use-llvm=true,-Dllvm=false,clang clang-native elfutils"
--- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0"
 PV = "${CADENCE_MHDP_FW_VERSION}"
 PR = "${INC_PR}.0"

-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2"
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4"

 TARGET = "mhdp8546.bin"

--- a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Cortex-M3 binary blob for suspend-resume"
+DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"

 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
@@ -14,7 +14,7 @@ SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;p
 S = "${WORKDIR}/git"

 do_compile() {
-	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc -std=gnu11 ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}"
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}"
 }

 do_install() {
--- a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
+++ b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
@@ -0,0 +1,16 @@
+HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:CMEM"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"
+
+BRANCH = "master"
+# This corresponds to version 4.20.00.01
+SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393"
+
+PV = "4.20.00.01+git"
+
+SRC_URI = "git://git.ti.com/git/ipc/ludev.git;protocol=https;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST:ti-soc = "(.*)"
--- a/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "The cmem component supports contiguous memory allocation from userspace"
+
+include cmem.inc
+
+PR = "r0"
+
+PACKAGES =+ "${PN}-test"
+
+FILES:${PN}-test = "${bindir}/*"
+
+inherit autotools
--- 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
@@ -5,12 +5,12 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 inherit update-alternatives

 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=df3992006621b797e36de43f36336e36"
+LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0"

 PV = "${CNM_WAVE521_FW_VERSION}"
 PR = "${INC_PR}.1"

-COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|j742s2|am62axx|am62pxx"
+COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|am62axx|am62pxx"

 TARGET_WAVE521C = "wave521c_k3_codec_fw.bin"

--- a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs"
+DESCRIPTION = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs"
 HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver"
 LICENSE = "MIT | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"
@@ -8,9 +8,9 @@ inherit module features_check
 REQUIRED_MACHINE_FEATURES = "gc320"

 # Need to branch out with ${PV} var
-BRANCH = "ti-${PV}-k6.12"
+BRANCH = "ti-${PV}-k5.10"

-SRCREV = "83afddf9dbf6a8458267b4dae21ee35bfb11f3d1"
+SRCREV = "e2a10f31e255a65ec30a6e10b890e77d7e9cb107"

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

--- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Goodix GT9271 config firmware"
+DESCRIPTION = "Goodix GT9271 config firmware"

 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc

--- 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,4 +1,4 @@
-SUMMARY =  "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
+DESCRIPTION =  "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"
@@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;

 S = "${WORKDIR}/git"

-SRCREV = "c838bc06a163abad46dcc193c8fb9a4fb9e2e356"
+SRCREV = "174eb331a61e89184342fa57a935226f4e952bc9"

 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb
@@ -1,4 +1,4 @@
-SUMMARY =  "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
+DESCRIPTION =  "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"
@@ -9,22 +9,21 @@ PROVIDES = "virtual/gpudriver"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"

 DEPENDS = "virtual/kernel"

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

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

 S = "${WORKDIR}/git"

-SRCREV = "8eaff654a8871118c08cfafe53795f57e3b6b396"
+SRCREV = "81e189096ef2f2479ccfb50d8b2fb24097188de3"

 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
 TARGET_PRODUCT:j784s4 = "j784s4_linux"
-TARGET_PRODUCT:j742s2 = "j784s4_linux"
 TARGET_PRODUCT:am62xx = "am62_linux"
 TARGET_PRODUCT:am62pxx = "am62p_linux"
 TARGET_PRODUCT:j722s = "j722s_linux"
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -1,4 +1,4 @@
-SUMMARY =  "Kernel drivers for the PowerVR SGX chipset found in the TI SoCs"
+DESCRIPTION =  "Kernel drivers for the PowerVR SGX chipset found in the TI SoCs"
 HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux"
 LICENSE = "MIT | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e"
@@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;

 S = "${WORKDIR}/git"

-SRCREV = "9ae0fa4998b1c624408945e062bf8fb0ea7efb9d"
+SRCREV = "2cb2c9609b7740cb2c348e669a96f26e1cc858da"

 TARGET_PRODUCT:omap-a15 = "ti572x_linux"
 TARGET_PRODUCT:ti33x = "ti335x_linux"
@@ -31,14 +31,6 @@ PVR_WS = "lws-generic"
 EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} \
 WINDOW_SYSTEM=${PVR_WS} PVR_BUILD_DIR=${TARGET_PRODUCT}'

-# There are useful flags here that are interpreted by the final kbuild pass
-# These variables are not necessary when compiling outside of Yocto
-export KERNEL_CC
-export KERNEL_LD
-export KERNEL_AR
-export KERNEL_OBJCOPY
-export KERNEL_STRIP
-
 do_install() {
    make -C ${STAGING_KERNEL_DIR} M=${B}/eurasiacon/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
 }
--- a/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb
@@ -1,17 +0,0 @@
-DESCRIPTION = "TI DAC TAD5212 config prebuild binary firmware"
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-PV = "${TAD5212_FW_VERSION}"
-PR = "${INC_PR}.0"
-
-COMPATIBLE_MACHINE = "am62dxx"
-
-TAD5212_1DEV = "tad5212_01.bin"
-TAD5212_4DEV = "tad5212_04.bin"
-
-do_install() {
-	install -d ${D}${nonarch_base_libdir}/firmware
-	install -m 0644 ${S}/ti/tad5212/${TAD5212_1DEV} ${D}${nonarch_base_libdir}/firmware/
-	install -m 0644 ${S}/ti/tad5212/${TAD5212_4DEV} ${D}${nonarch_base_libdir}/firmware/
-}
--- a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
@@ -7,6 +7,8 @@ COMPATIBLE_MACHINE = "k3"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

+INHIBIT_DEFAULT_DEPS = "1"
+
 inherit deploy
 inherit update-alternatives

@@ -24,13 +26,10 @@ PLAT_SFX:j7200 = "j7200"
 PLAT_SFX:j721s2 = "j721s2"
 PLAT_SFX:j784s4 = "j784s4"
 PLAT_SFX:j722s = "j722s"
-PLAT_SFX:j742s2 = "j742s2"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
 PLAT_SFX:am62axx = "am62axx"
-PLAT_SFX:am62dxx = "am62axx"
-PLAT_SFX:am62lxx = "am62lxx"
 PLAT_SFX:am62pxx = "am62pxx"

 DM_FW_DIR = "ti-dm/${PLAT_SFX}"
@@ -38,8 +37,6 @@ DM_FW_DIR = "ti-dm/${PLAT_SFX}"
 INSTALL_DM_FW_DIR  = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}"

 DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
-DM_FIRMWARE:am62axx = "dm_edgeai_mcu1_0_release_strip.out"
-DM_FIRMWARE:am62pxx = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'dss_display_share.wkup-r5f0_0.release.strip.out', 'ipc_echo_testb_mcu1_0_release_strip.xer5f', d)}"

 DM_FW_LIST = ""
 DM_FW_LIST:j721e =   "${DM_FIRMWARE}"
@@ -47,13 +44,10 @@ DM_FW_LIST:j7200 =   "${DM_FIRMWARE}"
 DM_FW_LIST:j721s2 =  "${DM_FIRMWARE}"
 DM_FW_LIST:j784s4 =  "${DM_FIRMWARE}"
 DM_FW_LIST:j722s =   "${DM_FIRMWARE}"
-DM_FW_LIST:j742s2 =  "${DM_FIRMWARE}"
 DM_FW_LIST:am65xx =  ""
 DM_FW_LIST:am64xx =  ""
 DM_FW_LIST:am62xx =  "${DM_FIRMWARE}"
 DM_FW_LIST:am62axx = "${DM_FIRMWARE}"
-DM_FW_LIST:am62dxx = "${DM_FIRMWARE}"
-DM_FW_LIST:am62lxx = ""
 DM_FW_LIST:am62pxx = "${DM_FIRMWARE}"

 do_install() {
@@ -87,13 +81,11 @@ 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}:j721e   = "j7-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j7200   = "j7200-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j721s2  = "j721s2-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j784s4  = "j784s4-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j722s   = "j722s-wkup-r5f0_0-fw"
-ALTERNATIVE:${PN}:j742s2  = "j742s2-mcu-r5f0_0-fw"

 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw"
@@ -104,7 +96,6 @@ ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/j
 ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j722s-wkup-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j722s-wkup-r5f0_0-fw"
-ALTERNATIVE_LINK_NAME[j742s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j742s2-mcu-r5f0_0-fw"

 # Create the firmware alternatives
 ALTERNATIVE_TARGET[am62-main-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
@@ -115,7 +106,6 @@ 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}"
 ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j722s-wkup-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
-ALTERNATIVE_TARGET[j742s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"

 ALTERNATIVE_PRIORITY = "10"

--- a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
@@ -3,7 +3,11 @@ SUMMARY = "TI Ethernet prebuilt binary firmware images"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"

-COMPATIBLE_MACHINE = "j721e|j7200|j784s4"
+COMPATIBLE_MACHINE = "k3"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+INHIBIT_DEFAULT_DEPS = "1"

 inherit update-alternatives

@@ -15,60 +19,64 @@ PR = "${INC_PR}.0"
 # Secure Build
 inherit ti-secdev

-PACKAGES += " \
-    ${PN}-j721e \
-    ${PN}-j7200 \
-    ${PN}-j784s4 \
-"
-# Disable arch checking as firmware is likely to be a different arch from the Yocto build
-INSANE_SKIP:${PN}-j721e += "arch"
-INSANE_SKIP:${PN}-j7200 += "arch"
-INSANE_SKIP:${PN}-j784s4 += "arch"
+PLAT_SFX = ""
+PLAT_SFX:j721e = "j721e"
+PLAT_SFX:j7200 = "j7200"
+PLAT_SFX:j721s2 = "j721s2"
+PLAT_SFX:j784s4 = "j784s4"
+PLAT_SFX:j722s = "j722s"
+PLAT_SFX:am65xx = "am65xx"
+PLAT_SFX:am64xx = "am64xx"
+PLAT_SFX:am62xx = "am62xx"
+PLAT_SFX:am62pxx = "am62pxx"
+PLAT_SFX:am62axx = "am62axx"

-RDEPENDS:${PN} += " \
-    ${PN}-j721e \
-    ${PN}-j7200 \
-    ${PN}-j784s4 \
-"
+ETH_FW_DIR = "ti-eth/${PLAT_SFX}"

-PLATS = "\
-    j721e \
-    j7200 \
-    j784s4 \
-"
+INSTALL_ETH_FW_DIR = "${nonarch_base_libdir}/firmware/${ETH_FW_DIR}"

 ETH_FW = "app_remoteswitchcfg_server_strip.xer5f"

-do_install() {
-    for PLAT in ${PLATS}
-    do
-        # Sign ETH firmware
-        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/ti-eth/${PLAT}/${ETH_FW} ${S}/ti-eth/${PLAT}/${ETH_FW}.signed
+ETH_FW_LIST = ""
+ETH_FW_LIST:j721e =   "${ETH_FW}"
+ETH_FW_LIST:j7200 =   "${ETH_FW}"
+ETH_FW_LIST:j721s2 =  ""
+ETH_FW_LIST:j784s4 =  "${ETH_FW}"
+ETH_FW_LIST:j722s =   ""
+ETH_FW_LIST:am65xx =  ""
+ETH_FW_LIST:am64xx =  ""
+ETH_FW_LIST:am62xx =  ""
+ETH_FW_LIST:am62pxx = ""
+ETH_FW_LIST:am62axx = ""

-        # Install ETH firmware
-        install -d ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
-        install -m 0644 ${S}/ti-eth/${PLAT}/${ETH_FW}        ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
-        install -m 0644 ${S}/ti-eth/${PLAT}/${ETH_FW}.signed ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
+do_install() {
+    # ETH firmware
+    for FW_NAME in ${ETH_FW_LIST}
+    do
+        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${ETH_FW_DIR}/${FW_NAME} ${S}/${ETH_FW_DIR}/${FW_NAME}.signed
+    done
+
+    # ETH firmware
+    install -d ${D}${INSTALL_ETH_FW_DIR}
+    for FW_NAME in ${ETH_FW_LIST}
+    do
+        install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}        ${D}${INSTALL_ETH_FW_DIR}
+        install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_ETH_FW_DIR}
    done
 }

-FILES:${PN} = ""
-FILES:${PN}-j721e = "${nonarch_base_libdir}/firmware/ti-eth/j721e"
-FILES:${PN}-j7200 = "${nonarch_base_libdir}/firmware/ti-eth/j7200"
-FILES:${PN}-j784s4 = "${nonarch_base_libdir}/firmware/ti-eth/j784s4"
-
 # Set up names for the firmwares
-ALTERNATIVE:${PN}-j721e = "\
+ALTERNATIVE:${PN}:j721e = "\
                    j7-main-r5f0_0-fw \
                    j7-main-r5f0_0-fw-sec \
                    "

-ALTERNATIVE:${PN}-j7200 = "\
+ALTERNATIVE:${PN}:j7200 = "\
                    j7200-main-r5f0_0-fw \
                    j7200-main-r5f0_0-fw-sec \
                    "

-ALTERNATIVE:${PN}-j784s4 = "\
+ALTERNATIVE:${PN}:j784s4 = "\
                    j784s4-main-r5f0_0-fw \
                    j784s4-main-r5f0_0-fw-sec \
                    "
@@ -84,13 +92,13 @@ ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmw
 ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw-sec"

 # Create the firmware alternatives
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw]        = "${nonarch_base_libdir}/firmware/ti-eth/j721e/${ETH_FW}"
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec]    = "${nonarch_base_libdir}/firmware/ti-eth/j721e/${ETH_FW}.signed"
+ALTERNATIVE_TARGET[j7-main-r5f0_0-fw]        = "${INSTALL_ETH_FW_DIR}/${ETH_FW}"
+ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec]    = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed"

-ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/ti-eth/j7200/${ETH_FW}"
-ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j7200/${ETH_FW}.signed"
+ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw]     = "${INSTALL_ETH_FW_DIR}/${ETH_FW}"
+ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed"

-ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/ti-eth/j784s4/${ETH_FW}"
-ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j784s4/${ETH_FW}.signed"
+ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw]     = "${INSTALL_ETH_FW_DIR}/${ETH_FW}"
+ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed"

 ALTERNATIVE_PRIORITY = "5"
--- a/meta-ti-bsp/recipes-bsp/ti-hsm-fw/ti-hsm-demo-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-hsm-fw/ti-hsm-demo-fw_git.bb
@@ -1,24 +0,0 @@
-SUMMARY = "TI HSM demo Firmware"
-
-inherit deploy
-
-require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PV = "${TI_HSM_DEMO_FW_VERSION}"
-PR = "${INC_PR}.0"
-
-COMPATIBLE_MACHINE = "j721s2|j784s4"
-
-HSM_FW_SOC:j721s2 = "j721s2"
-HSM_FW_SOC:j784s4 = "j784s4"
-
-HSM_BINARY = "hsm-demo-firmware-${HSM_FW_SOC}*.bin"
-
-do_deploy() {
-	install -d ${DEPLOYDIR}/ti-hsm
-	install -m 644 ${S}/ti-hsm/${HSM_BINARY} ${DEPLOYDIR}/ti-hsm
-}
-
-addtask deploy before do_build after do_compile
--- 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
@@ -1,23 +0,0 @@
-SUMMARY =  "Kernel drivers for Video Accelerators found in the J721E TI SoC"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://README;beginline=11;endline=12;md5=ad10b552e357ac443ec5dd2e02912b1b"
-
-inherit module
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "j721e"
-
-DEPENDS += "virtual/kernel"
-
-BRANCH = "scarthgap/k${PV}"
-
-SRC_URI = "git://git.ti.com/git/multimedia/img-vxe-vxd.git;protocol=https;branch=${BRANCH}"
-
-SRCREV = "038d9263c67900ea4eff631820b088a3dc3a6ad5"
-
-TARGET_PRODUCT:j721e = "j721e_linux"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE += 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
--- 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,26 +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.14.00"
 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.00"
-TI_HSM_DEMO_FW_VERSION = "11.00.09"
-TAD5212_FW_VERSION = "1.0.0.0"
+CNM_WAVE521_FW_VERSION = "1.0.4"
+TI_DM_FW_VERSION = "10.00.01"
+TI_SYSFW_VERSION = "10.00.02"

-TI_LINUX_FW_SRCREV ?= "e594deb508a322d5681888d48fbb153953b06ca9"
+TI_LINUX_FW_SRCREV ?= "bce9bafb6efeb8ac539bd9858d474a55fe88cd46"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"

-TI_LINUX_FW_GIT_URI ?= "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git"
-TI_LINUX_FW_GIT_PROTOCOL ?= "https"
-TI_LINUX_FW_GIT_BRANCH ?= "branch=${BRANCH}"
-
-SRC_URI = "${TI_LINUX_FW_GIT_URI};protocol=${TI_LINUX_FW_GIT_PROTOCOL};${TI_LINUX_FW_GIT_BRANCH}"
+SRC_URI = "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH}"

 S = "${WORKDIR}/git"

@@ -44,9 +38,6 @@ INHIBIT_SYSROOT_STRIP = "1"
 # This is used to prevent the build system from splitting out the firmware debug info into a separate file
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

-# Firmware here are prebuilt with no external dependencies
-INHIBIT_DEFAULT_DEPS = "1"
-
 # Disable arch checking as firmware is likely to be a different arch from the Yocto build
 INSANE_SKIP:${PN} += "arch"

--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -26,10 +26,4 @@ do_deploy:k3r5() {
 	install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${DEPLOYDIR}/ti-sysfw
 }

-do_deploy:am62lxx(){
-        install -d ${DEPLOYDIR}/ti-sysfw
-        install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw
-        install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw
-}
-
 addtask deploy before do_build after do_compile
--- 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,22 +1,10 @@
-# NOTE: This .inc file with customizations only gets included for K3 platforms
+PV:k3 = "2.10+git"
+SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b"
+SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
+COMPATIBLE_MACHINE:k3 = "k3"
+TFA_BUILD_TARGET:k3 = "all"
+TFA_INSTALL_TARGET:k3 = "bl31"
+TFA_SPD:k3 = "opteed"

-PV = "2.12+git"
-SRCREV_tfa = "39fe4a856d3576646642c2516b7a99de63eca74e"
-SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
-SRCBRANCH = "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"
-TFA_INSTALL_TARGET = "bl31"
-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 += "${@ '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"
+EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
+EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
--- 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,12 @@

 # This will have priority over generic uboot path

-COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
+COMPATIBLE_MACHINE = "am62xx|am62pxx"

-BRANCH = "ti-u-boot-2025.01"
-BRANCH:tie-jailhouse = "ti-u-boot-2025.01-jailhouse"
+BRANCH = "ti-u-boot-2023.04"
+BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse"

-SRCREV = "e718bbcec3ebf663c021839753034a224be4cc53"
-SRCREV:tie-jailhouse = "e718bbcec3ebf663c021839753034a224be4cc53"
+SRCREV = "b0d868ee086eb5c96a3d32f72a7cb9670abf5b90"
+SRCREV:tie-jailhouse = "765cab112d16fcf68a3266738073663dae67a55d"

 UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
--- 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,4 +1,4 @@
-require recipes-bsp/u-boot/u-boot-ti.inc
+require u-boot-ti.inc

 SUMMARY = "BeagleBoard.org U-Boot"

@@ -15,8 +15,3 @@ 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-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
@@ -1,9 +1,16 @@
 require u-boot-ti.inc

-SUMMARY = "Mainline U-Boot for TI devices"
+PR = "r0"

-PV = "2025.04"
+PV = "2024.01"

+# For the un-initiated:
+# The actual URL you'd use with a git clone for example would be:
+# https://source.denx.de/u-boot/u-boot.git/
+# However, in the context of OE, we have to explicitly split things up:
+# a) we want it to use git fetcher - hence git:// prefix in GIT_URI (if we
+#  used https here, we'd endup attempting wget instead of git)
+# b) and we want git fetcher to use https protocol, hence GIT_PROTOCOL as https
 UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"
-
-SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a"
+UBOOT_GIT_PROTOCOL = "https"
+SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e"
--- a/Show More
+++ b/Show More