diff options
| author | Philip Balister <philip@balister.org> | 2021-01-27 07:30:53 -0500 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@kernel.crashing.org> | 2021-01-28 11:36:11 -0600 |
| commit | d1102df68ff6e09fe91b5d6b64eee69b531a787a (patch) | |
| tree | 4a1a013334e715c18a7a215c945610fa9f5d4432 | |
| parent | 3743215be11e1e0c30f0e87c83ea50448d063e6b (diff) | |
| download | meta-xilinx-d1102df68ff6e09fe91b5d6b64eee69b531a787a.tar.gz meta-xilinx-d1102df68ff6e09fe91b5d6b64eee69b531a787a.tar.bz2 meta-xilinx-d1102df68ff6e09fe91b5d6b64eee69b531a787a.zip | |
u-boot-xlnx: Fix build error by applying patch from upstream u-boot.
Signed-off-by: Philip Balister <philip@balister.org>
Adjusted where the append is added, and commented when to remove it.
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
| -rw-r--r-- | meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch | 28 | ||||
| -rw-r--r-- | meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb | 4 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch new file mode 100644 index 0000000..7091098 --- /dev/null +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch @@ -0,0 +1,28 @@ +From 8127b19aa42ccfb3faae1173a12b3eb0cebf8941 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> +State: upstream (e33a814e772cdc36436c8c188d8c42d019fda639) +--- + 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/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb index 9e289a0..95c7254 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb @@ -7,6 +7,10 @@ SRCREV ?= "bb4660c33aa7ea64f78b2682bf0efd56765197d6" include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc +# Patch required for latest gcc and 2020.2 version of u-boot-xlnx +# This will be removed once the SRCREV above has been updated to include this change +SRC_URI += " file://0001-Remove-redundant-YYLOC-global-declaration.patch" + LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" |