From 3b5d8f089e921b0cef8a5c5297572ab2b9bf8be2 Mon Sep 17 00:00:00 2001
From: Jens Wiklander <jens.wiklander@linaro.org>
Date: Wed, 27 Jun 2018 09:16:24 +0200
Subject: [PATCH] grub: ignore harmless warning

Grub 2.02 has a harmless warning with recent GCC compilers. Avoid the
problem by configuring Grub with --disable-werror.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
 fvp.mk          | 3 ++-
 hikey.mk        | 3 ++-
 hikey960.mk     | 3 ++-
 hikey_debian.mk | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fvp.mk b/fvp.mk
index ea214bf..40b5b26 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -127,7 +127,8 @@ grub-flags := CC="$(CCACHE)gcc" \
 	TARGET_OBJCOPY="$(AARCH64_CROSS_COMPILE)objcopy" \
 	TARGET_NM="$(AARCH64_CROSS_COMPILE)nm" \
 	TARGET_RANLIB="$(AARCH64_CROSS_COMPILE)ranlib" \
-	TARGET_STRIP="$(AARCH64_CROSS_COMPILE)strip"
+	TARGET_STRIP="$(AARCH64_CROSS_COMPILE)strip" \
+	--disable-werror
 
 GRUB_MODULES += boot chain configfile echo efinet eval ext2 fat font gettext \
 		gfxterm gzio help linux loadenv lsefi normal part_gpt \
diff --git a/hikey.mk b/hikey.mk
index ffaaf4a..dea2653 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -202,7 +202,8 @@ grub-flags := CC="$(CCACHE)gcc" \
 	TARGET_OBJCOPY="$(AARCH64_CROSS_COMPILE)objcopy" \
 	TARGET_NM="$(AARCH64_CROSS_COMPILE)nm" \
 	TARGET_RANLIB="$(AARCH64_CROSS_COMPILE)ranlib" \
-	TARGET_STRIP="$(AARCH64_CROSS_COMPILE)strip"
+	TARGET_STRIP="$(AARCH64_CROSS_COMPILE)strip" \
+	--disable-werror
 
 GRUB_MODULES += boot chain configfile efinet ext2 fat gettext \
                 help linux loadenv lsefi normal part_gpt \
diff --git a/hikey960.mk b/hikey960.mk
index 961b1f3..a41008d 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -195,7 +195,8 @@ grub-flags := CC="$(CCACHE)gcc" \
 	TARGET_OBJCOPY="$(AARCH64_CROSS_COMPILE)objcopy" \
 	TARGET_NM="$(AARCH64_CROSS_COMPILE)nm" \
 	TARGET_RANLIB="$(AARCH64_CROSS_COMPILE)ranlib" \
-	TARGET_STRIP="$(AARCH64_CROSS_COMPILE)strip"
+	TARGET_STRIP="$(AARCH64_CROSS_COMPILE)strip" \
+	--disable-werror
 
 GRUB_MODULES += boot chain configfile echo efinet eval ext2 fat font gettext \
                 gfxterm gzio help linux loadenv lsefi normal part_gpt \
diff --git a/hikey_debian.mk b/hikey_debian.mk
index 4b98dfb..fa64810 100644
--- a/hikey_debian.mk
+++ b/hikey_debian.mk
@@ -254,7 +254,8 @@ grub-flags := CC="$(CCACHE)gcc" \
 	TARGET_OBJCOPY="$(AARCH64_CROSS_COMPILE)objcopy" \
 	TARGET_NM="$(AARCH64_CROSS_COMPILE)nm" \
 	TARGET_RANLIB="$(AARCH64_CROSS_COMPILE)ranlib" \
-	TARGET_STRIP="$(AARCH64_CROSS_COMPILE)strip"
+	TARGET_STRIP="$(AARCH64_CROSS_COMPILE)strip" \
+	--disable-werror
 
 GRUB_MODULES += boot chain configfile echo efinet eval ext2 fat font gettext \
 		gfxterm gzio help linux loadenv lsefi normal part_gpt \
-- 
GitLab