[POWERPC] Fix make rules for treeImage.initrd (6a32d085) · Commits · 戴 / test

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>

arch/powerpc/boot/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -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))

Admin message