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

Commit 5d7960ff authored by Milton Miller's avatar Milton Miller Committed by Paul Mackerras
Browse files

[POWERPC] boot: clean rule fixes 



Now that obj-boot is in targets, we can remove (twice) it from clean-files.
zImage.initrd was missing, move zImage nearer where its used, and place
zImage.initrd next to it.  Remove non-ported zImage.sandpoint, and add
auto-generation of unconfigured zImage.initrd* like image-.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
--
Testing: did a few builds and cleans
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 235fd835

arch/powerpc/boot/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds: $(obj)/%: $(srctree)/$(src)/%.S 
	@cp $< $@



clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \

		empty.c zImage zImage.coff.lds zImage.lds zImage.sandpoint

		empty.c zImage.coff.lds zImage.lds



quiet_cmd_bootcc = BOOTCC  $@

      cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -177,6 +177,7 @@ ifeq ($(CONFIG_PPC32),y) 
image-$(CONFIG_PPC_PMAC)	+= zImage.coff zImage.miboot

endif



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

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

targets	+= $(image-y) $(initrd-y)
@@ -188,6 +189,5 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) 
install: $(CONFIGURE) $(image-y)

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



clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip.gz)

clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)

clean-files += $(image-)
 
clean-files += $(addprefix $(objtree)/, vmlinux.strip.gz vmlinux.bin.gz)

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