From 39d7cf1abb2c88baaedb3a627eba8827747b2eb9 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Fri, 26 Jun 2020 16:39:53 -1000 Subject: u-boot: move redundant-yyloc-global patch to u-boot-common.inc gcc10 build issue occurs in both u-boot and u-boot-tools (From OE-Core rev: 2e128a775a3d51dc1856a35e2f5135d3c156d10e) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- .../files/remove-redundant-yyloc-global.patch | 27 ++++++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot-common.inc | 1 + .../remove-redundant-yyloc-global.patch | 27 ---------------------- meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb | 2 -- 4 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch b/meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch new file mode 100644 index 0000000000..2a184e57e2 --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch @@ -0,0 +1,27 @@ +From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +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 +--- + 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-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/remove-redundant-yyloc-global.patch b/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch deleted file mode 100644 index 2a184e57e2..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -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 ---- - 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 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" -- cgit v1.2.3-54-g00ecf