diff options
| author | Olaf Hering <olh@suse.de> | 2005-10-29 02:46:56 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-29 07:20:27 +0200 |
| commit | 18c5332bc17e75efdc02cc17410c647a627861f2 (patch) | |
| tree | 8fcb58ac5ded12d79b853beb395a594ab6a75169 /arch/ppc64 | |
| parent | [PATCH] ppc64: reenable make install with defconfig (diff) | |
| download | linux-18c5332bc17e75efdc02cc17410c647a627861f2.tar.xz linux-18c5332bc17e75efdc02cc17410c647a627861f2.zip | |
[PATCH] ppc64: change name of target file during make install
'make install' creates a /boot/zImage[.vmode] file when the defconfig is used.
It uses the second arg as file content, which is the vmlinux, and the 5th
arg as file name, which is the BOOTIMAGE name.
A comment in an earlier patch to install.sh states that yaboot can not load
a zImage+initrd combo. This was true in kernel 2.6.5 because it did use
bi_recs to pass the initrd info. But this concept was always broken.
Register r3 holds the initrd address and r4 holds the initrd size. This
works with all kernel versions. The current code in main.c leaves r3 and
r4 alone, so the kernel should be able to see and use the memory range with
the initrd content.
If one wants to rerun mkinitrd, it is currently hard to get the uname -r
value for the installed zImage. Without this info, mkinitrd can not know
what modules to use. This would be fixable by including the /proc/version
output of the new kernel. But it is simpler to just use the plain vmlinux.
So all this patch does is to write to /boot/vmlinux instead to /boot/zImage
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/boot/install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/boot/install.sh b/arch/ppc64/boot/install.sh index cb2d6626b555..eacce9590816 100644 --- a/arch/ppc64/boot/install.sh +++ b/arch/ppc64/boot/install.sh @@ -28,7 +28,7 @@ if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}i # Default install # this should work for both the pSeries zImage and the iSeries vmlinux.sm -image_name=`basename $5` +image_name=`basename $2` if [ -f $4/$image_name ]; then mv $4/$image_name $4/$image_name.old |