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

Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION u-boot-ti-staging_2024.04: SRCREV u-boot-ti-staging_2024.10: SRCREV linux-ti-staging-rt_6.6: SRCREV linux-ti-staging_6.12: PV,SRCREV linux-ti-staging_6.6: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=64248dad39a9448ad191bc04130c49e0354cb2ce..ddb9cc251ace41dfad6650390f82e4a389d3967e u-boot-ti-staging_2024.04: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=b78dde22088773147d80c3b85c885d9be7a2bfab..cdac8b4cd3cc1d1e9ac6354c1cfe03ddbbdf01fa u-boot-ti-staging_2024.10: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=c97ada2dc66934ee00a7a03d9ed078bdfb7b4039..9cfe0cab3bf135a505e1e163ca442a4e4064d58e linux-ti-staging-rt_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=d05688f353d10af170286db56535443184202eab..517163f797b81a8277a000d6a1c9dfd89b3711b8 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=9852d85ec9d492ebef56dc5f229416c925758edc..8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b linux-ti-staging_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=325ad3650d0b50a4943b9151fb43411f08ad5d0c..32ae7316ddc6d9b6bb0d87706cf7daa44c4c1e92 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
ti-bsp: Add RT and systest support
2026-01-12 01:20:20 +00:00 · 2024-10-10 04:00:55 -05:00 · 2024-10-09 08:48:32 -05:00 · 2024-10-08 15:44:25 -05:00 · 2024-10-08 15:44:25 -05:00 · 2024-10-08 15:43:20 -05:00
77 changed files with 343 additions and 945 deletions
--- a/meta-ti-bsp/classes/uboot-fragments.bbclass
+++ b/meta-ti-bsp/classes/uboot-fragments.bbclass
@@ -1,77 +0,0 @@
-# Handle U-Boot config fragments for a machine
-#
-# This interacts with the UBOOT_CONFIG flow
-#
-# The format to specify it, in the machine, is:
-#
-# UBOOT_FRAGMENTS_CONFIG[foo] = "fragment[,fragment...]"
-#
-# or
-#
-# UBOOT_FRAGMENTS = "fragment[,fragment...]"
-#
-# Copyright 2024 (C) Texas Instruments, Inc.
-#
-# SPDX-License-Identifier: MIT
-
-python () {
-    loUbootConfig = (d.getVar('UBOOT_CONFIG') or "").split()
-    loUbootFragments = d.getVar('UBOOT_FRAGMENTS')
-    loUbootFragmentsConfigFlags = d.getVarFlags('UBOOT_FRAGMENTS_CONFIG')
-        
-    if loUbootFragmentsConfigFlags and loUbootFragments:
-        raise bb.parse.SkipRecipe("You cannot use UBOOT_FRAGMENTS and UBOOT_FRAGMENTS_CONFIG at the same time.")
-
-    if loUbootFragmentsConfigFlags is not None and len(loUbootConfig) > 0:
-        for lpConfig in loUbootConfig:
-            loFound = False
-            for lpFlag, lpValue in loUbootFragmentsConfigFlags.items():
-                if lpConfig == lpFlag: 
-                    loFound = True
-                    if lpValue == "":
-                        d.appendVar('UBOOT_FRAGMENTS', ' none')
-                    else:
-                        d.appendVar('UBOOT_FRAGMENTS', ' ' + lpValue)
-
-            if not loFound:
-                raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (loUbootConfig, loUbootFragmentsConfigFlags.keys()))
-}
-
-uboot_configure_config:append () {
-   if [ -n "${UBOOT_FRAGMENTS}" ]
-   then
-        unset loTypeIdx
-        for lpType in ${UBOOT_CONFIG}; do
-            loTypeIdx=$(expr $loTypeIdx + 1)
-
-            if [ "${lpType}" == "${type}" ]; then
-                break
-            fi
-        done
-        
-        loApplyFragments=""
-        
-        for lpFragment in ${UBOOT_FRAGMENTS}; do
-            lpFragmentIdx=$(expr $lpFragmentIdx + 1)
-            if [ $y -eq $x ]; then
-                if [ "${lpFragment}" != "none" ]; then
-                    loApplyFragments=`echo ${lpFragment} | tr "," " "`
-                fi
-                break
-            fi
-        done
-
-        if [ -n "${loApplyFragments}" ]; then
-            oe_runmake -C ${S} O=${B}/${config} ${config} ${loApplyFragments}
-            oe_runmake -C ${S} O=${B}/${config} oldconfig
-        fi
-    fi
-}
-
-uboot_configure:append () {
-   if [ -n "${UBOOT_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ]
-   then
-       oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} `echo ${UBOOT_FRAGMENTS} | tr "," " "`
-       oe_runmake -C ${S} O=${B} oldconfig
-   fi
-}
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -22,6 +22,11 @@ KERNEL_DEVICETREE = " \

 UBOOT_MACHINE = "am62px_evm_a53_defconfig"

-UBOOT_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
+# 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_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -2,6 +2,11 @@
 #@NAME: AM62XX EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)

-require conf/machine/am62xx-unified-k3r5.conf
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc

-UBOOT_CONFIG = "evm"
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -2,7 +2,8 @@
 #@NAME: AM62XX EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX EVM

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

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am625 \
@@ -29,4 +30,4 @@ KERNEL_DEVICETREE = " \
    ti/k3-am62x-sk-hdmi-audio.dtbo \
 "

-UBOOT_CONFIG = "evm"
+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
@@ -2,6 +2,11 @@
 #@NAME: AM62XX LP GP EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)

-require conf/machine/am62xx-unified-k3r5.conf
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc

-UBOOT_CONFIG = "lpsk"
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -2,7 +2,8 @@
 #@NAME: AM62XX LP EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM

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

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62-lp \
@@ -18,4 +19,4 @@ KERNEL_DEVICETREE = " \
    ti/k3-am62x-sk-hdmi-audio.dtbo \
 "

-UBOOT_CONFIG = "lpsk"
+UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
@@ -1,28 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = ""
-# Last config in the list is default
-UBOOT_CONFIG ??= "sip lpsk evm"
-
-UBOOT_CONFIG:bsp-ti-6_1 ??= "evm"
-
-UBOOT_CONFIG[sip] = "am62xsip_evm_r5_defconfig"
-UBOOT_CONFIG[lpsk] = "am62x_lpsk_r5_defconfig"
-UBOOT_CONFIG[evm] = "am62x_evm_r5_defconfig"
-
-UBOOT_FRAGMENTS_CONFIG_SIP = ""
-UBOOT_FRAGMENTS_CONFIG_SIP:bsp-ti-6_1 = "am62xsip_sk_r5"
-
-UBOOT_FRAGMENTS_CONFIG[sip] = "${UBOOT_FRAGMENTS_CONFIG_SIP}"
-UBOOT_FRAGMENTS_CONFIG[lpsk] = ""
-UBOOT_FRAGMENTS_CONFIG[evm] = ""
-
--- a/meta-ti-bsp/conf/machine/am62xx-unified.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-unified.conf
@@ -1,43 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX Unified EVM
-#@DESCRIPTION: Machine configuration for the TI AM62XX EVM and all of its variations
-
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62-lp \
-    ti/k3-am625 \
-    ti/k3-am62x-sk \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am62-lp-sk.dtb \
-    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-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 \
-"
-
-UBOOT_MACHINE = ""
-# Last config in the list is default
-UBOOT_CONFIG ??= "sip lpsk evm"
-
-UBOOT_CONFIG:bsp-ti-6_1 ??= "lpsk evm"
-
-UBOOT_CONFIG[sip] = "am62xsip_evm_a53_defconfig"
-UBOOT_CONFIG[lpsk] = "am62x_lpsk_a53_defconfig"
-UBOOT_CONFIG[evm] = "am62x_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -2,10 +2,14 @@
 #@NAME: AM62XX SIP EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)

-require conf/machine/am62xx-unified-k3r5.conf
+require conf/machine/include/k3r5.inc

-UBOOT_CONFIG = "sip"
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"

-UBOOT_CONFIG:bsp-ti-6_1 = ""
+UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"

 UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: AM62XX SIP EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM

-require conf/machine/am62xx-unified.conf
+require conf/machine/include/am62xx.inc

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am625 \
@@ -13,4 +13,6 @@ KERNEL_DEVICETREE = " \
    ti/k3-am625-sk.dtb \
 "

-UBOOT_CONFIG = "sip"
+UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
+
+UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
@@ -19,5 +19,5 @@ UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
 UBOOT_MACHINE = "j721e_evm_r5_defconfig"
 UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_r5_defconfig"

-UBOOT_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
-UBOOT_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -12,8 +12,8 @@ IMAGE_SR2_HS_SE_FILES:bsp-bb_org = ""
 UBOOT_MACHINE = "j721e_evm_a72_config"
 UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig"

-UBOOT_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
-UBOOT_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config"

 SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
 SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
--- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
@@ -11,6 +11,6 @@ SYSFW_SUFFIX = "gp"
 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
 UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig"

-UBOOT_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
-UBOOT_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
-UBOOT_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"
+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.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -3,6 +3,8 @@
 #@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"
@@ -20,9 +22,9 @@ OPTEEMACHINE = "k3-am62x"
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
 UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig"

-UBOOT_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
-UBOOT_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
-UBOOT_FRAGMENTS:bsp-mainline = "beagleplay_a53.config"
+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"
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -1,4 +1,6 @@
 require conf/machine/include/k3.inc
+require conf/machine/include/mc_k3r5.inc
+
 SOC_FAMILY:append = ":am62axx"

 MACHINE_FEATURES += "screen touchscreen"
@@ -6,16 +8,13 @@ MACHINE_FEATURES += "screen touchscreen"
 TFA_K3_SYSTEM_SUSPEND = "1"

 # Default tiboot3.bin on AM62A is for HS-FS
-TI_BOOTLOADERS += "tiboot3-am62ax-hs-fs-evm.bin"
-TI_MULTICONFIGS += "am62ax-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"

 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
-TI_BOOTLOADERS += "tiboot3-am62ax-gp-evm.bin"
-TI_MULTICONFIGS += "am62ax-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"

 # Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
-TI_BOOTLOADERS += "tiboot3-am62ax-hs-evm.bin"
-TI_MULTICONFIGS += "am62ax-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62ax-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
@@ -1,4 +1,6 @@
 require conf/machine/include/k3.inc
+require conf/machine/include/mc_k3r5.inc
+
 SOC_FAMILY:append = ":am62pxx"

 MACHINE_FEATURES += "screen gpu"
@@ -7,8 +9,7 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 # Default tiboot3.bin on AM62Px is for HS-FS
-TI_BOOTLOADERS += "tiboot3-am62px-hs-fs-evm.bin"
-TI_MULTICONFIGS += "am62px-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-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,4 +1,6 @@
 require conf/machine/include/k3.inc
+require conf/machine/include/mc_k3r5.inc
+
 SOC_FAMILY:append = ":am62xx"

 MACHINE_FEATURES += "screen gpu"
@@ -7,16 +9,13 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 # Default tiboot3.bin on AM62x is for HS-FS
-TI_BOOTLOADERS += "tiboot3-am62x-hs-fs-evm.bin"
-TI_MULTICONFIGS += "am62x-hs-fs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"

 # Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
-TI_BOOTLOADERS += "tiboot3-am62x-gp-evm.bin"
-TI_MULTICONFIGS += "am62x-gp-evm"
+IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"

 # Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
-TI_BOOTLOADERS += "tiboot3-am62x-hs-evm.bin"
-TI_MULTICONFIGS += "am62x-hs-evm"
+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
@@ -1,4 +1,6 @@
 require conf/machine/include/k3.inc
+require conf/machine/include/mc_k3r5.inc
+
 SOC_FAMILY:append = ":am64xx"

 KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
@@ -16,16 +18,13 @@ KERNEL_DEVICETREE = " \
 "

 # Default tiboot3.bin on AM64x is for SR2.0 HS-FS
-TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "am64x_sr2-hs-fs-evm"
+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
-TI_BOOTLOADERS += "tiboot3-am64x-gp-evm.bin"
-TI_MULTICONFIGS += "am64x-gp-evm"
+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
-TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-evm.bin"
-TI_MULTICONFIGS += "am64x_sr2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"

 TFA_BOARD = "lite"

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

 MACHINE_FEATURES += "screen touchscreen gpu"
@@ -24,14 +26,12 @@ KERNEL_DEVICETREE = " \
 IMAGE_BOOT_FILES += "sysfw.itb"

 # Default on AM65x is for GP
-TI_BOOTLOADERS += "tiboot3-am65x_sr2-gp-evm.bin"
-TI_BOOTLOADERS += "sysfw-am65x_sr2-gp-evm.itb"
-TI_MULTICONFIGS += "am65x_sr2-gp-evm"
+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
-TI_BOOTLOADERS += "tiboot3-am65x_sr2-hs-evm.bin"
-TI_BOOTLOADERS += "sysfw-am65x_sr2-hs-evm.itb"
-TI_MULTICONFIGS += "am65x_sr2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"

 TFA_BOARD = "generic"

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

 MACHINE_FEATURES += "screen gpu"
@@ -7,12 +9,10 @@ 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
-TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j721s2-hs-fs-evm"
+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
-TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
-TI_MULTICONFIGS += "j721s2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"

 TFA_BOARD = "generic"

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

 MACHINE_FEATURES += "screen gpu"
@@ -7,12 +9,10 @@ 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
-TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j784s4-hs-fs-evm"
+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
-TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
-TI_MULTICONFIGS += "j784s4-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"

 TFA_BOARD = "j784s4"

--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -1,4 +1,6 @@
 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
@@ -7,26 +9,18 @@ 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 = ""
-MULTICONFIG_SR1_HS_FS = "j7200-hs-fs-evm"
-MULTICONFIG_SR1_HS_FS:bsp-mainline = ""
-TI_BOOTLOADERS += "${IMAGE_SR1_HS_FS_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_FS}"
+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 = ""
-MULTICONFIG_SR1_HS_SE = "j7200-hs-evm"
-MULTICONFIG_SR1_HS_SE:bsp-mainline = ""
-TI_BOOTLOADERS += "${IMAGE_SR1_HS_SE_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_SE}"
+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
-TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j7200_sr2-hs-fs-evm"
+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
-TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-evm.bin"
-TI_MULTICONFIGS += "j7200_sr2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"

 TFA_BOARD = "generic"

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

 MACHINE_FEATURES += "screen gpu"
@@ -6,38 +8,29 @@ MACHINE_FEATURES += "screen gpu"
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

-TI_BOOTLOADERS += "sysfw.itb"
+IMAGE_BOOT_FILES += "sysfw.itb"

 # Default on J721e is for GP
-TI_BOOTLOADERS += "tiboot3-j721e-gp-evm.bin"
-TI_BOOTLOADERS += "sysfw-j721e-gp-evm.itb"
-TI_MULTICONFIGS += "j721e-gp-evm"
+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 = ""
-MULTICONFIG_SR1_1_HS_FS = "j721e_sr1_1-hs-fs-evm"
-MULTICONFIG_SR1_1_HS_FS:bsp-mainline = ""
-TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_FS_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR1_1_HS_FS}"
+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"
-TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_SE_FILES}"
-TI_MULTICONFIGS += "j721e_sr1_1-hs-evm"
+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"
-TI_BOOTLOADERS += "${IMAGE_SR2_HS_FS_FILES}"
-TI_MULTICONFIGS += "j721e_sr2-hs-fs-evm"
+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 = ""
-MULTICONFIG_SR2_HS_SE = "j721e_sr2-hs-evm"
-MULTICONFIG_SR2_HS_SE:bsp-mainline = ""
-TI_BOOTLOADERS += "${IMAGE_SR2_HS_SE_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR2_HS_SE}"
+IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"

 TFA_BOARD = "generic"

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

 MACHINE_FEATURES += "screen gpu"
@@ -7,16 +9,13 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 # Default tiboot3.bin on J721S2 is for GP
-TI_BOOTLOADERS += "tiboot3-j721s2-gp-evm.bin"
-TI_MULTICONFIGS += "j721s2-gp-evm"
+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
-TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j721s2-hs-fs-evm"
+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
-TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
-TI_MULTICONFIGS += "j721s2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"

 TFA_BOARD = "generic"

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

 MACHINE_FEATURES += "screen gpu"
@@ -7,18 +9,13 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 # Default tiboot3.bin on J722S is for HS-FS
-TI_BOOTLOADERS += "tiboot3-j722s-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j722s-hs-fs-evm"
+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 = ""
-MULTICONFIG_SR1_HS_SE = "j722s-hs-evm"
-MULTICONFIG_SR1_HS_SE:bsp-mainline = ""
-MULTICONFIG_SR1_HS_SE:bsp-next = ""
-TI_BOOTLOADERS += "${IMAGE_SR1_HS_SE_FILES}"
-TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_SE}"
+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
@@ -1,4 +1,6 @@
 require conf/machine/include/k3.inc
+require conf/machine/include/mc_k3r5.inc
+
 SOC_FAMILY:append = ":j742s2"

 MACHINE_FEATURES += "screen gpu"
@@ -7,12 +9,10 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 # Default tiboot3.bin on J742S2 is for HS-FS
-TI_BOOTLOADERS += "tiboot3-j742s2-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j742s2-hs-fs-evm"
+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
-TI_BOOTLOADERS += "tiboot3-j742s2-hs-evm.bin"
-TI_MULTICONFIGS += "j742s2-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin"

 TFA_BOARD = "j784s4"

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

 MACHINE_FEATURES += "screen gpu"
@@ -7,16 +9,13 @@ require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"

 # Default tiboot3.bin on J784S4 is for GP
-TI_BOOTLOADERS += "tiboot3-j784s4-gp-evm.bin"
-TI_MULTICONFIGS += "j784s4-gp-evm"
+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
-TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
-TI_MULTICONFIGS += "j784s4-hs-fs-evm"
+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
-TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
-TI_MULTICONFIGS += "j784s4-hs-evm"
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"

 TFA_BOARD = "j784s4"

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

 require conf/machine/include/arm/arch-arm64.inc

-BBMULTICONFIG += "k3r5"
-
 require conf/machine/include/ti-bsp.inc

 KERNEL_IMAGETYPE = "Image"
@@ -48,10 +46,7 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci"

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

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

 EFI_PROVIDER ?= "grub-efi"
@@ -60,6 +55,5 @@ MACHINE_FEATURES += "efi"
 WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"

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

 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
--- a/meta-ti-bsp/conf/machine/include/mc_k3r5.inc
+++ b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc
@@ -0,0 +1,3 @@
+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"
-TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-TI_MULTICONFIGS = ""
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
--- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
@@ -35,6 +35,19 @@ BSP_BOOTLOADER_VERSION:bsp-next = "%"
 # in next, usually present in TI staging or derivative like BB.org
 MACHINE_FEATURES:remove:bsp-next = "gpu"

+# ==========
+# ti-6_12
+# TI staging kernel 6.12, u-boot 2024.10
+# ==========
+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 = "2024.10%"
+
+# GPU support requires out-of-tree SGX and Rogue drivers not available
+# in 6.12 yet
+MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu"
+
 # ==========
 # ti-6_6
 # TI staging kernel 6.6, u-boot 2024.04
@@ -42,7 +55,7 @@ MACHINE_FEATURES:remove:bsp-next = "gpu"
 BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging"
 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%"
+BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"

 # Only Rogue is enabled so far, SGX falls back to SW rendering
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
@@ -109,6 +122,8 @@ 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_VERSION_${BSP_KERNEL_PROVIDER}-systest ?= "${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/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -94,6 +94,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-TI_MULTICONFIGS = ""
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -66,6 +66,5 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-TI_MULTICONFIGS = ""
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
--- a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
+++ b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
@@ -1,16 +0,0 @@
-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
@@ -1,11 +0,0 @@
-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/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -15,9 +15,9 @@ CADENCE_MHDP_FW_VERSION = "2.1.0"
 IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.4"
 TI_DM_FW_VERSION = "10.00.05"
-TI_SYSFW_VERSION = "10.00.08"
+TI_SYSFW_VERSION = "10.01.01"

-TI_LINUX_FW_SRCREV ?= "35fa44a93549d8d91b1c37a7b9f8767dbe7d37eb"
+TI_LINUX_FW_SRCREV ?= "ddb9cc251ace41dfad6650390f82e4a389d3967e"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
@@ -0,0 +1,7 @@
+do_configure:append () {
+   if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ]
+   then
+       oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS}
+       oe_runmake -C ${S} O=${B} olddefconfig
+   fi
+}
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
@@ -6,4 +6,4 @@ PR = "r0"

 BRANCH = "ti-u-boot-2023.04"

-SRCREV = "83660642085462346fbeb410f83bc99448ec7042"
+SRCREV = "7044504f44002fe46b4598420852033d335d56c7"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
@@ -6,4 +6,4 @@ PR = "r0"

 BRANCH = "ti-u-boot-2024.04"

-SRCREV = "7986fd679935818d0ef11e6a334377df178774f6"
+SRCREV = "cdac8b4cd3cc1d1e9ac6354c1cfe03ddbbdf01fa"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.10.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.10.bb
@@ -0,0 +1,11 @@
+require u-boot-ti.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+PR = "r0"
+
+BRANCH = "ti-u-boot-2024.10"
+
+SRCREV = "9cfe0cab3bf135a505e1e163ca442a4e4064d58e"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -1,4 +1,3 @@
-
 do_compile:prepend () {
    scm_version=$(printf '%s%s' -ti-g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12))

@@ -11,8 +10,7 @@ SPL_BINARY ?= "MLO"

 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
-
-inherit uboot-fragments
+require u-boot-mergeconfig.inc

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

@@ -28,6 +26,9 @@ SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"

 PV:append = "+git"

+# u-boot builds a tool mkeficapsule and it needs this
+DEPENDS += "gnutls-native"
+
 # u-boot needs devtree compiler to parse dts files
 DEPENDS += "dtc-native bc-native flex-native bison-native python3-setuptools-native"

@@ -198,12 +199,12 @@ uboot_install:append () {
 }

 do_deploy:append:k3r5 () {
-	rm ${DEPLOYDIR}/u-boot-initial-env* || true
-	rm ${DEPLOYDIR}/${PN}-initial-env* || true
-	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}* || true
-	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}* || true
-	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}* || true
-	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}* || true
+	rm -f ${DEPLOYDIR}/u-boot-initial-env*
+	rm -f ${DEPLOYDIR}/${PN}-initial-env*
+	rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}*
+	rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}*
+	rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}*
+	rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}*
 }

 uboot_deploy_config:append:k3r5 () {
--- a/meta-ti-bsp/recipes-kernel/linux/files/0001-lib-build_OID_registry-fix-reproducibility-issues.patch
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-lib-build_OID_registry-fix-reproducibility-issues.patch
@@ -1,46 +0,0 @@
-From 2fca0fd719812ea2ff67630b01355aa80481623e Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Sun, 10 Jul 2022 22:56:53 -0400
-Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues
-
-The script build_OID_registry captures the full path of itself
-in the generated data. This causes reproduciblity issues as the
-path is captured and packaged.
-
-We use the basename of the script instead, and that allows us
-to be reprodicible, with slightly less information captured in
-the output data (but the generating script can still easily
-be found).
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
- lib/build_OID_registry | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/build_OID_registry b/lib/build_OID_registry
-index d7fc32ea8ac2..f6de0a7f7457 100755
--- a/lib/build_OID_registry
-+++ b/lib/build_OID_registry
-@@ -8,6 +8,7 @@
- #
-
- use strict;
-+use File::Basename;
-
- my @names = ();
- my @oids = ();
-@@ -35,7 +36,7 @@ close IN_FILE || die;
- #
- open C_FILE, ">$ARGV[1]" or die;
- print C_FILE "/*\n";
-print C_FILE " * Automatically generated by ", $0, ".  Do not edit\n";
-+print C_FILE " * Automatically generated by ", basename $0, ".  Do not edit\n";
- print C_FILE " */\n";
-
- #
--
-2.25.1
--- a/meta-ti-bsp/recipes-kernel/linux/files/0001-pnmtologo-use-relocatable-file-name.patch
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-pnmtologo-use-relocatable-file-name.patch
@@ -1,55 +0,0 @@
-From a40d2daf2795d89e3ef8af0413b25190558831ec Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Thu, 14 Jul 2022 14:43:46 -0400
-Subject: [PATCH] pnmtologo: use relocatable file name
-
-The logo generation utility is capturing the source of the logo
-in the generated .c file. The source file is absolute (as passed
-by make), so the full path is captured.
-
-This makes the source fail reproducibility tests.
-
-We use basename() to just get the source file name, and use
-that in the generated .c file.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
- drivers/video/logo/pnmtologo.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c
-index ada5ef6e51b7..7527be845443 100644
--- a/drivers/video/logo/pnmtologo.c
-+++ b/drivers/video/logo/pnmtologo.c
-@@ -13,7 +13,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-
-+#include <libgen.h>
-
- static const char *programname;
- static const char *filename;
-@@ -223,6 +223,7 @@ static inline int is_equal(struct color c1, struct color c2)
-
- static void write_header(void)
- {
-+	char *filename_basename = basename(filename);
-	/* open logo file */
-	if (outputname) {
-		out = fopen(outputname, "w");
-@@ -235,7 +236,7 @@ static void write_header(void)
-	fputs("/*\n", out);
-	fputs(" *  DO NOT EDIT THIS FILE!\n", out);
-	fputs(" *\n", out);
-	fprintf(out, " *  It was automatically generated from %s\n", filename);
-+	fprintf(out, " *  It was automatically generated from %s\n", filename_basename);
-	fputs(" *\n", out);
-	fprintf(out, " *  Linux logo %s\n", logoname);
-	fputs(" */\n\n", out);
--
-2.25.1
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig
@@ -0,0 +1 @@
+use-kernel-config=davinci_all_defconfig
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=davinci_all_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
@@ -8,8 +8,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"

 BRANCH = "ti-rt-linux-6.1.y"

-SRCREV = "96b0ebd82722d16e9ab646cd3a73080e6f790747"
+SRCREV = "258616ead12edc4acf7ac38e741d588b372144e4"

 include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}

-PV = "6.1.83+git"
+PV = "6.1.105+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
@@ -0,0 +1,9 @@
+require linux-ti-staging_6.12.bb
+
+KERNEL_LOCALVERSION:append = "-rt"
+
+# Look in the generic major.minor directory for files
+# This will have priority over generic non-rt path
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
+
+include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
@@ -8,8 +8,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"

 BRANCH = "ti-rt-linux-6.6.y"

-SRCREV = "fb018c5e9fa7eb05fa1cb2e87760d9c1e430da64"
+SRCREV = "517163f797b81a8277a000d6a1c9dfd89b3711b8"

 include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}

-PV = "6.6.32+git"
+PV = "6.6.44+git"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/omapl138/defconfig
@@ -0,0 +1 @@
+use-kernel-config=davinci_all_defconfig
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb
@@ -0,0 +1,7 @@
+require linux-ti-staging_6.12.bb
+
+DEFAULT_PREFERENCE = "-1"
+
+# Look in the generic major.minor directory for files
+# This will have priority over generic non-rt path
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"

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

-SRCREV ?= "c1c2f1971fbf6ddad93a8c94314fe8221e7aa6be"
-PV = "6.1.83+git"
+SRCREV ?= "da449d8c3cf600b0346a6696e1e3cc431422e765"
+PV = "6.1.105+git"

 KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
 KERNEL_GIT_PROTOCOL = "https"
--- 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
@@ -0,0 +1,40 @@
+SECTION = "kernel"
+SUMMARY = "Linux kernel for TI devices"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+inherit ti-secdev
+inherit kernel
+
+DEFAULT_PREFERENCE = "-1"
+
+require recipes-kernel/linux/setup-defconfig.inc
+require recipes-kernel/linux/ti-kernel.inc
+include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
+include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+DEPENDS += "gmp-native libmpc-native"
+
+# Look in the generic major.minor directory for files
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
+		      ${EXTRA_DTC_ARGS}"
+
+S = "${WORKDIR}/git"
+
+BRANCH ?= "ti-linux-6.12.y"
+
+SRCREV ?= "8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b"
+PV = "6.12.0+git"
+
+KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
+KERNEL_GIT_PROTOCOL = "https"
+SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
+            file://defconfig"
+
+# Special configuration for remoteproc/rpmsg IPC modules
+module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
+module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
+module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
+KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"

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

-SRCREV ?= "c0deda7906ed2661afaa841e1d822932a37f38f6"
-PV = "6.6.32+git"
+SRCREV ?= "32ae7316ddc6d9b6bb0d87706cf7daa44c4c1e92"
+PV = "6.6.44+git"

 KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
 KERNEL_GIT_PROTOCOL = "https"
--- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
@@ -20,10 +20,12 @@ KERNEL_PATCHES:bsp-mainline = " \
    file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
 "

+KERNEL_PATCHES:bsp-ti-6_12 = " \
+    file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
+"
+
 KERNEL_PATCHES:bsp-ti-6_6 = " \
-    file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
    file://0001-vt-conmakehash-improve-reproducibility.patch \
-    file://0001-pnmtologo-use-relocatable-file-name.patch \
 "

 SRC_URI:append = " ${KERNEL_PATCHES} "
--- 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.2.0+git"
-SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0"
+PV = "4.3.0+git"
+SRCREV = "a5b1ffcd26e328af0bbf18ab448a38ecd558e05c"
--- 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.2.0+git"
+PV = "4.3.0+git"
 SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
--- 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,2 +1,8 @@
-PV = "4.2.0+git"
-SRCREV = "12d7c4ee4642d2d761e39fbcf21a06fb77141dea"
+PV = "4.3.0+git"
+SRCREV = "1c0d52ace3c237ca6276cafb5c73f699a75c1d40"
+
+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 \
+    file://0002-libutils-zlib-fix-Clang-warnings.patch \
+"
--- 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,2 +1,8 @@
-PV = "4.2.0+git"
-SRCREV = "526d5bac1b65f907f67c05cd07beca72fbab88dd"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"
+
+PV = "4.3.0+git"
+SRCREV = "9d4c4fb9638fb533211037016b6da12fbbcc4bb6"
+
+SRC_URI:remove = " \
+    file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \
+"
--- a/meta-ti-bsp/recipes-ti/ti-unified-wic/files/LICENSE
+++ b/meta-ti-bsp/recipes-ti/ti-unified-wic/files/LICENSE
@@ -1,7 +0,0 @@
-Copyright 2024 Texas Instruments, Inc.
-
-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-ti-bsp/recipes-ti/ti-unified-wic/files/ti_unified_wic.sh
+++ b/meta-ti-bsp/recipes-ti/ti-unified-wic/files/ti_unified_wic.sh
@@ -1,370 +0,0 @@
-#!/usr/bin/env bash
-
-glRealBin=$(cd "$(dirname "$0")"; pwd)
-glScript=$(basename "$0")
-
-glDeployDir=""
-glImage=""
-glVariant=""
-glMultiConfig=""
-glOutput=""
-
-glListOptions="false"
-glListImages="false"
-glListVariants="false"
-glListMultiConfigs="false"
-glCleanWorkDir="false"
-
-glConfigFN="ti_unified_wic.cfg"
-
-glRunDir=$(pwd)
-glWorkDir="${glRunDir}/.ti_unified_wic.workdir"
-
-glOeCoreRepoDN="oe-core-repo"
-glOeCoreRepoFPDN="${glWorkDir}/${glOeCoreRepoDN}"
-
-glBmaptoolRepoDN="bmaptool-repo"
-glBmaptoolRepoFPDN="${glWorkDir}/${glBmaptoolRepoDN}"
-
-
-read_config()
-{
-    local loConfigFPFN="${glDeployDir}/${glConfigFN}"
-
-    glConfigMachine=""
-    glConfigVariants=""
-    glConfigMultiConfigs=""
-    glConfigBootloaders=""
-
-    local loSection=""
-
-    while CFG_IN= read -r lpLine
-    do
-        case "$lpLine" in
-            \[machine\])      loSection="machine" ;;
-            \[variants\])     loSection="variants" ;;
-            \[multiconfigs\]) loSection="multiconfigs" ;;
-            \[bootloaders\])  loSection="bootloaders" ;;
-            \#*)  ;;
-            "")  ;;
-            *) [ "$loSection" == "machine" ]      && glConfigMachine="${lpLine}";
-               [ "$loSection" == "variants" ]     && glConfigVariants="${glConfigVariants} ${lpLine}";
-               [ "$loSection" == "multiconfigs" ] && glConfigMultiConfigs="${glConfigMultiConfigs} ${lpLine}";
-               [ "$loSection" == "bootloaders" ]  && glConfigBootloaders="${glConfigBootloaders} ${lpLine}";
-                ;;
-        esac
-    done <$loConfigFPFN
-
-    glConfigImages=""
-    glConfigWics=""
-
-    for lpWic in `ls ${glDeployDir}/*.wic.xz`; do
-        if [ ! -L "${lpWic}" ]; then
-            local loWic=$(basename $lpWic);
-            local loImage=`echo ${loWic} | awk -F "-${glConfigMachine}" '{printf($1)}'`
-            glConfigImages="${glConfigImages} ${loImage}"
-            glConfigWics="${glConfigWics} ${loImage}:${loWic}"
-        fi
-    done
-}
-
-list_options()
-{
-    echo "Images:"
-    for lpImage in $glConfigImages; do
-        echo "  ${lpImage}"
-    done
-
-    echo ""
-
-    echo "U-Boot Variants:"
-    for lpVariant in $glConfigVariants; do
-        echo "  ${lpVariant}"
-    done
-
-    echo ""
-
-    echo "U-Boot Multi-Configs:"
-    for lpMultiConfig in $glConfigMultiConfigs; do
-        echo "  ${lpMultiConfig}"
-    done
-}
-
-list_images()
-{
-    echo $glConfigImages
-}
-
-list_variants()
-{
-    echo $glConfigVariants
-}
-
-list_multiconfigs()
-{
-    echo $glConfigMultiConfigs
-}
-
-clean_work_dir() {
-    rm -rf ${glWorkDir}
-}
-
-copy_and_update_wic()
-{
-    local loWicImageFN=""
-    for lpWic in $glConfigWics; do
-        local loImage=`echo ${lpWic} | awk -F : '{printf($1)}'`
-        if [ "${loImage}" == "${glImage}" ]; then
-            loWicImageFN=`echo ${lpWic} | awk -F : '{printf($2)}'`
-            break
-        fi
-    done
-
-    if [ "${loWicImageFN}" == "" ]; then
-        echo "ERROR: Invalid image \"$glImage\"."
-        exit 1
-    fi
-
-    local loSourceWic="${glDeployDir}/${loWicImageFN}"
-
-    local loTempWic="${glWorkDir}/temp.wic"
-    local loTempWicXz="${loTempWic}.xz"
-
-    echo -n "Copying and uncompressing source wic file..."
-    cp ${loSourceWic} ${loTempWicXz}
-    xz --decompress -f -k --memlimit=50% --threads=$(nproc) ${loTempWicXz}
-    echo "done"
-
-    #${glOeCoreRepoFPDN}/scripts/wic ls ${loTempWic}:1
-
-    echo "Installing new bootloader files..."
-    for lpFile in $glConfigBootloaders; do
-        if [ "${glVariant}" != "" ]; then
-            echo "    ${lpFile}-${glVariant} -> ${lpFile}"
-            ${glOeCoreRepoFPDN}/scripts/wic rm ${loTempWic}:1/${lpFile}
-            ${glOeCoreRepoFPDN}/scripts/wic cp ${glDeployDir}/${lpFile}-${glVariant} ${loTempWic}:1/${lpFile}
-        fi
-
-        if [ "${glMultiConfig}" != "" ]; then
-            if [[ "${lpFile}" =~ ^(.+)-${glMultiConfig}(.+) ]]; then
-                local loFront=${BASH_REMATCH[1]}
-                local loBack=${BASH_REMATCH[2]}
-
-                local loBootloader="${loFront}${loBack}"
-
-                if [ "${glVariant}" != "" ]; then
-                    echo "    ${lpFile}-${glVariant} -> ${loBootloader}"
-                    ${glOeCoreRepoFPDN}/scripts/wic rm ${loTempWic}:1/${loBootloader}
-                    ${glOeCoreRepoFPDN}/scripts/wic cp ${glDeployDir}/${lpFile}-${glVariant} ${loTempWic}:1/${loBootloader}
-                else
-                    echo "    ${lpFile} -> ${loBootloader}"
-                    ${glOeCoreRepoFPDN}/scripts/wic rm ${loTempWic}:1/${loBootloader}
-                    ${glOeCoreRepoFPDN}/scripts/wic cp ${glDeployDir}/${lpFile} ${loTempWic}:1/${loBootloader}
-                fi
-            fi
-        fi
-    done
-    echo "done"
-
-    #${glOeCoreRepoFPDN}/scripts/wic ls ${loTempWic}:1
-
-    echo -n "Generating bmap file..."
-    cd ${glBmaptoolRepoFPDN}/src
-    python3 -m bmaptool create ${loTempWic} -o ${glOutput}.bmap
-    echo "done"
-
-    cd ${glRunDir}
-
-    echo -n "Compressing target wic file..."
-    xz -f -k -c -6 --memlimit=50% --threads=$(nproc) --check=crc32 ${loTempWic} > ${glOutput}
-    echo "done"
-    
-    rm -f ${loTempWic} ${loTempWicXz}
-}
-
-function git_clone()
-{
-    local arRepoUrl=$1
-    local arRepoDir=$2
-
-    cd ${glWorkDir}
-
-    if [ ! -d $arRepoDir ]; then
-        echo ""
-        echo "Cloning $arRepoDir..."
-        echo ""
-
-        git clone ${arRepoUrl} ${arRepoDir}
-    fi
-
-    cd ${glRunDir}
-}
-
-usage()
-{
-    echo "Usage:" >&2
-    echo "" >&2
-    echo "$glScript" >&2
-    echo "" >&2
-    echo "  --image <image>         Image to use as the base for the new wic image." >&2
-    echo "  --output <path>         Path to where the new wic should be placed." >&2
-    echo "" >&2
-    echo "  [--deploy-dir <path>]   Path to the directory that contains the wic images," >&2
-    echo "                          bootloaders, config, etc...  If you do not specify" >&2
-    echo "                          this option, it will be set to the location where" >&2
-    echo "                          the \"${glConfigFN}\" config file is found." >&2
-    echo "  [--variant <variant>]   U-Boot variant to install." >&2
-    echo "  [--multiconfig <cfg>]   U-Boot multiconfig to install." >&2
-    echo "" >&2
-    echo "  [--list-options]        Print a report of all available options for image" >&2
-    echo "                          variant, and multiconfig from the config file." >&2
-    echo "  [--list-images]         Print the available images in the deploy-dir." >&2
-    echo "  [--list-variants]       Print the available U-Boot variants from the config" >&2
-    echo "                          file." >&2
-    echo "  [--list-multiconfigs]   Print the available U-Boot multiconfigs from the" >&2
-    echo "                          config file." >&2
-    echo "  [--clean-workdir]       Remove the workdir and clean up any left over files" >&2
-    echo "                          from running the command.  This option should only" >&2
-    echo "                          be called once all of the calls to the script are" >&2
-    echo "                          complete as this removes the git repos for the wic." >&2
-    echo "                          and bmaptool programs." >&2
-    echo "  [--help]                Show this screen]" >&2
-}
-
-
-###############################################################################
-# Process the command line arguments and set global variables for each one.
-###############################################################################
-glOptSpec="h-:"
-while getopts "$glOptSpec" lpArg; do
-    case "${lpArg}" in
-        -)
-            case "${OPTARG}" in
-                deploy-dir)     loVal="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 ));  glDeployDir=$loVal;;
-                deploy-dir=*)   loVal=${OPTARG#*=}; loOpt=${OPTARG%=$loVal};    glDeployDir=$loVal;;
-                image)          loVal="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 ));  glImage=$loVal;;
-                image=*)        loVal=${OPTARG#*=}; loOpt=${OPTARG%=$loVal};    glImage=$loVal;;
-                variant)        loVal="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 ));  glVariant=$loVal;;
-                variant=*)      loVal=${OPTARG#*=}; loOpt=${OPTARG%=$loVal};    glVariant=$loVal;;
-                multiconfig)    loVal="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 ));  glMultiConfig=$loVal;;
-                multiconfig=*)  loVal=${OPTARG#*=}; loOpt=${OPTARG%=$loVal};    glMultiConfig=$loVal;;
-                output)         loVal="${!OPTIND}"; OPTIND=$(( $OPTIND + 1 ));  glOutput=$loVal;;
-                ouptut=*)       loVal=${OPTARG#*=}; loOpt=${OPTARG%=$loVal};    glOutput=$loVal;;
-
-                list-options)                                                   glListOptions="true";;
-                list-images)                                                    glListImages="true";;
-                list-variants)                                                  glListVariants="true";;
-                list-multiconfigs)                                              glListMultiConfigs="true";;
-                clean-workdir)                                                  glCleanWorkDir="true";;
-
-                help)                                                           usage; exit 0;;
-                *)
-                    if [ "$OPTERR" = 1 ] && [ "${glOptSpec:0:1}" != ":" ]; then
-                        usage
-                        echo "" >&2
-                        echo "Unknown option --${OPTARG}" >&2
-                        echo "" >&2
-                        exit 0
-                    fi
-                    exit 1;
-                    ;;
-            esac;;
-        h)  usage; exit 0;;
-    esac
-done
-
-glFailedArgCheck=0
-
-echo "$glConfigFN"
-if [ "${glDeployDir}" == "" ]; then
-    if [ -f $glConfigFN ]; then
-        glDeployDir="${glRunDir}"
-    fi
-fi
-
-if [ "${glDeployDir}" == "" ]; then
-    if [ -f "${glRealBin}/${glConfigFN}" ]; then
-        glDeployDir="${glRealBin}"
-    fi
-fi
-
-if [ "${glDeployDir}" == "" ]; then
-    echo "ERROR: You must specify --deploy-dir <dir> where all of the deployed files reside."
-    glFailedArgCheck=1
-fi
-
-read_config
-
-if [ "${glListImages}" == "true" ]; then
-    list_images
-    exit
-fi
-
-if [ "${glListVariants}" == "true" ]; then
-    list_variants
-    exit
-fi
-
-if [ "${glListMultiConfigs}" == "true" ]; then
-    list_multiconfigs
-    exit
-fi
-
-if [ "${glCleanWorkDir}" == "true" ]; then
-    clean_work_dir
-    exit
-fi
-
-echo ""
-echo "${glScript}"
-echo "-----------------"
-echo ""
-
-if [ "${glListOptions}" == "true" ]; then
-    list_options
-    exit
-fi
-
-if [ "${glImage}" == "" ]; then
-    echo "ERROR: You must specify --image <image> to choose which image wic file to pull from."
-    glFailedArgCheck=1
-fi
-
-if [[ "${glVariant}" == "" && "${glMultiConfig}" == "" ]]; then
-    echo "ERROR: You must specify --variation <variation> and/or --multiconfig <multiconfig> to choose which set of bootloaders to configure on the target wic image."
-    glFailedArgCheck=1
-fi
-
-if [ "${glOutput}" == "" ]; then
-    echo "ERROR: You must specify --output <file> to point to the new wic file you want to create with the applied variation."
-    glFailedArgCheck=1
-fi
-
-glOutput=$(realpath ${glOutput})
-
-if [ "${glFailedArgCheck}" == "1" ]; then
-    echo ""
-    echo "Aborting"
-    exit 1
-fi
-
-echo "WORK-DIR:     ${glWorkDir}"
-echo "DPELOY-DIR:   ${glDeployDir}"
-echo "IMAGE:        ${glImage}"
-if [ "${glVariant}" != "" ]; then
-    echo "VARIANT:      ${glVariant}"
-fi
-if [ "${glMultiConfig}" != "" ]; then
-    echo "MULTI-CONFIG: ${glMultiConfig}"
-fi
-echo "OUTPUT:       ${glOutput}"
-
-mkdir -p ${glWorkDir}
-
-git_clone https://git.openembedded.org/openembedded-core ${glOeCoreRepoDN}
-git_clone https://github.com/yoctoproject/bmaptool.git ${glBmaptoolRepoDN}
-
-echo ""
-
-copy_and_update_wic
-
--- a/meta-ti-bsp/recipes-ti/ti-unified-wic/ti-unified-wic.bb
+++ b/meta-ti-bsp/recipes-ti/ti-unified-wic/ti-unified-wic.bb
@@ -1,37 +0,0 @@
-SUMMARY = "TI Unified WIC builder"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=92b3423643fe55420ad98ab5bef7c799"
-
-inherit deploy
-
-SRC_URI = " \
-    file://ti_unified_wic.sh;name=ti_unified_wic \
-    file://LICENSE;name=license \
-"
-
-SRC_URI[ti_unified_wic.sha256sum] = "aecf38ebca7f25263d4656d12b210db1197aca92d311d44f924906bb86982b7a"
-SRC_URI[license.sha256sum] = "2a0aebb221c0b2b97b907baf8eb103fb3474cfcadb78667859e028a5e52e984c"
-
-S = "${WORKDIR}"
-
-do_deploy() {
-
-    install -m 0755 ${S}/ti_unified_wic.sh ${DEPLOYDIR}
-
-    loCfg="${DEPLOYDIR}/ti_unified_wic.cfg"
-
-    echo "[machine]" > $loCfg
-    echo "${MACHINE}" >> $loCfg
-    echo "" >> $loCfg
-    echo "[variants]" >> $loCfg
-    echo "${UBOOT_CONFIG}" >> $loCfg
-    echo "" >> $loCfg
-    echo "[multiconfigs]" >> $loCfg
-    echo "${TI_MULTICONFIGS}" >> $loCfg
-    echo "" >> $loCfg
-    echo "[bootloaders]" >> $loCfg
-    echo "${TI_BOOTLOADERS}" >> $loCfg
-}
-
-addtask deploy after do_install before do_build
-
--- a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
@@ -1,65 +0,0 @@
-SUMMARY = "Firmware for DSP for an example application called copycodectest"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://src/ti/framework/dce/dce.c;startline=1;endline=31;md5=2c6e9aba6ed75f22b1a2b7544b1c809d"
-
-COMPATIBLE_MACHINE = "dra7xx"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "dsp"
-
-SRC_URI = "git://git.ti.com/git/glsdk/dspdce.git;protocol=https;branch=master"
-
-SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8"
-
-PV = "1.00.00.07"
-
-S = "${WORKDIR}/git"
-
-require recipes-ti/includes/ti-paths.inc
-
-PR = "r4"
-inherit update-alternatives
-
-DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ipc-rtos ti-osal ti-cgt6x-native"
-
-export HWVERSION = "ES10"
-export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti"
-
-export XDCVERSION = "ti-xdctools-tree"
-export BIOSVERSION = "ti-sysbios-tree"
-export IPCVERSION = "ti-ipc-tree"
-export CEVERSION = "ti-codec-engine-tree"
-export FCVERSION = "ti-framework-components-tree"
-export XDAISVERSION = "ti-xdais-tree"
-export OSALVERSION = "ti-osal-tree"
-
-export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
-export C66XCGTOOLSPATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-
-do_configure() {
-    cd ${S}
-    make unconfig
-    make vayu_config
-}
-
-do_compile() {
-    cd ${S}
-    make dspbin
-}
-
-TARGET = "dra7-dsp1-fw.xe66"
-
-do_install() {
-    install -d ${D}${nonarch_base_libdir}/firmware
-    install -m 0644 ${S}/dra7xx-c66x-dsp.xe66 ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN}
-}
-
-ALTERNATIVE:${PN} = "dra7-dsp1-fw.xe66"
-ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/${TARGET}"
-ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}"
-ALTERNATIVE_PRIORITY = "10"
-
-INSANE_SKIP:${PN} = "arch"
-
-FILES:${PN} += "${nonarch_base_libdir}/firmware/*"
--- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
@@ -18,4 +18,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

 include dsptop.inc

-SRC_URI += "file://0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch"
+SRC_URI += "\
+    file://0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch \
+    file://0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch \
+"
--- a/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch
+++ b/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch
@@ -0,0 +1,58 @@
+From aaddf1fa8b92db23ae2ebc83826c2bb5f5c87c35 Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Thu, 3 Oct 2024 14:25:18 -0500
+Subject: [PATCH] debugss_kmodule: kernel 6.11 changed return value for remove
+ slot
+
+In kernel version 6.11 the function footprint changed for the remove
+slot to return a void instead of an int. [1]
+
+Add ifdef checking code to look for kernel version and pick the correct
+return code.
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/linux/platform_device.h?id=0edb555a65d1ef047a9805051c36922b52a38a9d
+
+Upstream-Status: Inactive-Upstream [lastcommit: 2021-04-20]
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ debugss_kmodule.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/debugss_kmodule.c b/debugss_kmodule.c
+index 9e084eb..4191be8 100644
+--- a/debugss_kmodule.c
+++ b/debugss_kmodule.c
+@@ -27,6 +27,7 @@
+ #include "debugss_kmodule.h"
+ 
+ #include <linux/mod_devicetable.h>
+#include <linux/version.h>
+ 
+ /* un-comment the line below to enable printing for kernel debug messages */
+ //#define DEBUGSS_DRV_DEBUG
+@@ -1132,7 +1133,11 @@ static int dra7xx_debugss_probe(struct platform_device *pdev)
+ 	return retval;
+ }
+ 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
+ static int dra7xx_debugss_remove(struct platform_device *pdev)
+#else
+static void dra7xx_debugss_remove(struct platform_device *pdev)
+#endif
+ {
+ 	__D("%s:\n",__FUNCTION__);
+ 
+@@ -1145,7 +1150,9 @@ static int dra7xx_debugss_remove(struct platform_device *pdev)
+ 	/* Un-prepare debugSS clock */
+ 	clk_disable_unprepare(sys_clk_in1);
+ 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
+ 	return 0;
+#endif
+ }
+ 
+ static const struct of_device_id dra7xx_debugss_of_match[] = {
+-- 
+2.17.1
+
--- a/meta-ti-extras/recipes-ti/includes/ti-paths.inc
+++ b/meta-ti-extras/recipes-ti/includes/ti-paths.inc
@@ -20,7 +20,6 @@ export MATHLIB_C66_INSTALL_DIR_RECIPE  = "${installdir}/ti-mathlib-c66x-tree"
 export MATHLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c674x-tree"
 export MPM_INSTALL_DIR_RECIPE          = "${installdir}/ti-mpm-tree"
 export OMP_INSTALL_DIR_RECIPE          = "${installdir}/ti-omp-tree"
-export OSAL_INSTALL_DIR_RECIPE         = "${installdir}/ti-osal-tree"
 export PDK_INSTALL_DIR_RECIPE          = "${installdir}/ti-pdk-tree"
 export SYSBIOS_INSTALL_DIR_RECIPE      = "${installdir}/ti-sysbios-tree"
 export SWTOOLS_INSTALL_DIR_RECIPE      = "${installdir}/ti-swtools-tree"
@@ -48,7 +47,6 @@ export MATHLIB_C66_INSTALL_DIR  = "${STAGING_DIR_TARGET}${MATHLIB_C66_INSTALL_DI
 export MATHLIB_C674_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C674_INSTALL_DIR_RECIPE}"
 export MPM_INSTALL_DIR          = "${STAGING_DIR_TARGET}${MPM_INSTALL_DIR_RECIPE}"
 export OMP_INSTALL_DIR          = "${STAGING_DIR_TARGET}${OMP_INSTALL_DIR_RECIPE}"
-export OSAL_INSTALL_DIR         = "${STAGING_DIR_TARGET}${OSAL_INSTALL_DIR_RECIPE}"
 export PDK_INSTALL_DIR          = "${STAGING_DIR_TARGET}${PDK_INSTALL_DIR_RECIPE}"
 export SWTOOLS_INSTALL_DIR      = "${STAGING_DIR_TARGET}${SWTOOLS_INSTALL_DIR_RECIPE}"
 export SYSBIOS_INSTALL_DIR      = "${STAGING_DIR_TARGET}${SYSBIOS_INSTALL_DIR_RECIPE}"
--- a/meta-ti-extras/recipes-ti/osal/ti-osal.inc
+++ b/meta-ti-extras/recipes-ti/osal/ti-osal.inc
@@ -1,24 +0,0 @@
-DESCRIPTION = "TI Operating System Abstraction Library (OSAL)"
-HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/osal"
-LICENSE = "BSD-3-Clause & EPL-1.0"
-SECTION = "devel"
-
-require ../includes/ti-paths.inc
-require ../includes/ti-staging.inc
-
-S = "${WORKDIR}/osal_${PV}"
-
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/osal/${PV}/exports/osal_${PV}.tar.gz;name=osaltarball"
-
-do_install() {
-    install -d ${D}${OSAL_INSTALL_DIR_RECIPE}
-    cp -pPrf ${S}/* ${D}${OSAL_INSTALL_DIR_RECIPE}
-}
-
-INSANE_SKIP:${PN}-dev = "staticdev"
-
-ALLOW_EMPTY:${PN} = "1"
-FILES:${PN}-dev += "${OSAL_INSTALL_DIR_RECIPE}"
-
-COMPATIBLE_HOST ?= "null"
-COMPATIBLE_HOST:ti-soc = "(.*)"
--- a/meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb
+++ b/meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb
@@ -1,9 +0,0 @@
-require ti-osal.inc
-
-PV = "1_24_00_09"
-PR = "r0"
-
-LIC_FILES_CHKSUM = "file://osal_${PV}_Manifest.html;md5=c110191994d011cee4cd02189ed3c9f4"
-
-SRC_URI[osaltarball.md5sum] = "a7ea85447fa0ff0f786d527a52fa6e8b"
-SRC_URI[osaltarball.sha256sum] = "d14f1f43c8a7965e86add69bd813cea56ea7e38abeb55de3fdcdaf4a69f19bf3"
Author	SHA1	Message	Date
LCPD Automation Script	c82f29cae7	CI/CD Auto-Merger: cicd.scarthgap.202410100400 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION u-boot-ti-staging_2024.04: SRCREV u-boot-ti-staging_2024.10: SRCREV linux-ti-staging-rt_6.6: SRCREV linux-ti-staging_6.12: PV,SRCREV linux-ti-staging_6.6: SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=64248dad39a9448ad191bc04130c49e0354cb2ce..ddb9cc251ace41dfad6650390f82e4a389d3967e u-boot-ti-staging_2024.04: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=b78dde22088773147d80c3b85c885d9be7a2bfab..cdac8b4cd3cc1d1e9ac6354c1cfe03ddbbdf01fa u-boot-ti-staging_2024.10: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=c97ada2dc66934ee00a7a03d9ed078bdfb7b4039..9cfe0cab3bf135a505e1e163ca442a4e4064d58e linux-ti-staging-rt_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=d05688f353d10af170286db56535443184202eab..517163f797b81a8277a000d6a1c9dfd89b3711b8 linux-ti-staging_6.12: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=9852d85ec9d492ebef56dc5f229416c925758edc..8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b linux-ti-staging_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=325ad3650d0b50a4943b9151fb43411f08ad5d0c..32ae7316ddc6d9b6bb0d87706cf7daa44c4c1e92 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2024-10-10 04:00:55 -05:00
Ryan Eatmon	47ebda87ea	ti-bsp: Add RT and systest support We were missing controlling the versions for linux-ti-staging-rt and linux-ti-staging-systest using the BSP framework. Since the PREFERRED_VERSION is not tied to the virtual/kernel we need two additional settings for those alternate kernel package names. For BSPs that do not have the -rt and -systest recipes then the two new variable settings should effectively be ignored and cause no issues. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-10-09 08:48:32 -05:00
Ryan Eatmon	e9913bd85d	debugss-module-drv: Add patch for kernel 6.11 change There was a change to the return value for a function pointer in the kernel v6.11. This patch adapts the module to the kernel change. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-10-08 15:44:25 -05:00
Ryan Eatmon	124d54ec4f	ti-bsp: Add ti-6_12 Add new BSP for the 6.12 kernel and u-boot 2024.10 versions. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-10-08 15:44:25 -05:00
Ryan Eatmon	de9414801c	u-boot-ti-staging: Add v2024.10 recipe Adding needed recipe for initial testing and development of the 2024.10 version of u-boot for the next LTS. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-10-08 15:43:20 -05:00
Ryan Eatmon	8be5ed9003	linux-ti-staging: Add v6.12 recipe Adding needed recipes for initial testing and development of the 6.12 kernel for the next LTS. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-10-08 15:43:20 -05:00
Ryan Eatmon	dcd39720f6	optee: Update to v4.3.0 Update all of the components to the upstream 4.3.0 version. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-10-08 15:43:20 -05:00
Jose Quaresma	d06fd153d0	u-boot-ti: avoid write erros on the logs when removing deployed files This will prevent a lot of noise on the build logs. Currently we have some erros: rm: cannot remove 'file' No such file or directory Like the following: \| rm: cannot remove '/lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-initial-env' \| : No such file or directory \| + true \| + rm /lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-ti-staging-initial-env /lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-ti-staging-initial-env-am64xx-evm-k3r5 /lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-ti-staging-initial-env-am64xx-evm-k3r5-2024.04+git-r0 \| + rm /lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-initial-env-am64xx-evm-k3r5 \| rm: cannot remove '/lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-initial-env-am64xx-evm-k3r5' \| : No such file or directory \| + true \| + rm /lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-ti-staging-initial-env-am64xx-evm-k3r5 \| rm: cannot remove '/lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-ti-staging-initial-env-am64xx-evm-k3r5' \| : No such file or directory \| + true \| + rm /lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-initial-env-am64xx-evm-k3r5-2024.04+git-r0 \| rm: cannot remove '/lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-initial-env-am64xx-evm-k3r5-2024.04+git-r0' \| : No such file or directory \| + true \| + rm /lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-ti-staging-initial-env-am64xx-evm-k3r5-2024.04+git-r0 \| rm: cannot remove '/lmp/build/tmp-lmp-k3r5/work/am64xx_evm_k3r5-lmp-eabi/u-boot-ti-staging/2024.04+git/deploy-u-boot-ti-staging/u-boot-ti-staging-initial-env-am64xx-evm-k3r5-2024.04+git-r0*' \| : No such file or directory \| + true Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-10-04 11:41:13 -05:00
LCPD Automation Script	caf03395d7	CI/CD Auto-Merger: cicd.scarthgap.202410040400 Updated the value(s) for: u-boot-ti-staging_2023.04: SRCREV linux-ti-staging-rt_6.1: PV,SRCREV linux-ti-staging_6.1: PV,SRCREV Changelogs: u-boot-ti-staging_2023.04: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=83660642085462346fbeb410f83bc99448ec7042..7044504f44002fe46b4598420852033d335d56c7 linux-ti-staging-rt_6.1: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=96b0ebd82722d16e9ab646cd3a73080e6f790747..258616ead12edc4acf7ac38e741d588b372144e4 linux-ti-staging_6.1: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=c1c2f1971fbf6ddad93a8c94314fe8221e7aa6be..da449d8c3cf600b0346a6696e1e3cc431422e765 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2024-10-04 04:00:44 -05:00
LCPD Automation Script	c47b32806d	CI/CD Auto-Merger: cicd.scarthgap.202410020400 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=821faad142f51304bf2f8e0526838f17dc247825..64248dad39a9448ad191bc04130c49e0354cb2ce Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2024-10-02 04:00:37 -05:00
LCPD Automation Script	19784e27f9	CI/CD Auto-Merger: cicd.scarthgap.202409271545 Updated the value(s) for: ti-linux-fw: TI_LINUX_FW_SRCREV u-boot-ti-staging_2024.04: SRCREV linux-ti-staging-rt_6.6: PV,SRCREV linux-ti-staging_6.6: PV,SRCREV Changelogs: ti-linux-fw: https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/log/?qt=range&q=35fa44a93549d8d91b1c37a7b9f8767dbe7d37eb..821faad142f51304bf2f8e0526838f17dc247825 u-boot-ti-staging_2024.04: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=7986fd679935818d0ef11e6a334377df178774f6..b78dde22088773147d80c3b85c885d9be7a2bfab linux-ti-staging-rt_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=85d46cfcef8242e37cbd99a6591cab2b90d0d8ed..d05688f353d10af170286db56535443184202eab linux-ti-staging_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=d5b1bee95de93e6ab87e73242c20910e7d7d3d83..325ad3650d0b50a4943b9151fb43411f08ad5d0c Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2024-09-27 15:46:25 -05:00
Ryan Eatmon	ee060643e2	linux: Remove two 6.6 reproducibility patches The upcoming SRCREV change to the linux-ti 6.6 kernel version no longer needs these two patches, and they are blocking the CICD promotion being in place. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-09-24 10:59:17 -05:00
Andrew Davis	8634e44674	meta-ti-extras: ti-osal: Remove this recipe Last user was dspdce-fw which is removed. Remove this now unused support library. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-09-23 13:52:17 -05:00
Andrew Davis	b8523a7b03	meta-ti-extras: dspdce-fw: Remove unused firmware This was an attempt to run the DCE server firmware on the DSP instead of on the IPU M4 cores. Not widely used and not used at all anymore, remove the firmware for this. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-09-23 13:52:17 -05:00
Andrew Davis	2a95f97903	cmem: Remove CMEM userspace library CMEM has been deprecated for removal for some time now. All users should have migrated to the Linux upstream DMA-BUF Heaps framework. Remove CMEM. We have already removed the CMEM kernel module but left the CMEM userspace recipe to prevent breaking meta-arago builds which had some leftover packages that still had a dependency on it. Nothing we now build still needs this now so drop it out also. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-09-23 13:50:34 -05:00
Chirag Shilwant	acaca70dea	conf: machine: Remove multiconfig compulsion for k3 platforms - While implementing k3.inc, there was an assumption that all k3 based TI SOC's would always have a Cortex-R5F core [1]. This assumption is not true. - Hence, create a new mc_k3r5 include file & move the multiconfig dependencies to it. Also, include this file only in those k3 platforms which needs the R5 multiconfig support. [1]: https://git.ti.com/cgit/arago-project/meta-ti/commit/conf/machine/include/k3.inc?h=scarthgap&id=f814840465358a6b5429ad20165742ac6e6e6a29 Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2024-09-12 15:06:06 -05:00
Ryan Eatmon	07edb3156e	Revert "conf: machine: Breakout IMAGE_BOOT_FILES into new variables" This reverts commit `cada5eb9a6`.	2024-09-12 12:24:42 -05:00
Ryan Eatmon	11ce93afcf	Revert "ti-unified-wic: Tool to create new wics from deployed collateral" This reverts commit `7784943fda`.	2024-09-12 12:24:42 -05:00
Ryan Eatmon	56c8f4a23e	Revert "conf: machine: am62xx-unified: Create new common am62xx machine" This reverts commit `a1eb263dd3`.	2024-09-12 12:24:42 -05:00
Ryan Eatmon	2a1878a6b3	Revert "classes: Create uboot-fragments.bbclass" This reverts commit `f39943db86`.	2024-09-12 12:24:42 -05:00
Ryan Eatmon	1e536ba12e	Revert "conf: machine: Move to new UBOOT_FRAGMENTS" This reverts commit `fc52833b34`.	2024-09-12 12:24:42 -05:00
LCPD Automation Script	9a12c2b49b	CI/CD Auto-Merger: cicd.scarthgap.202409090400 Updated the value(s) for: linux-ti-staging-rt_6.6: SRCREV linux-ti-staging_6.6: SRCREV Changelogs: linux-ti-staging-rt_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=fb018c5e9fa7eb05fa1cb2e87760d9c1e430da64..85d46cfcef8242e37cbd99a6591cab2b90d0d8ed linux-ti-staging_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=c0deda7906ed2661afaa841e1d822932a37f38f6..d5b1bee95de93e6ab87e73242c20910e7d7d3d83 Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2024-09-09 04:00:50 -05:00