diff --git a/Makefile b/Makefile
index 9bb51c69b9..9a32a857c4 100644
--- a/Makefile
+++ b/Makefile
@@ -573,6 +573,20 @@ KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
 endif
 KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks)
 
+#FIXME: Added to avoid the warning from sysupgrade-helper
+#To be modified once the config is fixed
+ifdef CONFIG_ARCH_IPQ807x
+KBUILD_CFLAGS += -Werror
+endif
+ifdef CONFIG_ARCH_IPQ40xx
+KBUILD_CFLAGS += -Werror
+endif
+ifdef CONFIG_ARCH_IPQ806x
+KBUILD_CFLAGS += -Werror
+endif
+ifdef CONFIG_ARCH_IPQ6018
+KBUILD_CFLAGS += -Werror
+endif
 KBUILD_CFLAGS	+= -g
 # $(KBUILD_AFLAGS) sets -g, which causes gcc to pass a suitable -g<format>
 # option to the assembler.