aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-bsp
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-11-13 07:13:08 +0000
committerDan Murphy <dmurphy@ti.com>2020-11-20 12:56:43 -0600
commit83f29e8b99144b69ed51ff69f41ab5a50f00fc5f (patch)
treeff758e48d3759d325ce071f5c7975eb623ebf0fb /recipes-bsp
parentf155a69648341d181099f5b48c71f5582cf0a6e2 (diff)
downloadmeta-ti-83f29e8b99144b69ed51ff69f41ab5a50f00fc5f.tar.gz
meta-ti-83f29e8b99144b69ed51ff69f41ab5a50f00fc5f.tar.bz2
meta-ti-83f29e8b99144b69ed51ff69f41ab5a50f00fc5f.zip
u-boot-ti-staging_2020.01: Fix build on hosts with gcc10 on them
Backport a patch from upstream to fix build on distros with gcc10+ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch28
-rw-r--r--recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb4
2 files changed, 31 insertions, 1 deletions
diff --git a/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
new file mode 100644
index 000000000..4973ea9dc
--- /dev/null
+++ b/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
@@ -0,0 +1,28 @@
+From b436a29de12d3f1da579edf3e3d4d42a60b9e58a 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.
+
+Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/018921ee79d3f30893614b3b2b63b588d8544f73]
+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.29.2
+
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb
index 991ba0ca4..29fa6ee67 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb
@@ -1,7 +1,9 @@
require u-boot-ti.inc
-PR = "r22"
+PR = "r23"
BRANCH = "ti-u-boot-2020.01"
SRCREV = "3c9ebdb87d65aacc4ec302be8bef3df15364bacd"
+
+SRC_URI += "file://0001-Remove-redundant-YYLOC-global-declaration.patch"