aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mandriva.org>2010-10-21 06:19:10 -0400
committerMichal Simek <monstr@monstr.eu>2010-10-22 01:53:15 -0400
commitb843e4ec01991a386a9e0e9030703524446e03da (patch)
tree75097d58fd55bd03c25a17ea160b0ffa91fe6cf5 /arch/microblaze
parenta1dfe9c7c9b780865f7a847d3a12fe9214005a58 (diff)
microblaze: Fix build with make 3.82
When running make headers_install_all on x86_64 and make 3.82 I hit this: arch/microblaze/Makefile:80: *** mixed implicit and normal rules. Stop. make: *** [headers_install_all] Error 2 So split the rules to satisfy make 3.82. Signed-off-by: Thomas Backlund <tmb@mandriva.org> Cc: Stable <stable@kernel.org> Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 70a3837c9ba8..15f1f1d1840d 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -69,12 +69,16 @@ export MMU DTB
69 69
70all: linux.bin 70all: linux.bin
71 71
72BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.% 72# With make 3.82 we cannot mix normal and wildcard targets
73BOOT_TARGETS1 = linux.bin linux.bin.gz
74BOOT_TARGETS2 = simpleImage.%
73 75
74archclean: 76archclean:
75 $(Q)$(MAKE) $(clean)=$(boot) 77 $(Q)$(MAKE) $(clean)=$(boot)
76 78
77$(BOOT_TARGETS): vmlinux 79$(BOOT_TARGETS1): vmlinux
80 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
81$(BOOT_TARGETS2): vmlinux
78 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ 82 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
79 83
80define archhelp 84define archhelp