Commit 9da82a6d authored by Milton Miller's avatar Milton Miller Committed by Paul Mackerras
Browse files

[POWERPC] boot: Use a common zImage rule 



Before the plethora of platforms gets any worse, establish a common
rule to invoke the wrapper for any platform.  Add arguments to
the rule for initrd, dts, dtb, etc.   Show example usage with initrd.

Create default rules for zImage, and zImage.initrd.  initrd targets
depend on the ramdisk file.

Don't consider targets for zImage.initrd that are targets for zImage.
This means uImage is no longer considered a target for zImage.initrd.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5d7960ff

arch/powerpc/boot/Makefile

+24 −43
Original line number Original line Diff line number Diff line
@@ -116,50 +116,10 @@ CROSSWRAP := -C "$(CROSS_COMPILE)" 
endif

endif

endif

endif





# args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd

quiet_cmd_wrap	= WRAP    $@

quiet_cmd_wrap	= WRAP    $@

      cmd_wrap	=$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux

      cmd_wrap	=$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \

quiet_cmd_wrap_initrd = WRAP    $@

		$(if $3, -s $3)$(if $4, -d $4)$(if $5, -i $5) vmlinux

      cmd_wrap_initrd =$(CONFIG_SHELL) $(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \

				-i $(obj)/ramdisk.image.gz vmlinux



$(obj)/zImage.chrp: vmlinux $(wrapperbits)

	$(call if_changed,wrap,chrp)



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

	$(call if_changed,wrap_initrd,chrp)



$(obj)/zImage.pseries:	vmlinux $(wrapperbits)

	$(call if_changed,wrap,pseries)



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

	$(call if_changed,wrap_initrd,pseries)



$(obj)/zImage.pmac: vmlinux $(wrapperbits)

	$(call if_changed,wrap,pmac)



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

	$(call if_changed,wrap_initrd,pmac)



$(obj)/zImage.coff: vmlinux $(wrapperbits)

	$(call if_changed,wrap,pmaccoff)



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

	$(call if_changed,wrap_initrd,pmaccoff)



$(obj)/zImage.miboot: vmlinux $(wrapperbits)

	$(call if_changed,wrap,miboot)



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

	$(call if_changed,wrap_initrd,miboot)



$(obj)/zImage.ps3: vmlinux

	$(STRIP) -s -R .comment $< -o $@



$(obj)/zImage.initrd.ps3: vmlinux

	@echo "  WARNING zImage.initrd.ps3 not supported (yet)"



$(obj)/uImage: vmlinux $(wrapperbits)

	$(call if_changed,wrap,uboot)





image-$(CONFIG_PPC_PSERIES)		+= zImage.pseries

image-$(CONFIG_PPC_PSERIES)		+= zImage.pseries

image-$(CONFIG_PPC_MAPLE)		+= zImage.pseries

image-$(CONFIG_PPC_MAPLE)		+= zImage.pseries
@@ -179,8 +139,29 @@ endif 




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

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

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

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

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

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

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





$(addprefix $(obj)/, $(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.initrd.%: vmlinux $(wrapperbits)

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



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

	$(call if_changed,wrap,$*)



$(obj)/zImage.ps3: vmlinux

	$(STRIP) -s -R .comment $< -o $@



$(obj)/zImage.initrd.ps3: vmlinux

	@echo "  WARNING zImage.initrd.ps3 not supported (yet)"



$(obj)/uImage: vmlinux $(wrapperbits)

	$(call if_changed,wrap,uboot)



$(obj)/zImage:		$(addprefix $(obj)/, $(image-y))

$(obj)/zImage:		$(addprefix $(obj)/, $(image-y))

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

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

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

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