Merge branch 'for-linus' into test

[sfrench/cifs-2.6.git] / arch / mips / Makefile

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 9f6a26d72f9fe66c405b27d62414feaf71e8d2cb..d1ca839c3981e5c7db6d42affe939f2fc0d8dbb0 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -216,6 +216,12 @@ cflags-$(toolchain-msa)                    += -DTOOLCHAIN_SUPPORTS_MSA
 endif
 toolchain-virt                         := $(call cc-option-yn,$(mips-cflags) -mvirt)
 cflags-$(toolchain-virt)               += -DTOOLCHAIN_SUPPORTS_VIRT
+# For -mmicromips, use -Wa,-fatal-warnings to catch unsupported -mxpa which
+# only warns
+xpa-cflags-y                           := $(mips-cflags)
+xpa-cflags-$(micromips-ase)            += -mmicromips -Wa$(comma)-fatal-warnings
+toolchain-xpa                          := $(call cc-option-yn,$(xpa-cflags-y) -mxpa)
+cflags-$(toolchain-xpa)                        += -DTOOLCHAIN_SUPPORTS_XPA
 
 #
 # Firmware support
@@ -228,7 +234,7 @@ libs-y                              += arch/mips/fw/lib/
 #
 # Kernel compression
 #
-ifdef SYS_SUPPORTS_ZBOOT
+ifdef CONFIG_SYS_SUPPORTS_ZBOOT
 COMPRESSION_FNAME              = vmlinuz
 else
 COMPRESSION_FNAME              = vmlinux