From a17305c1ca2fb05a4d48d549e04fe9c0938f4e42 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 28 May 2007 16:12:59 +1000 Subject: [PATCH] --- yaml --- r: 57291 b: refs/heads/master c: 0570d4ed4325c0fb2ceb75f45a21d878b1741b61 h: refs/heads/master i: 57289: 9fb2830dbc0a32cdf3943bbf783c84d41864dec7 57287: 68f49f64aab2c5c507b4bb6f2ddcd4b9c06a12e8 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Makefile | 1 - trunk/arch/powerpc/boot/Makefile | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index edfaa9ad0472..16a30238bd24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18456d015c50bc903fc66c65621170170190a1fd +refs/heads/master: 0570d4ed4325c0fb2ceb75f45a21d878b1741b61 diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile index 6238b5875fd1..fbafd965dcd2 100644 --- a/trunk/arch/powerpc/Makefile +++ b/trunk/arch/powerpc/Makefile @@ -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) diff --git a/trunk/arch/powerpc/boot/Makefile b/trunk/arch/powerpc/boot/Makefile index 378bda50b178..cc11697c38e5 100644 --- a/trunk/arch/powerpc/boot/Makefile +++ b/trunk/arch/powerpc/boot/Makefile @@ -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 $@