summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2020-06-26 16:39:53 -1000
committerSteve Sakoman <steve@sakoman.com>2020-06-29 05:17:44 -1000
commit2e128a775a3d51dc1856a35e2f5135d3c156d10e (patch)
treea08951f826083f88ae2889f25afe9e344fbab46e /meta/recipes-bsp
parent1373006c28541e8fd6ceb6d5ed905ff1536ef3f7 (diff)
downloadopenembedded-core-contrib-2e128a775a3d51dc1856a35e2f5135d3c156d10e.tar.gz
u-boot: move redundant-yyloc-global patch to u-boot-common.inc
gcc10 build issue occurs in both u-boot and u-boot-tools Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch (renamed from meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch)0
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-common.inc1
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb2
3 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch b/meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch
index 2a184e57e2..2a184e57e2 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch
+++ b/meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index edd0004792..4a17894c49 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -15,6 +15,7 @@ PE = "1"
SRCREV = "303f8fed261020c1cb7da32dad63b610bf6873dd"
SRC_URI = "git://git.denx.de/u-boot.git \
+ file://remove-redundant-yyloc-global.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb
index ca8876ff98..7eaf721ca8 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb
@@ -1,4 +1,2 @@
require u-boot-common.inc
require u-boot-tools.inc
-
-SRC_URI += "file://remove-redundant-yyloc-global.patch"