Commit 594174d8 authored by Helge Deller's avatar Helge Deller

parisc: switch to gzip-compressed vmlinuz kernel

The latest PA-RISC Boot Loader (palo) allows loading of gzip compressed
vmlinuz kernels. So let's now switch to build a vmlinuz file when we
build a palo boot image.

PALO version 1.9 (or higher) is required for this which is available at
git://git.kernel.org/pub/scm/linux/kernel/git/deller/palo.gitSigned-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org> # 3.10
parent a83f58bc
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
# Mike Shaver, Helge Deller and Martin K. Petersen # Mike Shaver, Helge Deller and Martin K. Petersen
# #
KBUILD_IMAGE := vmlinuz
KBUILD_DEFCONFIG := default_defconfig KBUILD_DEFCONFIG := default_defconfig
NM = sh $(srctree)/arch/parisc/nm NM = sh $(srctree)/arch/parisc/nm
...@@ -92,7 +94,7 @@ PALOCONF := $(shell if [ -f $(src)/palo.conf ]; then echo $(src)/palo.conf; \ ...@@ -92,7 +94,7 @@ PALOCONF := $(shell if [ -f $(src)/palo.conf ]; then echo $(src)/palo.conf; \
else echo $(obj)/palo.conf; \ else echo $(obj)/palo.conf; \
fi) fi)
palo: vmlinux palo: vmlinuz
@if test ! -x "$(PALO)"; then \ @if test ! -x "$(PALO)"; then \
echo 'ERROR: Please install palo first (apt-get install palo)';\ echo 'ERROR: Please install palo first (apt-get install palo)';\
echo 'or build it from source and install it somewhere in your $$PATH';\ echo 'or build it from source and install it somewhere in your $$PATH';\
...@@ -107,10 +109,14 @@ palo: vmlinux ...@@ -107,10 +109,14 @@ palo: vmlinux
fi fi
$(PALO) -f $(PALOCONF) $(PALO) -f $(PALOCONF)
# Shorthands for known targets not supported by parisc, use vmlinux as default # Shorthands for known targets not supported by parisc, use vmlinux/vmlinuz as default
Image zImage bzImage: vmlinux Image: vmlinux
zImage bzImage: vmlinuz
vmlinuz: vmlinux
@gzip -cf -9 $< > $@
install: vmlinux install: vmlinuz
sh $(src)/arch/parisc/install.sh \ sh $(src)/arch/parisc/install.sh \
$(KERNELRELEASE) $< System.map "$(INSTALL_PATH)" $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
...@@ -119,6 +125,7 @@ MRPROPER_FILES += palo.conf ...@@ -119,6 +125,7 @@ MRPROPER_FILES += palo.conf
define archhelp define archhelp
@echo '* vmlinux - Uncompressed kernel image (./vmlinux)' @echo '* vmlinux - Uncompressed kernel image (./vmlinux)'
@echo ' vmlinuz - Compressed kernel image (./vmlinuz)'
@echo ' palo - Bootable image (./lifimage)' @echo ' palo - Bootable image (./lifimage)'
@echo ' install - Install kernel using' @echo ' install - Install kernel using'
@echo ' (your) ~/bin/$(INSTALLKERNEL) or' @echo ' (your) ~/bin/$(INSTALLKERNEL) or'
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Most people using 'make palo' want a bootable file, usable for # Most people using 'make palo' want a bootable file, usable for
# network or tape booting for example. # network or tape booting for example.
--init-tape=lifimage --init-tape=lifimage
--recoverykernel=vmlinux --recoverykernel=vmlinuz
########## Pick your ROOT here! ########## ########## Pick your ROOT here! ##########
# You need at least one 'root='! # You need at least one 'root='!
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
# If you want a root ramdisk, use the next 2 lines # If you want a root ramdisk, use the next 2 lines
# (Edit the ramdisk image name!!!!) # (Edit the ramdisk image name!!!!)
--ramdisk=ram-disk-image-file --ramdisk=ram-disk-image-file
--commandline=0/vmlinux HOME=/ root=/dev/ram initrd=0/ramdisk --commandline=0/vmlinuz HOME=/ root=/dev/ram initrd=0/ramdisk panic_timeout=60 panic=-1
# If you want NFS root, use the following command line (Edit the HOSTNAME!!!) # If you want NFS root, use the following command line (Edit the HOSTNAME!!!)
#--commandline=0/vmlinux HOME=/ root=/dev/nfs nfsroot=HOSTNAME ip=bootp #--commandline=0/vmlinuz HOME=/ root=/dev/nfs nfsroot=HOSTNAME ip=bootp
# If you have root on a disk partition, use this (Edit the partition name!!!) # If you have root on a disk partition, use this (Edit the partition name!!!)
#--commandline=0/vmlinux HOME=/ root=/dev/sda1 #--commandline=0/vmlinuz HOME=/ root=/dev/sda1
...@@ -26,13 +26,13 @@ if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi ...@@ -26,13 +26,13 @@ if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
# Default install # Default install
if [ -f $4/vmlinux ]; then if [ -f $4/vmlinuz ]; then
mv $4/vmlinux $4/vmlinux.old mv $4/vmlinuz $4/vmlinuz.old
fi fi
if [ -f $4/System.map ]; then if [ -f $4/System.map ]; then
mv $4/System.map $4/System.old mv $4/System.map $4/System.old
fi fi
cat $2 > $4/vmlinux cat $2 > $4/vmlinuz
cp $3 $4/System.map cp $3 $4/System.map
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment