From e9358ecfbef84f0c7eb6e38440f7ac220eb5db25 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 15 Feb 2021 09:46:36 +0100 Subject: [RCAR] 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) Bug-AGL: SPEC-3804 Signed-off-by: Ronan Le Martret Change-Id: I7be66b06e99415fa7b6c3a7a2c397d00ee44b4cc Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26052 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../files/remove-redundant-yyloc-global.patch | 27 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot_2020.01.bbappend | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch new file mode 100644 index 000000000..2a184e57e --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/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-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend new file mode 100644 index 000000000..b8b5cbea5 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2020.01.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append = " file://remove-redundant-yyloc-global.patch " -- cgit 1.2.3-korg