[Buildroot] [git commit branch/2021.08.x] configs/sheevaplug_defconfig: backport gcc >= 10 u-boot patch

Peter Korsgaard peter at korsgaard.com
Wed Nov 17 22:27:25 UTC 2021


commit: https://git.buildroot.net/buildroot/commit/?id=8078ed76f038d14f775333b72168bf3287f4dfa6
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.08.x

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 at korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
(cherry picked from commit 2d6a5a0cc7c283916df5a7c71f4599b05d296bd1)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 ...Remove-redundant-YYLOC-global-declaration.patch | 28 ++++++++++++++++++++++
 configs/sheevaplug_defconfig                       |  1 +
 2 files changed, 29 insertions(+)

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 at 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 at gmail.com>
+Signed-off-by: Peter Korsgaard <peter at 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"


More information about the buildroot mailing list