mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-05 02:11:00 +00:00
Code Issues Projects Releases Wiki Activity

ti-img-rogue-driver: unify with dunfell and fix double-patching

Browse Source 
There was a discrepancy between master and dunfell where 2 different versions
of the same patch existed, so when syncing branches, it resulted in appying
the same change twice. This cleans it up.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
This commit is contained in:
Denys Dmytriyenko
2021-07-15 12:36:35 -04:00
committed by Yogesh Siraswar
parent 951c222f2f
commit 4c4cb8ecf2
2 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch
-26
View File
@@ -1,26 +0,0 @@
From 0d291f91d86e59d87ce023b4e7b89f6b00aa4aab Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denis@denix.org>
Date: Sat, 27 Mar 2021 00:20:57 -0400
Subject: [PATCH] compiler.mk: support OE toolchain alongside Poky one
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
build/linux/config/compiler.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk
index 53a0bef..d45d438 100644
--- a/build/linux/config/compiler.mk
+++ b/build/linux/config/compiler.mk
@@ -65,7 +65,7 @@ define calculate-compiler-preferred-target
ifneq ($$(filter i386-% i486-% i586-% i686-%,$$($(1)_compiler_preferred_target)),)
$(1)_compiler_preferred_target := i386-linux-gnu
endif
- ifneq ($$(filter aarch64-poky-linux,$$($(1)_compiler_preferred_target)),)
+ ifneq ($$(filter aarch64-poky-linux aarch64-oe-linux,$$($(1)_compiler_preferred_target)),)
$(1)_compiler_preferred_target := aarch64-linux-gnu
endif
ifneq ($$(filter armv7a-cros-linux-gnueabi armv7l-tizen-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
--
2.7.4
recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb
+2 -2
View File
@@ -19,8 +19,8 @@ PROVIDES = "virtual/gpudriver"
BRANCH = "1.13-5776728/linux-k5.10"
SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \
file://0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch \
SRC_URI = " \
git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \
file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \
"