summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2020-06-17 12:43:09 -1000
committerSteve Sakoman <steve@sakoman.com>2020-06-18 04:34:55 -1000
commit6372f78c2456a9b57ef5f8ff9b975426bd1a46be (patch)
treebfdc9c6154137504fd02f2b2889fd84a41df1e3e /meta/recipes-bsp
parent71391aab99033f5488d44c097a25323bdf06ffc2 (diff)
downloadopenembedded-core-contrib-6372f78c2456a9b57ef5f8ff9b975426bd1a46be.tar.gz
u-boot-tools: backport patch from upstream to fix gcc 10 builds
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch27
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb2
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch b/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch
new file mode 100644
index 00000000000..2a184e57e2d
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch
@@ -0,0 +1,27 @@
+From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Thu, 30 Jan 2020 09:37:15 +0000
+Subject: [PATCH] Remove redundant YYLOC global declaration
+
+Same as the upstream fix for building dtc with gcc 10.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ scripts/dtc/dtc-lexer.l | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index fd825ebba6..24af549977 100644
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+--
+2.26.2
+
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 7eaf721ca83..ca8876ff986 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,2 +1,4 @@
require u-boot-common.inc
require u-boot-tools.inc
+
+SRC_URI += "file://remove-redundant-yyloc-global.patch"