diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2007-05-15 12:40:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-17 21:11:14 +1000 |
| commit | 6a32d085ae71724edffa30fcd2045520a051cb14 (patch) | |
| tree | 29aa7561f61748aa7688d650b4d0d3cc27e565a9 | |
| parent | d16f1b648356d70ebbda2eb1b2af18a6816dacb1 (diff) | |
| download | blackbird-op-linux-6a32d085ae71724edffa30fcd2045520a051cb14.tar.gz blackbird-op-linux-6a32d085ae71724edffa30fcd2045520a051cb14.zip | |
[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 '^/'),\ $(obj)/cuImage.%: vmlinux $(dts) $(wrapperbits) $(call if_changed,wrap,cuboot-$*,$(dts)) -$(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits) - $(call if_changed,wrap,treeboot-$*,$(dts)) - $(obj)/treeImage.initrd.%: vmlinux $(dts) $(wrapperbits) $(call if_changed,wrap,treeboot-$*,$(dts),,$(obj)/ramdisk.image.gz) +$(obj)/treeImage.%: vmlinux $(dts) $(wrapperbits) + $(call if_changed,wrap,treeboot-$*,$(dts)) + $(obj)/zImage: $(addprefix $(obj)/, $(image-y)) @rm -f $@; ln $< $@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) |
