Merge tag 'v3.9-rc2' into next

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / microblaze / Makefile

diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index d26fb905ee0a0b9e367aeb236bdd95d18bdd4e59..0a603d3ecf240bd6ee71307e34edd7c7f733a2eb 100644 (file)
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -69,16 +69,13 @@ export MMU DTB
 
 all: linux.bin
 
-# With make 3.82 we cannot mix normal and wildcard targets
-BOOT_TARGETS1 = linux.bin linux.bin.gz
-BOOT_TARGETS2 = simpleImage.%
-
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
 
-$(BOOT_TARGETS1): vmlinux
+linux.bin linux.bin.gz: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
-$(BOOT_TARGETS2): vmlinux
+
+simpleImage.%: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 define archhelp