| Message ID | 20211111230455.11470-1-peter@korsgaard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] configs/sheevaplug_defconfig: backport gcc >= 10 u-boot patch | expand |
On Fri, 12 Nov 2021 00:04:52 +0100 Peter Korsgaard <peter@korsgaard.com> wrote: > Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/1758966307 > > The old U-Boot version used does not build with hostcc >= 10. Backport a > patch fixing that issue. > > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> > --- > ...e-redundant-YYLOC-global-declaration.patch | 28 +++++++++++++++++++ > configs/sheevaplug_defconfig | 1 + > 2 files changed, 29 insertions(+) > create mode 100644 board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch I've applied both to master. It would however be nicer to update to a newer U-Boot release if possible. Thanks! Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > On Fri, 12 Nov 2021 00:04:52 +0100 > Peter Korsgaard <peter@korsgaard.com> wrote: >> Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/1758966307 >> >> The old U-Boot version used does not build with hostcc >= 10. Backport a >> patch fixing that issue. >> >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> >> --- >> ...e-redundant-YYLOC-global-declaration.patch | 28 +++++++++++++++++++ >> configs/sheevaplug_defconfig | 1 + >> 2 files changed, 29 insertions(+) >> create mode 100644 board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch > I've applied both to master. Thanks! > It would however be nicer to update to a newer U-Boot release if > possible. Yes, I'll send patches for next doing that, I just wanted something safer/smaller for master/LTS.
diff --git a/board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch b/board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch new file mode 100644 index 0000000000..c9d5d71ca1 --- /dev/null +++ b/board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch @@ -0,0 +1,28 @@ +From 018921ee79d3f30893614b3b2b63b588d8544f73 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> +Signed-off-by: Peter Korsgaard <peter@korsgaard.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.20.1 + diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 4c3bb21b4a..7f186df22c 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -3,6 +3,7 @@ BR2_arm=y BR2_arm926t=y # system +BR2_GLOBAL_PATCH_DIR="board/sheevaplug/patches" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0"
Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/1758966307 The old U-Boot version used does not build with hostcc >= 10. Backport a patch fixing that issue. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- ...e-redundant-YYLOC-global-declaration.patch | 28 +++++++++++++++++++ configs/sheevaplug_defconfig | 1 + 2 files changed, 29 insertions(+) create mode 100644 board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch