mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-17 09:14:19 +08:00
4f3865fb57
Upgrade the zlib_inflate implementation in the kernel from a patched version 1.1.3/4 to a patched 1.2.3. The code in the kernel is about seven years old and I noticed that the external zlib library's inflate performance was significantly faster (~50%) than the code in the kernel on ARM (and faster again on x86_32). For comparison the newer deflate code is 20% slower on ARM and 50% slower on x86_32 but gives an approx 1% compression ratio improvement. I don't consider this to be an improvement for kernel use so have no plans to change the zlib_deflate code. Various changes have been made to the zlib code in the kernel, the most significant being the extra functions/flush option used by ppp_deflate. This update reimplements the features PPP needs to ensure it continues to work. This code has been tested on ARM under both JFFS2 (with zlib compression enabled) and ppp_deflate and on x86_32. JFFS2 sees an approx. 10% real world file read speed improvement. This patch also removes ZLIB_VERSION as it no longer has a correct value. We don't need version checks anyway as the kernel's module handling will take care of that for us. This removal is also more in keeping with the zlib author's wishes (http://www.zlib.net/zlib_faq.html#faq24) and I've added something to the zlib.h header to note its a modified version. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Acked-by: Joern Engel <joern@wh.fh-wedel.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
216 lines
7.9 KiB
Makefile
216 lines
7.9 KiB
Makefile
# Makefile for making ELF bootable images for booting on CHRP
|
|
# using Open Firmware.
|
|
#
|
|
# Geert Uytterhoeven September 1997
|
|
#
|
|
# Based on coffboot by Paul Mackerras
|
|
# Simplified for ppc64 by Todd Inglett
|
|
#
|
|
# NOTE: this code is built for 32 bit in ELF32 format even though
|
|
# it packages a 64 bit kernel. We do this to simplify the
|
|
# bootloader and increase compatibility with OpenFirmware.
|
|
#
|
|
# To this end we need to define BOOTCC, etc, as the tools
|
|
# needed to build the 32 bit image. These are normally HOSTCC,
|
|
# but may be a third compiler if, for example, you are cross
|
|
# compiling from an intel box. Once the 64bit ppc gcc is
|
|
# stable it will probably simply be a compiler switch to
|
|
# compile for 32bit mode.
|
|
# To make it easier to setup a cross compiler,
|
|
# CROSS32_COMPILE is setup as a prefix just like CROSS_COMPILE
|
|
# in the toplevel makefile.
|
|
|
|
|
|
HOSTCC := gcc
|
|
BOOTCFLAGS := $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem \
|
|
$(shell $(CROSS32CC) -print-file-name=include) -fPIC
|
|
BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
|
|
OBJCOPYFLAGS := contents,alloc,load,readonly,data
|
|
OBJCOPY_COFF_ARGS := -O aixcoff-rs6000 --set-start 0x500000
|
|
OBJCOPY_MIB_ARGS := -O aixcoff-rs6000 -R .stab -R .stabstr -R .comment
|
|
|
|
zlib := inffast.c inflate.c inftrees.c
|
|
zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
|
|
zliblinuxheader := zlib.h zconf.h zutil.h
|
|
|
|
$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
|
|
#$(addprefix $(obj)/,main.o): $(addprefix $(obj)/,zlib.h)
|
|
|
|
src-boot := crt0.S string.S prom.c stdio.c main.c div64.S
|
|
src-boot += $(zlib)
|
|
src-boot := $(addprefix $(obj)/, $(src-boot))
|
|
obj-boot := $(addsuffix .o, $(basename $(src-boot)))
|
|
|
|
BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
|
|
|
|
quiet_cmd_copy_zlib = COPY $@
|
|
cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
|
|
|
|
quiet_cmd_copy_zlibheader = COPY $@
|
|
cmd_copy_zlibheader = sed "s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
|
|
# stddef.h for NULL
|
|
quiet_cmd_copy_zliblinuxheader = COPY $@
|
|
cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
|
|
|
|
$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
|
|
$(call cmd,copy_zlib)
|
|
|
|
$(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
|
|
$(call cmd,copy_zlibheader)
|
|
|
|
$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%
|
|
$(call cmd,copy_zliblinuxheader)
|
|
|
|
clean-files := $(zlib) $(zlibheader) $(zliblinuxheader)
|
|
|
|
|
|
quiet_cmd_bootcc = BOOTCC $@
|
|
cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
|
|
|
|
quiet_cmd_bootas = BOOTAS $@
|
|
cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<
|
|
|
|
quiet_cmd_bootld = BOOTLD $@
|
|
cmd_bootld = $(CROSS32LD) -T $(srctree)/$(src)/$(3) -o $@ $(2)
|
|
|
|
$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c
|
|
$(call if_changed_dep,bootcc)
|
|
$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
|
|
$(call if_changed_dep,bootas)
|
|
|
|
#-----------------------------------------------------------
|
|
# ELF sections within the zImage bootloader/wrapper
|
|
#-----------------------------------------------------------
|
|
required := vmlinux.strip
|
|
initrd := initrd
|
|
|
|
obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.o, $(section)))
|
|
src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))
|
|
gz-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))
|
|
|
|
hostprogs-y := addnote addRamDisk hack-coff
|
|
|
|
targets += zImage.vmode zImage.initrd.vmode zImage zImage.initrd \
|
|
zImage.coff zImage.initrd.coff miboot.image miboot.initrd.image \
|
|
$(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \
|
|
$(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \
|
|
$(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \
|
|
vmlinux.initrd dummy.o
|
|
extra-y := initrd.o
|
|
|
|
quiet_cmd_ramdisk = RAMDISK $@
|
|
cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@
|
|
|
|
quiet_cmd_stripvm = STRIP $@
|
|
cmd_stripvm = $(STRIP) -s -R .comment $< -o $@
|
|
|
|
vmlinux.strip: vmlinux
|
|
$(call if_changed,stripvm)
|
|
$(obj)/vmlinux.initrd: vmlinux.strip $(obj)/addRamDisk $(obj)/ramdisk.image.gz
|
|
$(call if_changed,ramdisk)
|
|
|
|
quiet_cmd_addsection = ADDSEC $@
|
|
cmd_addsection = $(CROSS32OBJCOPY) $@ \
|
|
--add-section=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(patsubst %.o,%.gz, $@) \
|
|
--set-section-flags=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(OBJCOPYFLAGS)
|
|
|
|
quiet_cmd_addnote = ADDNOTE $@
|
|
cmd_addnote = $(obj)/addnote $@
|
|
|
|
quiet_cmd_gen-miboot = GEN $@
|
|
cmd_gen-miboot = $(OBJCOPY) $(OBJCOPY_MIB_ARGS) \
|
|
--add-section=$1=$(word 2, $^) $< $@
|
|
|
|
quiet_cmd_gencoff = COFF $@
|
|
cmd_gencoff = $(OBJCOPY) $(OBJCOPY_COFF_ARGS) $@ && \
|
|
$(obj)/hack-coff $@
|
|
|
|
$(call gz-sec, $(required)): $(obj)/kernel-%.gz: %
|
|
$(call if_changed,gzip)
|
|
|
|
$(obj)/kernel-initrd.gz: $(obj)/ramdisk.image.gz
|
|
cp -f $(obj)/ramdisk.image.gz $@
|
|
|
|
$(call src-sec, $(required) $(initrd)): $(obj)/kernel-%.c: $(obj)/kernel-%.gz
|
|
@touch $@
|
|
|
|
$(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c
|
|
$(call if_changed_dep,bootcc)
|
|
$(call cmd,addsection)
|
|
|
|
$(obj)/zImage.vmode $(obj)/zImage.coff: obj-boot += $(call obj-sec, $(required))
|
|
$(obj)/zImage.vmode: $(call obj-sec, $(required)) $(obj-boot) $(srctree)/$(src)/zImage.lds
|
|
$(call cmd,bootld,$(obj-boot),zImage.lds)
|
|
|
|
$(obj)/zImage.initrd.vmode $(obj)/zImage.initrd.coff: obj-boot += $(call obj-sec, $(required) $(initrd))
|
|
$(obj)/zImage.initrd.vmode: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(srctree)/$(src)/zImage.lds
|
|
$(call cmd,bootld,$(obj-boot),zImage.lds)
|
|
|
|
# For 32-bit powermacs, build the COFF and miboot images
|
|
# as well as the ELF images.
|
|
coffimage-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.coff
|
|
coffrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.initrd.coff
|
|
mibootimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/miboot.image
|
|
mibrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/miboot.initrd.image
|
|
|
|
$(obj)/zImage: $(obj)/zImage.vmode $(obj)/addnote $(coffimage-y-y) \
|
|
$(mibootimg-y-y)
|
|
@cp -f $< $@
|
|
$(call if_changed,addnote)
|
|
|
|
$(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote \
|
|
$(coffrdimg-y-y) $(mibrdimg-y-y)
|
|
@cp -f $< $@
|
|
$(call if_changed,addnote)
|
|
|
|
$(obj)/zImage.coff: $(call obj-sec, $(required)) $(obj-boot) \
|
|
$(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff
|
|
$(call cmd,bootld,$(obj-boot),zImage.coff.lds)
|
|
$(call cmd,gencoff)
|
|
|
|
$(obj)/zImage.initrd.coff: $(call obj-sec, $(required) $(initrd)) $(obj-boot) \
|
|
$(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff
|
|
$(call cmd,bootld,$(obj-boot),zImage.coff.lds)
|
|
$(call cmd,gencoff)
|
|
|
|
$(obj)/miboot.image: $(obj)/dummy.o $(obj)/vmlinux.gz
|
|
$(call cmd,gen-miboot,image)
|
|
|
|
$(obj)/miboot.initrd.image: $(obj)/miboot.image $(images)/ramdisk.image.gz
|
|
$(call cmd,gen-miboot,initrd)
|
|
|
|
#-----------------------------------------------------------
|
|
# build u-boot images
|
|
#-----------------------------------------------------------
|
|
quiet_cmd_mygzip = GZIP $@
|
|
cmd_mygzip = gzip -f -9 < $< > $@.$$$$ && mv $@.$$$$ $@
|
|
|
|
quiet_cmd_objbin = OBJCOPY $@
|
|
cmd_objbin = $(OBJCOPY) -O binary $< $@
|
|
|
|
quiet_cmd_uimage = UIMAGE $@
|
|
cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A ppc -O linux -T kernel \
|
|
-C gzip -a 00000000 -e 00000000 -n 'Linux-$(KERNELRELEASE)' \
|
|
-d $< $@
|
|
|
|
MKIMAGE := $(srctree)/scripts/mkuboot.sh
|
|
targets += uImage
|
|
extra-y += vmlinux.bin vmlinux.gz
|
|
|
|
$(obj)/vmlinux.bin: vmlinux FORCE
|
|
$(call if_changed,objbin)
|
|
|
|
$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
|
|
$(call if_changed,mygzip)
|
|
|
|
$(obj)/uImage: $(obj)/vmlinux.gz
|
|
$(Q)rm -f $@
|
|
$(call cmd,uimage)
|
|
@echo -n ' Image: $@ '
|
|
@if [ -f $@ ]; then echo 'is ready' ; else echo 'not made'; fi
|
|
|
|
install: $(CONFIGURE) $(BOOTIMAGE)
|
|
sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" "$(BOOTIMAGE)"
|
|
|
|
clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)
|