diff options
Diffstat (limited to 'arch/powerpc/boot/Makefile')
-rw-r--r-- | arch/powerpc/boot/Makefile | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index c6b8e137d47d..75e1e5681ad8 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -157,27 +157,9 @@ targets += $(image-y) $(initrd-y) | |||
157 | 157 | ||
158 | $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz | 158 | $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz |
159 | 159 | ||
160 | dts- := $(patsubst zImage%, zImage.dts%, $(image-n) $(image-)) | ||
161 | dts-y := $(patsubst zImage%, zImage.dts%, $(image-y)) | ||
162 | dts-y := $(filter-out $(image-y), $(dts-y)) | ||
163 | targets += $(image-y) $(dts-y) | ||
164 | |||
165 | dts_initrd- := $(patsubst zImage%, zImage.dts_initrd%, $(image-n) $(image-)) | ||
166 | dts_initrd-y := $(patsubst zImage%, zImage.dts_initrd%, $(image-y)) | ||
167 | dts_initrd-y := $(filter-out $(image-y), $(dts_initrd-y)) | ||
168 | targets += $(image-y) $(dts_initrd-y) | ||
169 | |||
170 | $(addprefix $(obj)/, $(dts_initrd-y)): $(obj)/ramdisk.image.gz | ||
171 | |||
172 | # Don't put the ramdisk on the pattern rule; when its missing make will try | 160 | # Don't put the ramdisk on the pattern rule; when its missing make will try |
173 | # the pattern rule with less dependencies that also matches (even with the | 161 | # the pattern rule with less dependencies that also matches (even with the |
174 | # hard dependency listed). | 162 | # hard dependency listed). |
175 | $(obj)/zImage.dts_initrd.%: vmlinux $(wrapperbits) $(dts) $(obj)/ramdisk.image.gz | ||
176 | $(call if_changed,wrap,$*,$(dts),,$(obj)/ramdisk.image.gz) | ||
177 | |||
178 | $(obj)/zImage.dts.%: vmlinux $(wrapperbits) $(dts) | ||
179 | $(call if_changed,wrap,$*,$(dts)) | ||
180 | |||
181 | $(obj)/zImage.initrd.%: vmlinux $(wrapperbits) | 163 | $(obj)/zImage.initrd.%: vmlinux $(wrapperbits) |
182 | $(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz) | 164 | $(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz) |
183 | 165 | ||
@@ -219,18 +201,12 @@ $(obj)/zImage: $(addprefix $(obj)/, $(image-y)) | |||
219 | @rm -f $@; ln $< $@ | 201 | @rm -f $@; ln $< $@ |
220 | $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) | 202 | $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) |
221 | @rm -f $@; ln $< $@ | 203 | @rm -f $@; ln $< $@ |
222 | $(obj)/zImage.dts: $(addprefix $(obj)/, $(dts-y)) | ||
223 | @rm -f $@; ln $< $@ | ||
224 | $(obj)/zImage.dts_initrd: $(addprefix $(obj)/, $(dts_initrd-y)) | ||
225 | @rm -f $@; ln $< $@ | ||
226 | |||
227 | 204 | ||
228 | install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) | 205 | install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) |
229 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< | 206 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< |
230 | 207 | ||
231 | # anything not in $(targets) | 208 | # anything not in $(targets) |
232 | clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* \ | 209 | clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* |
233 | treeImage.* zImage.dts zImage.dts_initrd | ||
234 | 210 | ||
235 | # clean up files cached by wrapper | 211 | # clean up files cached by wrapper |
236 | clean-kernel := vmlinux.strip vmlinux.bin | 212 | clean-kernel := vmlinux.strip vmlinux.bin |