Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 941b7adf authored by Mark A. Greer's avatar Mark A. Greer Committed by Paul Mackerras
Browse files

[POWERPC] Remove 'make zImage.dts' feature 



Being able to selectively wrap a device tree with the zIimage at build
time has been deemed unnecessary, so this removes Makefile support for
that feature.

Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent df211c8a

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ all: $(KBUILD_IMAGE) 


CPPFLAGS_vmlinux.lds	:= -Upowerpc



BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage

BOOT_TARGETS = zImage zImage.initrd uImage



PHONY += $(BOOT_TARGETS)

arch/powerpc/boot/Makefile

+1 −25
Original line number Diff line number Diff line
@@ -157,27 +157,9 @@ targets += $(image-y) $(initrd-y) 


$(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz



dts-  := $(patsubst zImage%, zImage.dts%, $(image-n) $(image-))

dts-y := $(patsubst zImage%, zImage.dts%, $(image-y))

dts-y := $(filter-out $(image-y), $(dts-y))

targets	+= $(image-y) $(dts-y)



dts_initrd-  := $(patsubst zImage%, zImage.dts_initrd%, $(image-n) $(image-))

dts_initrd-y := $(patsubst zImage%, zImage.dts_initrd%, $(image-y))

dts_initrd-y := $(filter-out $(image-y), $(dts_initrd-y))

targets	+= $(image-y) $(dts_initrd-y)



$(addprefix $(obj)/, $(dts_initrd-y)): $(obj)/ramdisk.image.gz



# Don't put the ramdisk on the pattern rule; when its missing make will try

# the pattern rule with less dependencies that also matches (even with the

# hard dependency listed).

$(obj)/zImage.dts_initrd.%: vmlinux $(wrapperbits) $(dts) $(obj)/ramdisk.image.gz

	$(call if_changed,wrap,$*,$(dts),,$(obj)/ramdisk.image.gz)



$(obj)/zImage.dts.%: vmlinux $(wrapperbits) $(dts)

	$(call if_changed,wrap,$*,$(dts))



$(obj)/zImage.initrd.%: vmlinux $(wrapperbits)

	$(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz)
@@ -219,18 +201,12 @@ $(obj)/zImage: $(addprefix $(obj)/, $(image-y)) 
	@rm -f $@; ln $< $@

$(obj)/zImage.initrd:	$(addprefix $(obj)/, $(initrd-y))

	@rm -f $@; ln $< $@

$(obj)/zImage.dts:	$(addprefix $(obj)/, $(dts-y))

	@rm -f $@; ln $< $@

$(obj)/zImage.dts_initrd:	$(addprefix $(obj)/, $(dts_initrd-y))

	@rm -f $@; ln $< $@





install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))

	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<



# anything not in $(targets)

clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* \

	treeImage.* zImage.dts zImage.dts_initrd

clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.*



# clean up files cached by wrapper

clean-kernel := vmlinux.strip vmlinux.bin