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

Updated the value(s) for:
  u-boot-ti-staging_2024.04: SRCREV
  linux-ti-staging-rt_6.6: SRCREV
  linux-ti-staging_6.6: SRCREV

Changelogs:
  u-boot-ti-staging_2024.04: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/log/?qt=range&q=1d8a15d0fb56ae479dd3c11e3b17d7434b079acd..2a7de06d57399e04738573622cbdaa3532e7ab4d
  linux-ti-staging-rt_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=4143633c95dc50cb5e2c695629d8b6302ef8de81..d7b6ee144955d71f1c3d29b7dc08619961f12d64
  linux-ti-staging_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=399452cd6d8ff30967ddc4baa444afd32cbbedeb..118cf0c8b392bed94437f1519de10b63705dbacd

Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>

meta-ti-bsp/conf/layer.conf

@@ -18,10 +18,6 @@ LAYERDEPENDS_meta-ti-bsp = " \
     meta-arm \
 "
 
-BBFILES_DYNAMIC += " \
-    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes*/*/*.bbappend \
-"
-
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
     mesa-pvr \
 "

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

@@ -53,11 +53,13 @@ MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu"
 # 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%"
 
-# Only Rogue is enabled so far, SGX falls back to SW rendering
+BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
 BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%"
@@ -68,9 +70,9 @@ BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%"
 # 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%"
+BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023.04%"
 
 BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%"

meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend

@@ -1,14 +0,0 @@
-# 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"

meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb

@@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;
 
 S = "${WORKDIR}/git"
 
-SRCREV = "652ae16657cc4acda664e669d0c9b4891252f37f"
+SRCREV = "3005cf8145a6720daa47e4e273f9e421ff77cb58"
 
 TARGET_PRODUCT:omap-a15 = "ti572x_linux"
 TARGET_PRODUCT:ti33x = "ti335x_linux"
@@ -31,6 +31,14 @@ 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
 }

meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc

@@ -1,6 +1,6 @@
 PV:k3 = "2.11+git"
-SRCREV_tfa:k3 = "f2735ebccf5173f74c0458736ec526276106097e"
-LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5"
+SRCREV_tfa:k3 = "58b25570c9ef91753b14c2103f45f4be9dddb696"
+LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
 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"

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 = "1d8a15d0fb56ae479dd3c11e3b17d7434b079acd"
+SRCREV = "2a7de06d57399e04738573622cbdaa3532e7ab4d"

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch

@@ -0,0 +1,64 @@
+From bb2db56ffec6e527d88751f75117ae690227cd6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org>
+Date: Sat, 11 Feb 2023 18:38:01 +0100
+Subject: [PATCH] fix: gallivm: fix LLVM #include of Host.h, moved to
+ TargetParser
+
+Upstream moved Host.h from Support to TargetParser in LLVM 17.
+
+This shouldn't lead to a FTBFS, since there is a forwarding include left
+behind. Sadly the added deprecation warning #pragma is invalid and thus
+causes a build failure right away. But since we would have to follow the
+move anyway in the future, just do it right away.
+
+Reference: https://github.com/llvm/llvm-project/commit/d768bf994f508d7eaf9541a568be3d71096febf5
+Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
+Closes: #8275
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21263>
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/bb2db56ffec6e527d88751f75117ae690227cd6c]
+
+---
+ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 7 ++++++-
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp  | 4 +++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index 54bc5d5ada36c..f78f04f042be8 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -35,9 +35,14 @@
+ #include <llvm-c/Disassembler.h>
+ #include <llvm/Support/raw_ostream.h>
+ #include <llvm/Support/Format.h>
+-#include <llvm/Support/Host.h>
+ #include <llvm/IR/Module.h>
+
++#if LLVM_VERSION_MAJOR >= 17
++#include <llvm/TargetParser/Host.h>
++#else
++#include <llvm/Support/Host.h>
++#endif
++
+ #include "util/u_math.h"
+ #include "util/u_debug.h"
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 334c13530394b..5e7a30a6cc2e3 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -60,7 +60,11 @@
+ #include <llvm/Analysis/TargetLibraryInfo.h>
+ #include <llvm/ExecutionEngine/SectionMemoryManager.h>
+ #include <llvm/Support/CommandLine.h>
++#if LLVM_VERSION_MAJOR >= 17
++#include <llvm/TargetParser/Host.h>
++#else
+ #include <llvm/Support/Host.h>
++#endif
+ #include <llvm/Support/PrettyStackTrace.h>
+ #include <llvm/ExecutionEngine/ObjectCache.h>
+ #include <llvm/Support/TargetSelect.h>
+
+--
+GitLab

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch

@@ -0,0 +1,52 @@
+From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Mon, 4 Nov 2024 13:37:29 -0600
+Subject: [PATCH] gallium: Fix build with llvm 18 and 19
+
+- CodeGenOpt::Level changed to CodeGenOoptLevel. [1]
+- llvm::sys::getHostCPUFeatures() now returns the features instead of
+modifying the passed in argument. [2]
+
+Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179]
+Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 5e7a30a6cc2..dbc777e3096 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -368,7 +368,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+    builder.setEngineKind(EngineKind::JIT)
+           .setErrorStr(&Error)
+           .setTargetOptions(options)
++#if LLVM_VERSION_MAJOR >= 18
++          .setOptLevel((CodeGenOptLevel)OptLevel);
++#else
+           .setOptLevel((CodeGenOpt::Level)OptLevel);
++#endif
+
+ #ifdef _WIN32
+     /*
+@@ -392,8 +396,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+     * which allows us to enable/disable code generation based
+     * on the results of cpuid on these architectures.
+     */
+-   llvm::StringMap<bool> features;
+-   llvm::sys::getHostCPUFeatures(features);
++   #if LLVM_VERSION_MAJOR >= 19
++      /* llvm-19+ returns StringMap from getHostCPUFeatures.
++      */
++      auto features = llvm::sys::getHostCPUFeatures();
++   #else
++      llvm::StringMap<bool> features;
++      llvm::sys::getHostCPUFeatures(features);
++   #endif
+
+    for (StringMapIterator<bool> f = features.begin();
+         f != features.end();
+--
+2.17.1

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch

@@ -0,0 +1,52 @@
+From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Mon, 4 Nov 2024 13:37:29 -0600
+Subject: [PATCH] gallium: Fix build with llvm 18 and 19
+
+- CodeGenOpt::Level changed to CodeGenOoptLevel. [1]
+- llvm::sys::getHostCPUFeatures() now returns the features instead of
+modifying the passed in argument. [2]
+
+Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179]
+Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 5e7a30a6cc2..dbc777e3096 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -366,7 +366,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+    builder.setEngineKind(EngineKind::JIT)
+           .setErrorStr(&Error)
+           .setTargetOptions(options)
++#if LLVM_VERSION_MAJOR >= 18
++          .setOptLevel((CodeGenOptLevel)OptLevel);
++#else
+           .setOptLevel((CodeGenOpt::Level)OptLevel);
++#endif
+
+ #if DETECT_OS_WINDOWS
+     /*
+@@ -394,8 +398,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+     * which allows us to enable/disable code generation based
+     * on the results of cpuid on these architectures.
+     */
+-   llvm::StringMap<bool> features;
+-   llvm::sys::getHostCPUFeatures(features);
++   #if LLVM_VERSION_MAJOR >= 19
++      /* llvm-19+ returns StringMap from getHostCPUFeatures.
++      */
++      auto features = llvm::sys::getHostCPUFeatures();
++   #else
++      llvm::StringMap<bool> features;
++      llvm::sys::getHostCPUFeatures(features);
++   #endif
+
+    for (StringMapIterator<bool> f = features.begin();
+         f != features.end();
+--
+2.17.1

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb

@@ -19,6 +19,8 @@ SRC_URI = " \
     file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \
     file://0001-gallium-Fix-build-with-llvm-17.patch \
     file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \
+    file://0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch \
+    file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \
 "
 
 S = "${WORKDIR}/git"

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb

@@ -16,6 +16,7 @@ SRC_URI = " \
     file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
     file://0001-gallium-Fix-build-with-llvm-17.patch \
     file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \
+    file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \
 "
 
 S = "${WORKDIR}/git"
@@ -25,7 +26,7 @@ PACKAGECONFIG:append = " \
     ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
 "
 
-SRCREV = "b12290126ba6a154f0e8b0a8c8b2b0d64f98e427"
+SRCREV = "0e75e7ded360ea6aee4140393b30960e152f3994"
 PV = "23.2.1"
 
 PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb

@@ -8,7 +8,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
 
 BRANCH = "ti-rt-linux-6.6.y"
 
-SRCREV = "71c08e13f47a4b7e5fa65f1219544ae059b0efc7"
+SRCREV = "d7b6ee144955d71f1c3d29b7dc08619961f12d64"
 
 include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
 

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb

@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH ?= "ti-linux-6.12.y"
 
-SRCREV ?= "b0e715522353879e6c3c1b56dafad6fb681b1e55"
+SRCREV ?= "f8f8c0b547f67d2d4d653cc59753f85275ff54f2"
 PV = "6.12.0+git"
 
 # Special configuration for remoteproc/rpmsg IPC modules

meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb

@@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
 
 BRANCH ?= "ti-linux-6.6.y"
 
-SRCREV ?= "126a8167b5915c6014b6a7d2b3bc710b040739b6"
+SRCREV ?= "118cf0c8b392bed94437f1519de10b63705dbacd"
 PV = "6.6.44+git"
 
 KERNEL_REPRODUCIBILITY_PATCHES = " \