aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 27649cfc2a5d..8d1e7bd14c55 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -140,6 +140,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
140 140
141defaultimage-$(CONFIG_PPC32) := uImage zImage 141defaultimage-$(CONFIG_PPC32) := uImage zImage
142defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux 142defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
143defaultimage-$(CONFIG_PPC_PSERIES) := zImage
143KBUILD_IMAGE := $(defaultimage-y) 144KBUILD_IMAGE := $(defaultimage-y)
144all: $(KBUILD_IMAGE) 145all: $(KBUILD_IMAGE)
145 146
@@ -154,8 +155,14 @@ BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
154 155
155boot := arch/$(OLDARCH)/boot 156boot := arch/$(OLDARCH)/boot
156 157
158# urk
159ifeq ($(CONFIG_PPC64),y)
160$(BOOT_TARGETS): vmlinux
161 $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
162else
157$(BOOT_TARGETS): vmlinux 163$(BOOT_TARGETS): vmlinux
158 $(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot) $@ 164 $(Q)$(MAKE) ARCH=ppc $(build)=$(boot) $@
165endif
159 166
160uImage: vmlinux 167uImage: vmlinux
161 $(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot)/images $(boot)/images/$@ 168 $(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot)/images $(boot)/images/$@