[PATCH] use vmlinux during make install on ppc64

[Olaf Hering]

make install passes the zImage to the installkernel script.
When an initrd is used, this script has to pull out the vmlinux from the
zImage because yaboot can not boot a zImage+initrd combo.
It can only handle vmlinux+initrd or zImage.initrd.
Its simple to just pass the plain vmlinux instead.

Signed-off-by: Olaf Hering <olh at suse.de>

diff -purNx tags ../linux-2.6.11-rc3.orig/arch/ppc64/Makefile ./arch/ppc64/Makefile
--- ../linux-2.6.11-rc3.orig/arch/ppc64/Makefile	2005-02-03 02:55:14.000000000 +0100
+++ ./arch/ppc64/Makefile	2005-02-07 16:03:59.708074617 +0100
@@ -65,9 +65,7 @@ boottarget-$(CONFIG_PPC_ISERIES) := vmli
 $(boottarget-y): vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
-bootimage-$(CONFIG_PPC_PSERIES) := zImage
-bootimage-$(CONFIG_PPC_MAPLE) := zImage
-bootimage-$(CONFIG_PPC_ISERIES) := vmlinux
+bootimage-y := vmlinux
 BOOTIMAGE := $(bootimage-y)
 install: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@
diff -purNx tags ../linux-2.6.11-rc3.orig/arch/ppc64/boot/Makefile ./arch/ppc64/boot/Makefile
--- ../linux-2.6.11-rc3.orig/arch/ppc64/boot/Makefile	2005-02-03 02:56:36.000000000 +0100
+++ ./arch/ppc64/boot/Makefile	2005-02-07 16:05:45.966639316 +0100
@@ -117,7 +117,7 @@ $(obj)/imagesize.c: vmlinux.strip
 	awk '{printf "unsigned long vmlinux_memsize = 0x%s;\n", substr($$1,8)}' \
 		>> $(obj)/imagesize.c
 
-install: $(CONFIGURE) $(obj)/$(BOOTIMAGE)
-	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" "$(obj)/$(BOOTIMAGE)" "$(INSTALL_PATH)"
+install: $(CONFIGURE) $(BOOTIMAGE)
+	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" "$(BOOTIMAGE)" "$(INSTALL_PATH)"
 
 clean-files := $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)