From 26bb7e72f69583954c8d4e5f729531d8cd39f454 Mon Sep 17 00:00:00 2001 From: Marc Mattmueller Date: Tue, 19 Jul 2022 11:12:52 +0000 Subject: [PATCH] u-boot-armada: integrated remove-redundant-YYLOC-declaration patch This commit holds also the following patch: Same as the upstream fix for building dtc with gcc 10. Signed-off-by: Peter Robinson Whereas an additional file needed to be patched too to get rid of this multiple definition compile error. Part of yocto upgrade from dunfell to kirkstone Signed-off-by: Marc Mattmueller --- ...1-remove-redundant-YYLOC-declaration.patch | 44 +++++++++++++++++++ recipes-bsp/u-boot/u-boot-armada_git.bb | 7 ++- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 recipes-bsp/u-boot/u-boot-armada/0001-remove-redundant-YYLOC-declaration.patch diff --git a/recipes-bsp/u-boot/u-boot-armada/0001-remove-redundant-YYLOC-declaration.patch b/recipes-bsp/u-boot/u-boot-armada/0001-remove-redundant-YYLOC-declaration.patch new file mode 100644 index 0000000..345ad47 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-armada/0001-remove-redundant-YYLOC-declaration.patch @@ -0,0 +1,44 @@ +From 52c3ac31426131c555093542d51f1e6e0623507c Mon Sep 17 00:00:00 2001 +From: Marc Mattmueller +Date: Mon, 18 Jul 2022 19:26:59 +0200 +Subject: [PATCH] u-boot-armada: Remove redundant YYLOC global declaration + +Same as the upstream fix for building dtc with gcc 10. + +After having consulted the team, this patch is only applied to +the armada bootloader as this one is used on the core os +environment build-up. + +Signed-off-by: Marc Mattmueller +--- + scripts/dtc/dtc-lexer.l | 1 - + scripts/dtc/dtc-lexer.lex.c_shipped | 1 - + 2 files changed, 2 deletions(-) + +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() */ +diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped +index 3934d8624d..22f6e0d1f8 100644 +--- a/scripts/dtc/dtc-lexer.lex.c_shipped ++++ b/scripts/dtc/dtc-lexer.lex.c_shipped +@@ -639,7 +639,6 @@ char *yytext; + #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/recipes-bsp/u-boot/u-boot-armada_git.bb b/recipes-bsp/u-boot/u-boot-armada_git.bb index 787ffd3..12d6a94 100644 --- a/recipes-bsp/u-boot/u-boot-armada_git.bb +++ b/recipes-bsp/u-boot/u-boot-armada_git.bb @@ -1,14 +1,17 @@ require u-boot-nm.inc # Be aware github/netmodule git -SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2017.11/standard/armada-385" +SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2017.11/standard/armada-385 \ + file://0001-remove-redundant-YYLOC-declaration.patch;name=yylloc \ +" +SRC_URI[yylloc.md5sum] = "504cb5b73a174a32e55c58f60608925d" DEPENDS += "bc-native" # Should be updated when a new U-Boot Version is available -#SRCREV ?= "68d28424cf41e141207d9d8af76c5bc5e01a55e2" SRCREV ?= "68d28424cf41e141207d9d8af76c5bc5e01a55e2" + UBOOT_SUFFIX = "kwb" UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"