diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2007-05-14 22:40:23 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-17 07:11:14 -0400 |
commit | 6a32d085ae71724edffa30fcd2045520a051cb14 (patch) | |
tree | 29aa7561f61748aa7688d650b4d0d3cc27e565a9 | |
parent | d16f1b648356d70ebbda2eb1b2af18a6816dacb1 (diff) |
[POWERPC] Fix make rules for treeImage.initrd
At present attempting to build treeImage.initrd.* boot images will
fail, because make will select the treeImage.% rule which also matches
instead of the correct and more specific treeImage.initrd.% rule.
This patch corrects the problem by listing the more specific rule
first.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/boot/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index d4f9fef7f9e9..6d1f02fd2877 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -204,12 +204,12 @@ dts = $(if $(shell echo $(CONFIG_DEVICE_TREE) | grep '^/'),\ | |||
204 | $(obj)/cuImage.%: vmlinux $(dts) $(wrapperbits) | 204 | $(obj)/cuImage.%: vmlinux $(dts) $(wrapperbits) |
205 | $(call if_changed,wrap,cuboot-$*,$(dts)) | 205 | $(call if_changed,wrap,cuboot-$*,$(dts)) |
206 | 206 | ||
207 | $(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits) | ||
208 | $(call if_changed,wrap,treeboot-$*,$(dts)) | ||
209 | |||
210 | $(obj)/treeImage.initrd.%: vmlinux $(dts) $(wrapperbits) | 207 | $(obj)/treeImage.initrd.%: vmlinux $(dts) $(wrapperbits) |
211 | $(call if_changed,wrap,treeboot-$*,$(dts),,$(obj)/ramdisk.image.gz) | 208 | $(call if_changed,wrap,treeboot-$*,$(dts),,$(obj)/ramdisk.image.gz) |
212 | 209 | ||
210 | $(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits) | ||
211 | $(call if_changed,wrap,treeboot-$*,$(dts)) | ||
212 | |||
213 | $(obj)/zImage: $(addprefix $(obj)/, $(image-y)) | 213 | $(obj)/zImage: $(addprefix $(obj)/, $(image-y)) |
214 | @rm -f $@; ln $< $@ | 214 | @rm -f $@; ln $< $@ |
215 | $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) | 215 | $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) |