Skip to contentSkip to conversation

configs/sheevaplug_defconfig: backport gcc >= 10 u-boot patch

PATCH Applied Peter Korsgaard 2 participants 4 messages Nov 11, 2021 – Nov 13, 2021

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/2 configs/sheevaplug_defconfig: backport gcc >= 10 u-boot patch

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 <[email protected]>
---
 ...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
board/sheevaplug/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch new file +28 -0
new file mode 100644
index 0000000000..c9d5d71ca1
@@ -0,0 +1,28 @@
+From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <[email protected]>
+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 <[email protected]>
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ 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
+
configs/sheevaplug_defconfig +1 -0
index 4c3bb21b4a..7f186df22c 100644
@@ -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"
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#1 lore raw

PATCH 2/2 configs/beagleboneai_defconfig: backport gcc >= 10 u-boot patch

Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/1758966041

The old U-Boot version used does not build with hostcc >= 10. Backport a patch fixing that issue.

Signed-off-by Peter Korsgaard <[email protected]>
---
 ...e-redundant-YYLOC-global-declaration.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 board/beagleboneai/patches/uboot/0002-Remove-redundant-YYLOC-global-declaration.patch
board/beagleboneai/patches/uboot/0002-Remove-redundant-YYLOC-global-declaration.patch new file +28 -0
new file mode 100644
index 0000000000..c9d5d71ca1
@@ -0,0 +1,28 @@
+From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <[email protected]>
+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 <[email protected]>
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ 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
+
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Applied
#2 lore raw
In reply to Peter Korsgaard
Quoted 11 lines · On Fri, 12 Nov 2021 00:04:52 +0100 Peter Korsgaard <[email protected]> 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 <[email protected]>
---
 ...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

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#3 lore raw
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Quoted 5 lines · On Fri, 12 Nov 2021 00:04:52 +0100 Peter Korsgaard <[email protected]> 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.

Quoted 8 lines
Quoted 6 lines
Signed-off-by Peter Korsgaard <[email protected]>

---
...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!

Quoted 2 lines

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.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot