mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-01-12 01:20:20 +00:00
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
d952379f55 | ||
|
b444d36dc5 | ||
|
f269e761a2 | ||
|
|
57863a821a | ||
|
|
befff0d605 | ||
|
|
2a6e706d99 | ||
|
|
9997a83156 | ||
|
|
336a538aee | ||
|
|
4a086d523b | ||
|
|
156b054b33 | ||
|
52c5d383ec | ||
|
9b0da26b3b | ||
|
|
8c88422367 | ||
|
|
7c2ede094f | ||
|
|
0727cfb4c3 | ||
|
|
ed304b22e1 | ||
|
|
3086738d4e | ||
|
|
320b9e5dd8 |
@@ -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 \
|
||||
"
|
||||
|
||||
@@ -12,6 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \
|
||||
"
|
||||
|
||||
KERNEL_DEVICETREE = " \
|
||||
ti/k3-am62a7-phyboard-lyra-rdk.dtb \
|
||||
ti/k3-am62a7-sk.dtb \
|
||||
ti/k3-am62x-sk-csi2-imx219.dtbo \
|
||||
ti/k3-am62x-sk-csi2-ov5640.dtbo \
|
||||
|
||||
@@ -14,6 +14,7 @@ KERNEL_DEVICETREE = " \
|
||||
ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
|
||||
ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
|
||||
ti/k3-am625-beagleplay.dtb \
|
||||
ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo \
|
||||
ti/k3-am625-phyboard-lyra-rdk.dtb \
|
||||
ti/k3-am625-sk.dtb \
|
||||
ti/k3-am625-verdin-nonwifi-dahlia.dtb \
|
||||
|
||||
@@ -14,6 +14,7 @@ KERNEL_DEVICETREE_PREFIX = " \
|
||||
"
|
||||
|
||||
KERNEL_DEVICETREE = " \
|
||||
ti/k3-am62-lp-sk-nand.dtbo \
|
||||
ti/k3-am62-lp-sk.dtb \
|
||||
ti/k3-am625-sk.dtb \
|
||||
ti/k3-am62x-sk-hdmi-audio.dtbo \
|
||||
|
||||
@@ -10,6 +10,7 @@ SYSFW_SUFFIX = "gp"
|
||||
|
||||
UBOOT_MACHINE = "am62x_evm_r5_defconfig"
|
||||
UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig"
|
||||
UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_r5_defconfig"
|
||||
|
||||
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
|
||||
UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
|
||||
|
||||
@@ -21,6 +21,7 @@ OPTEEMACHINE = "k3-am62x"
|
||||
|
||||
UBOOT_MACHINE = "am62x_evm_a53_defconfig"
|
||||
UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig"
|
||||
UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_a53_defconfig"
|
||||
|
||||
UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
|
||||
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
|
||||
@@ -38,6 +39,7 @@ KERNEL_DEVICETREE = " \
|
||||
ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
|
||||
ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
|
||||
ti/k3-am625-beagleplay.dtb \
|
||||
ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo \
|
||||
ti/k3-am625-phyboard-lyra-rdk.dtb \
|
||||
ti/k3-am625-sk.dtb \
|
||||
ti/k3-am625-verdin-nonwifi-dahlia.dtb \
|
||||
|
||||
@@ -6,12 +6,15 @@ SOC_FAMILY:append = ":am64xx"
|
||||
KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
|
||||
|
||||
KERNEL_DEVICETREE = " \
|
||||
ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
|
||||
ti/k3-am642-evm-icssg1-dualemac.dtbo \
|
||||
ti/k3-am642-evm-nand.dtbo \
|
||||
ti/k3-am642-evm.dtb \
|
||||
ti/k3-am642-hummingboard-t-pcie.dtbo \
|
||||
ti/k3-am642-hummingboard-t-usb3.dtbo \
|
||||
ti/k3-am642-hummingboard-t.dtb \
|
||||
ti/k3-am642-phyboard-electra-gpio-fan.dtbo \
|
||||
ti/k3-am642-phyboard-electra-pcie-usb2.dtbo \
|
||||
ti/k3-am642-phyboard-electra-rdk.dtb \
|
||||
ti/k3-am642-sk.dtb \
|
||||
ti/k3-am642-tqma64xxl-mbax4xxl.dtb \
|
||||
|
||||
@@ -28,7 +28,7 @@ MACHINE_FEATURES:remove:bsp-mainline = "gpu"
|
||||
# ==========
|
||||
BSP_KERNEL_PROVIDER:bsp-next = "linux-ti-next"
|
||||
BSP_KERNEL_VERSION:bsp-next = "%"
|
||||
BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-mainline"
|
||||
BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-next"
|
||||
BSP_BOOTLOADER_VERSION:bsp-next = "%"
|
||||
|
||||
# GPU support requires out-of-tree SGX and Rogue drivers not available
|
||||
@@ -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%"
|
||||
|
||||
@@ -12,6 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \
|
||||
|
||||
KERNEL_DEVICETREE = " \
|
||||
ti/k3-j721e-beagleboneai64.dtb \
|
||||
ti/k3-j721e-common-proc-board-infotainment.dtbo \
|
||||
ti/k3-j721e-common-proc-board.dtb \
|
||||
ti/k3-j721e-evm-gesi-exp-board.dtbo \
|
||||
ti/k3-j721e-evm-pcie0-ep.dtbo \
|
||||
|
||||
@@ -19,6 +19,9 @@ KERNEL_DEVICETREE_PREFIX = " \
|
||||
|
||||
KERNEL_DEVICETREE = " \
|
||||
ti/k3-am69-sk.dtb \
|
||||
ti/k3-j784s4-evm-pcie0-pcie1-ep.dtbo \
|
||||
ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \
|
||||
ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \
|
||||
ti/k3-j784s4-evm.dtb \
|
||||
"
|
||||
|
||||
|
||||
@@ -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"
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -13,11 +13,11 @@ PRUETH_FW_AM65X_SR2_VERSION = "02.02.14.03"
|
||||
GOODIX_FW_VERSION = "1.0.0.0"
|
||||
CADENCE_MHDP_FW_VERSION = "2.1.0"
|
||||
IMG_DEC_FW_VERSION = "1.0"
|
||||
CNM_WAVE521_FW_VERSION = "1.0.4"
|
||||
CNM_WAVE521_FW_VERSION = "1.0.5"
|
||||
TI_DM_FW_VERSION = "10.01.03"
|
||||
TI_SYSFW_VERSION = "10.01.01"
|
||||
TI_SYSFW_VERSION = "10.01.07"
|
||||
|
||||
TI_LINUX_FW_SRCREV ?= "1e4793a13e99390816a6bf7175584bcdfab57f04"
|
||||
TI_LINUX_FW_SRCREV ?= "7179a74d1ed38e581bcd35e7b05632955e962c30"
|
||||
SRCREV = "${TI_LINUX_FW_SRCREV}"
|
||||
|
||||
BRANCH ?= "ti-linux-firmware"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,16 +1,9 @@
|
||||
require u-boot-ti.inc
|
||||
|
||||
PR = "r0"
|
||||
SUMMARY = "Mainline U-Boot for TI devices"
|
||||
|
||||
PV = "2024.07"
|
||||
PV = "2024.10"
|
||||
|
||||
# For the un-initiated:
|
||||
# The actual URL you'd use with a git clone for example would be:
|
||||
# https://source.denx.de/u-boot/u-boot.git/
|
||||
# However, in the context of OE, we have to explicitly split things up:
|
||||
# a) we want it to use git fetcher - hence git:// prefix in GIT_URI (if we
|
||||
# used https here, we'd endup attempting wget instead of git)
|
||||
# b) and we want git fetcher to use https protocol, hence GIT_PROTOCOL as https
|
||||
UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"
|
||||
UBOOT_GIT_PROTOCOL = "https"
|
||||
SRCREV = "3f772959501c99fbe5aa0b22a36efe3478d1ae1c"
|
||||
|
||||
SRCREV = "f919c3a889f0ec7d63a48b5d0ed064386b0980bd"
|
||||
|
||||
5
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-next_git.bb
Normal file
5
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-next_git.bb
Normal file
@@ -0,0 +1,5 @@
|
||||
require u-boot-ti-mainline_git.bb
|
||||
|
||||
SUMMARY = "U-Boot master-next for TI devices"
|
||||
|
||||
BRANCH = "master-next"
|
||||
@@ -6,4 +6,4 @@ PR = "r0"
|
||||
|
||||
BRANCH = "ti-u-boot-2024.04"
|
||||
|
||||
SRCREV = "8ce3f54eee6f5d650f5ce2af8e528afeb7090b51"
|
||||
SRCREV = "2a7de06d57399e04738573622cbdaa3532e7ab4d"
|
||||
|
||||
@@ -21,8 +21,9 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
|
||||
|
||||
BRANCH ?= "master"
|
||||
UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
|
||||
UBOOT_GIT_PROTOCOL = "https"
|
||||
SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"
|
||||
UBOOT_GIT_PROTOCOL ?= "https"
|
||||
UBOOT_GIT_BRANCH ?= "branch=${BRANCH}"
|
||||
SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH}"
|
||||
|
||||
PV:append = "+git"
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -62,7 +62,4 @@ SRCREV:aarch64 = "977c75e082620f15c06c72bcced30f787c14b390"
|
||||
PV:aarch64 = "6.1.80+git"
|
||||
BRANCH:aarch64 = "v6.1.80-ti-arm64-r49"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
|
||||
file://defconfig \
|
||||
"
|
||||
KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
|
||||
|
||||
@@ -13,11 +13,18 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
# 6.10 Mainline version
|
||||
SRCREV = "d04e483db22823c13c0313b7c43a52529a2e2672"
|
||||
PV = "6.10"
|
||||
# 6.11 Mainline version
|
||||
SRCREV = "fa7818b3a6dd56c7956f515d287ed9f80c7bf59a"
|
||||
PV = "6.11"
|
||||
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=https;branch=master"
|
||||
KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
|
||||
BRANCH = "master"
|
||||
|
||||
KERNEL_DEFCONFIG = ""
|
||||
|
||||
KERNEL_REPRODUCIBILITY_PATCHES = " \
|
||||
file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
|
||||
"
|
||||
|
||||
DEFCONFIG_NAME = "multi_v7_defconfig"
|
||||
DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
|
||||
|
||||
@@ -8,4 +8,6 @@ include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('
|
||||
SRCREV = "6465e260f48790807eef06b583b38ca9789b6072"
|
||||
PV = "6.6.0-rc3+git"
|
||||
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master"
|
||||
KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
|
||||
|
||||
KERNEL_REPRODUCIBILITY_PATCHES = ""
|
||||
|
||||
@@ -8,7 +8,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
|
||||
|
||||
BRANCH = "ti-rt-linux-6.6.y"
|
||||
|
||||
SRCREV = "54789d7adda6ab12b4ca38d79c2554ff8af5b54e"
|
||||
SRCREV = "d7b6ee144955d71f1c3d29b7dc08619961f12d64"
|
||||
|
||||
include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
|
||||
|
||||
|
||||
@@ -26,11 +26,6 @@ BRANCH ?= "ti-linux-6.1.y"
|
||||
SRCREV ?= "92ce8d7d2ab679e10c1dda309a0fb2ceae78b908"
|
||||
PV = "6.1.105+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"
|
||||
|
||||
@@ -25,14 +25,9 @@ S = "${WORKDIR}/git"
|
||||
|
||||
BRANCH ?= "ti-linux-6.12.y"
|
||||
|
||||
SRCREV ?= "1cdb5a3691bfa5171a265ae931f0912656936a4b"
|
||||
SRCREV ?= "f8f8c0b547f67d2d4d653cc59753f85275ff54f2"
|
||||
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"
|
||||
|
||||
@@ -23,13 +23,12 @@ S = "${WORKDIR}/git"
|
||||
|
||||
BRANCH ?= "ti-linux-6.6.y"
|
||||
|
||||
SRCREV ?= "617526782e268112606ca6c5d501e5540b22a56c"
|
||||
SRCREV ?= "118cf0c8b392bed94437f1519de10b63705dbacd"
|
||||
PV = "6.6.44+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"
|
||||
KERNEL_REPRODUCIBILITY_PATCHES = " \
|
||||
file://0001-vt-conmakehash-improve-reproducibility.patch \
|
||||
"
|
||||
|
||||
# Special configuration for remoteproc/rpmsg IPC modules
|
||||
module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
|
||||
|
||||
@@ -13,19 +13,16 @@ EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}"
|
||||
KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
|
||||
KERNEL_DTBVENDORED = "1"
|
||||
|
||||
KERNEL_PATCHES = ""
|
||||
KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
|
||||
KERNEL_GIT_PROTOCOL ?= "https"
|
||||
KERNEL_GIT_BRANCH ?= "branch=${BRANCH}"
|
||||
|
||||
KERNEL_PATCHES:bsp-mainline = " \
|
||||
file://0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch \
|
||||
file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
|
||||
KERNEL_DEFCONFIG ?= "file://defconfig"
|
||||
|
||||
KERNEL_REPRODUCIBILITY_PATCHES ?= ""
|
||||
|
||||
SRC_URI = " \
|
||||
${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};${KERNEL_GIT_BRANCH} \
|
||||
${KERNEL_DEFCONFIG} \
|
||||
${KERNEL_REPRODUCIBILITY_PATCHES} \
|
||||
"
|
||||
|
||||
KERNEL_PATCHES:bsp-ti-6_12 = " \
|
||||
file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
|
||||
"
|
||||
|
||||
KERNEL_PATCHES:bsp-ti-6_6 = " \
|
||||
file://0001-vt-conmakehash-improve-reproducibility.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append = " ${KERNEL_PATCHES} "
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
PV = "4.3.0+git"
|
||||
SRCREV = "a5b1ffcd26e328af0bbf18ab448a38ecd558e05c"
|
||||
PV = "4.4.0+git"
|
||||
SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
PV = "4.3.0+git"
|
||||
PV = "4.4.0+git"
|
||||
SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
|
||||
|
||||
@@ -8,7 +8,7 @@ EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') i
|
||||
EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
EXTRA_OEMAKE:append:am62pxx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
EXTRA_OEMAKE:append:j722s = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
EXTRA_OEMAKE:append:j722s = " CFG_TEE_CORE_LOG_LEVEL=1"
|
||||
|
||||
do_compile:append:k3() {
|
||||
cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
PV = "4.3.0+git"
|
||||
SRCREV = "1c0d52ace3c237ca6276cafb5c73f699a75c1d40"
|
||||
PV = "4.4.0+git"
|
||||
SRCREV = "8f645256efc0dc66bd5c118778b0b50c44469ae1"
|
||||
|
||||
SRC_URI:remove = " \
|
||||
file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"
|
||||
|
||||
PV = "4.3.0+git"
|
||||
SRCREV = "9d4c4fb9638fb533211037016b6da12fbbcc4bb6"
|
||||
PV = "4.4.0+git"
|
||||
SRCREV = "695231ef8987866663a9ed5afd8f77d1bae3dc08"
|
||||
|
||||
SRC_URI:remove = " \
|
||||
file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \
|
||||
|
||||
Reference in New Issue
Block a user