diff options
Diffstat (limited to 'package/boot/uboot-at91')
| -rw-r--r-- | package/boot/uboot-at91/patches/001-fix-Wformat-security.patch | 12 | ||||
| -rw-r--r-- | package/boot/uboot-at91/patches/010-fix_dtc_compilation_on_host_gcc10.patch | 46 |
2 files changed, 49 insertions, 9 deletions
diff --git a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch index 23cb5828b3..4c968a2448 100644 --- a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch +++ b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch @@ -1,8 +1,6 @@ -diff --git a/cmd/version.c b/cmd/version.c -index b2fffe99..bcbbeb18 100644 --- a/cmd/version.c +++ b/cmd/version.c -@@ -18,7 +18,7 @@ static int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +@@ -18,7 +18,7 @@ static int do_version(cmd_tbl_t *cmdtp, { char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; @@ -11,11 +9,9 @@ index b2fffe99..bcbbeb18 100644 #ifdef CC_VERSION_STRING puts(CC_VERSION_STRING "\n"); #endif -diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c -index 3425ed11..8c2e1d5c 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c -@@ -368,7 +368,7 @@ int pinctrl_get_pin_name(struct udevice *dev, int selector, char *buf, +@@ -368,7 +368,7 @@ int pinctrl_get_pin_name(struct udevice if (!ops->get_pin_name) return -ENOSYS; @@ -24,11 +20,9 @@ index 3425ed11..8c2e1d5c 100644 return 0; } -diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c -index c316bdfe..5fe8129c 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c -@@ -522,7 +522,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, +@@ -522,7 +522,7 @@ efi_status_t EFIAPI efi_set_variable(u16 if (old_size) /* APPEND_WRITE */ diff --git a/package/boot/uboot-at91/patches/010-fix_dtc_compilation_on_host_gcc10.patch b/package/boot/uboot-at91/patches/010-fix_dtc_compilation_on_host_gcc10.patch new file mode 100644 index 0000000000..6abb151608 --- /dev/null +++ b/package/boot/uboot-at91/patches/010-fix_dtc_compilation_on_host_gcc10.patch @@ -0,0 +1,46 @@ +From e33a814e772cdc36436c8c188d8c42d019fda639 Mon Sep 17 00:00:00 2001 +From: Dirk Mueller <dmueller@suse.com> +Date: Tue, 14 Jan 2020 18:53:41 +0100 +Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration + +gcc 10 will default to -fno-common, which causes this error at link +time: + + (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here + +This is because both dtc-lexer as well as dtc-parser define the same +global symbol yyloc. Before with -fcommon those were merged into one +defintion. The proper solution would be to to mark this as "extern", +however that leads to: + + dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] + 26 | extern YYLTYPE yylloc; + | ^~~~~~ +In file included from dtc-lexer.l:24: +dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here + 127 | extern YYLTYPE yylloc; + | ^~~~~~ +cc1: all warnings being treated as errors + +which means the declaration is completely redundant and can just be +dropped. + +Signed-off-by: Dirk Mueller <dmueller@suse.com> +Signed-off-by: David Gibson <david@gibson.dropbear.id.au> +[robh: cherry-pick from upstream] +Cc: stable@vger.kernel.org +Signed-off-by: Rob Herring <robh@kernel.org> +--- + scripts/dtc/dtc-lexer.l | 1 - + 1 file changed, 1 deletion(-) + +--- 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() */ |