Re: [dunfell/master PATCH] Revert "u-boot-ti-staging_2020.01: Fix build on hosts with gcc10 on them"


Suman Anna
 

On 12/4/20 2:28 PM, praneeth@... wrote:
From: Praneeth Bajjuri <praneeth@...>

This reverts commit 83f29e8b99144b69ed51ff69f41ab5a50f00fc5f.

The mentioned fix is now pulled to ti-u-boot.git in
ti-u-boot-2020.01 branch
commit a6904f563f ("Remove redundant YYLOC global declaration")

Signed-off-by: Praneeth Bajjuri <praneeth@...>
---
...e-redundant-YYLOC-global-declaration.patch | 28 -------------------
.../u-boot/u-boot-ti-staging_2020.01.bb | 4 +--
2 files changed, 1 insertion(+), 31 deletions(-)
delete mode 100644 recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch

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
deleted file mode 100644
index 4973ea9d..00000000
--- a/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b436a29de12d3f1da579edf3e3d4d42a60b9e58a Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@...>
-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@...>
----
- 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 29fa6ee6..991ba0ca 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,9 +1,7 @@
require u-boot-ti.inc

-PR = "r23"
+PR = "r22"

BRANCH = "ti-u-boot-2020.01"

SRCREV = "3c9ebdb87d65aacc4ec302be8bef3df15364bacd"
Please resubmit after updating the SRCREV that includes the picked up patch
along with the rest of the changes..

regards
Suman

-
-SRC_URI += "file://0001-Remove-redundant-YYLOC-global-declaration.patch"

Join meta-ti@lists.yoctoproject.org to automatically receive all group messages.