diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-06-11 13:53:48 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-06-12 10:07:35 +0200 |
| commit | 699c659b49b5c7cf601fe454683841df16495c3e (patch) | |
| tree | 276133927511759e46fac12f7b747fe939c26a6d /arch | |
| parent | 9815594a780404810c2a6280de1a268dcfcb0729 (diff) | |
| download | linux-699c659b49b5c7cf601fe454683841df16495c3e.tar.bz2 | |
powerpc: Avoid circular dependency with zImage.%
The rule to create the final images uses a zImage.% pattern.
Unfortunately, this also matches the names of the zImage.*.lds linker
scripts, which appear as a dependency of the final images. This somehow
worked when $(srctree) used to be an absolute path, but now the pattern
matches too much. List only the images from $(image-y) as the target of
the rule, to avoid the circular dependency.
Reported-and-tested-by: Mike Qiu <qiudayu@linux.vnet.ibm.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/boot/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index a1f8c7f1ec60..ae6403708971 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -315,8 +315,8 @@ $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz $(obj)/zImage.initrd.%: vmlinux $(wrapperbits) $(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz) -$(obj)/zImage.%: vmlinux $(wrapperbits) - $(call if_changed,wrap,$*) +$(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperbits) + $(call if_changed,wrap,$(subst $(obj)/zImage.,,$@)) # dtbImage% - a dtbImage is a zImage with an embedded device tree blob $(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb |