From 8d17f89cd027e4f57c5fbd265798108562e461b5 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Tue, 11 Oct 2005 09:25:40 +1000
Subject: [PATCH] --- yaml --- r: 11551 b: refs/heads/master c:
 20f629549b30a1154c8b5e830cb10a0c0faa875f h: refs/heads/master i:   11549:
 5a6c48400fa2b434e33eef64d22f63d1a1c6774a   11547:
 3ad454c25365292ab00203585475231c670ea488   11543:
 065861694477460d3f4e89164549bca41b7a212a   11535:
 eacbb56113ed28fdc0d0ba6454f01408eae71ae3   11519:
 c5cb1be122448aba9a51583dc5fcbe16ccb18884 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/powerpc/Makefile | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 897967727c6f..b27e3c4a801c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c3f42d63a11f2e22dbff6bb4d170f92dbd39316
+refs/heads/master: 20f629549b30a1154c8b5e830cb10a0c0faa875f
diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile
index 27649cfc2a5d..8d1e7bd14c55 100644
--- a/trunk/arch/powerpc/Makefile
+++ b/trunk/arch/powerpc/Makefile
@@ -140,6 +140,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
 
 defaultimage-$(CONFIG_PPC32)	:= uImage zImage
 defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
+defaultimage-$(CONFIG_PPC_PSERIES) := zImage
 KBUILD_IMAGE := $(defaultimage-y)
 all: $(KBUILD_IMAGE)
 
@@ -154,8 +155,14 @@ BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
 
 boot := arch/$(OLDARCH)/boot
 
+# urk
+ifeq ($(CONFIG_PPC64),y)
+$(BOOT_TARGETS): vmlinux
+	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
+else
 $(BOOT_TARGETS): vmlinux
-	$(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot) $@
+	$(Q)$(MAKE) ARCH=ppc $(build)=$(boot) $@
+endif
 
 uImage: vmlinux
 	$(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot)/images $(boot)/images/$@