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

Commit 0570d4ed authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Create a zImage for legacy iSeries 



This zImage is really just the stripped vmlinux, but it means that there
is one less special case for iSeries and also that the zImages will be
built for a combined kernel build that happens to include iSeries.

This zImage boots fine on legacy iSeries.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 18456d01

arch/powerpc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ 


# Default to zImage, override when needed

defaultimage-y			:= zImage

defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux

defaultimage-$(CONFIG_DEFAULT_UIMAGE) := uImage

KBUILD_IMAGE := $(defaultimage-y)

all: $(KBUILD_IMAGE)

arch/powerpc/boot/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ image-$(CONFIG_PPC_EFIKA) += zImage.chrp 
image-$(CONFIG_PPC_PMAC)		+= zImage.pmac

image-$(CONFIG_PPC_HOLLY)		+= zImage.holly-elf

image-$(CONFIG_PPC_PRPMC2800)		+= zImage.prpmc2800

image-$(CONFIG_PPC_ISERIES)		+= zImage.iseries

image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage



ifneq ($(CONFIG_DEVICE_TREE),"")
@@ -185,6 +186,9 @@ $(obj)/zImage.initrd.%: vmlinux $(wrapperbits) 
$(obj)/zImage.%: vmlinux $(wrapperbits)

	$(call if_changed,wrap,$*)



$(obj)/zImage.iseries: vmlinux

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



$(obj)/zImage.ps3: vmlinux

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