Commit 2bf11819 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

[POWERPC] Create a "wrapper" script and use it in arch/powerpc/boot 



This puts the knowledge of how to create various sorts of zImage
wrappers into a script called "wrapper" that could be used outside of
the kernel tree.  This changes arch/powerpc/boot so it first builds
the files that the wrapper script needs, then runs it to create
whatever flavours of zImage are required.

This version does uImages as well.  The zImage names are changed
slightly; zImage.pseries is the one with the PT_NOTE program header
entry added, and zImage.pmac is the one without.  If the
zImage.pseries gets made, it will also get hardlinked to zImage;
otherwise, if zImage.pmac is made, it gets hardlinked to zImage.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 4e6d816e

arch/powerpc/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ CROSS32_COMPILE ?= 
CROSS32CC		:= $(CROSS32_COMPILE)gcc

CROSS32AS		:= $(CROSS32_COMPILE)as

CROSS32LD		:= $(CROSS32_COMPILE)ld

CROSS32AR		:= $(CROSS32_COMPILE)ar

CROSS32OBJCOPY		:= $(CROSS32_COMPILE)objcopy



ifeq ($(HAS_BIARCH),y)
@@ -28,10 +29,11 @@ CROSS32CC := $(CC) -m32 
CROSS32AS	:= $(AS) -a32

CROSS32LD	:= $(LD) -m elf32ppc

CROSS32OBJCOPY	:= $(OBJCOPY)

CROSS32AR	:= $(AR)

endif

endif



export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY

export CROSS32CC CROSS32AS CROSS32LD CROSS32AR CROSS32OBJCOPY



KBUILD_DEFCONFIG := $(shell uname -m)_defconfig
@@ -146,7 +148,7 @@ all: $(KBUILD_IMAGE) 


CPPFLAGS_vmlinux.lds	:= -Upowerpc



BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage vmlinux.bin

BOOT_TARGETS = zImage zImage.initrd uImage



PHONY += $(BOOT_TARGETS)

arch/powerpc/boot/Makefile

+91 −133
Original line number Diff line number Diff line
@@ -20,33 +20,34 @@ 
#	CROSS32_COMPILE is setup as a prefix just like CROSS_COMPILE

#	in the toplevel makefile.



all: $(obj)/zImage



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



ifeq ($(call cc-option-yn, -fstack-protector),y)

BOOTCFLAGS	+= -fno-stack-protector

endif



BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj)



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)

$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) \

		$(addprefix $(obj)/,$(zlibheader))



src-wlib := string.S stdio.c main.c div64.S $(zlib)

src-plat := of.c

src-boot := crt0.S $(src-wlib) $(src-plat) empty.c



src-boot-$(CONFIG_PPC_MULTIPLATFORM) := of.c

src-boot := crt0.S string.S stdio.c main.c div64.S $(src-boot-y)

src-boot += $(zlib)

src-boot := $(addprefix $(obj)/, $(src-boot))

obj-boot := $(addsuffix .o, $(basename $(src-boot)))



ifeq ($(call cc-option-yn, -fstack-protector),y)

BOOTCFLAGS	+= -fno-stack-protector

endif



BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj)

obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))

obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))



quiet_cmd_copy_zlib = COPY    $@

      cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
@@ -66,8 +67,14 @@ $(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/% 
$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%

	$(call cmd,copy_zliblinuxheader)



clean-files := $(zlib) $(zlibheader) $(zliblinuxheader)

$(obj)/empty.c:

	@touch $@



$(obj)/zImage.lds $(obj)/zImage.coff.lds: $(obj)/%: $(srctree)/$(src)/%.S

	@cp $< $@



clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \

		$(obj)/empty.c



quiet_cmd_bootcc = BOOTCC  $@

      cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -75,146 +82,97 @@ quiet_cmd_bootcc = BOOTCC $@ 
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)

quiet_cmd_bootar = BOOTAR  $@

      cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $^; mv $@.$$$$ $@



$(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)))

$(obj)/wrapper.a: $(obj-wlib)

	$(call cmd,bootar)



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

extra-y		:= $(obj)/crt0.o $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \

		   $(obj)/zImage.lds $(obj)/zImage.coff.lds



quiet_cmd_ramdisk = RAMDISK $@

      cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@

wrapper		:=$(srctree)/$(src)/wrapper

wrapperbits	:= $(extra-y) $(addprefix $(obj)/,addnote hack-coff)



quiet_cmd_stripvm = STRIP   $@

      cmd_stripvm = $(STRIP) -s -R .comment $< -o $@

#############

# Bits for building various flavours of zImage



vmlinux.strip: vmlinux

	$(call if_changed,stripvm)

$(obj)/vmlinux.initrd: vmlinux.strip $(obj)/addRamDisk $(obj)/ramdisk.image.gz

	$(call if_changed,ramdisk)

ifneq ($(CROSS32_COMPILE),)

CROSSWRAP := -C $(CROSS32_COMPILE)

else

ifneq ($(CROSS_COMPILE),)

CROSSWRAP := -C $(CROSS_COMPILE)

endif

endif



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_wrap	= WRAP    $@

      cmd_wrap	=$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) vmlinux

quiet_cmd_wrap_initrd = WRAP    $@

      cmd_wrap_initrd =$(wrapper) -c -o $@ -p $2 $(CROSSWRAP) \

				-i $(obj)/ramdisk.image.gz vmlinux



quiet_cmd_addnote = ADDNOTE $@

      cmd_addnote = $(obj)/addnote $@

$(obj)/zImage.chrp: vmlinux $(wrapperbits)

	$(call cmd,wrap,chrp)



quiet_cmd_gen-miboot = GEN     $@

      cmd_gen-miboot = $(OBJCOPY) $(OBJCOPY_MIB_ARGS) \

		       --add-section=$1=$(word 2, $^) $< $@

$(obj)/zImage.initrd.chrp: vmlinux $(wrapperbits)

	$(call cmd,wrap_initrd,chrp)



quiet_cmd_gencoff = COFF    $@

      cmd_gencoff = $(OBJCOPY) $(OBJCOPY_COFF_ARGS) $@ && \

		    $(obj)/hack-coff $@

$(obj)/zImage.pseries:	vmlinux $(wrapperbits)

	$(call cmd,wrap,pseries)



$(call gz-sec, $(required)): $(obj)/kernel-%.gz: %

	$(call if_changed,gzip)

$(obj)/zImage.initrd.pseries: vmlinux $(wrapperbits)

	$(call cmd,wrap_initrd,pseries)



$(obj)/kernel-initrd.gz: $(obj)/ramdisk.image.gz

	cp -f $(obj)/ramdisk.image.gz $@

$(obj)/zImage.pmac: vmlinux $(wrapperbits)

	$(call cmd,wrap,pmac)



$(call src-sec, $(required) $(initrd)): $(obj)/kernel-%.c: $(obj)/kernel-%.gz

	@touch $@

$(obj)/zImage.initrd.pmac: vmlinux $(wrapperbits)

	$(call cmd,wrap_initrd,pmac)



$(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c

	$(call if_changed_dep,bootcc)

	$(call cmd,addsection)

$(obj)/zImage.coff: vmlinux $(wrapperbits)

	$(call cmd,wrap,pmaccoff)



$(obj)/zImage.initrd.coff: vmlinux $(wrapperbits)

	$(call cmd,wrap_initrd,pmaccoff)



$(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.miboot: vmlinux $(wrapperbits)

	$(call cmd,wrap,miboot)



$(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)

$(obj)/zImage.initrd.miboot: vmlinux $(wrapperbits)

	$(call cmd,wrap_initrd,miboot)



$(obj)/uImage: vmlinux $(wrapperbits)

	$(call cmd,wrap,uboot)



image-$(CONFIG_PPC_PSERIES)	+= zImage.pseries

image-$(CONFIG_PPC_MAPLE)	+= zImage.pseries

image-$(CONFIG_PPC_CELL)	+= zImage.pseries

image-$(CONFIG_PPC_CHRP)	+= zImage.chrp

image-$(CONFIG_PPC_PMAC)	+= zImage.pmac

image-$(CONFIG_DEFAULT_UIMAGE)	+= uImage



# 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)
 
ifeq ($(CONFIG_PPC32),y)

image-$(CONFIG_PPC_PMAC)	+= zImage.coff zImage.miboot

endif



initrd-y := $(patsubst zImage%, zImage.initrd%, $(image-y))



$(obj)/zImage:		$(addprefix $(obj)/, $(image-y))

	@rm -f $@; ln $< $@

$(obj)/zImage.initrd:	$(addprefix $(obj)/, $(initrd-y))

	@rm -f $@; ln $< $@



install: $(CONFIGURE) $(image-y)

	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<



clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip.gz)

clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)

arch/powerpc/boot/wrapper

0 → 100755
+204 −0
Original line number Diff line number Diff line 
#!/bin/sh



# Copyright (C) 2006 Paul Mackerras, IBM Corporation <paulus@samba.org>

# This program may be used under the terms of version 2 of the GNU

# General Public License.



# This script takes a kernel binary and optionally an initrd image

# and/or a device-tree blob, and creates a bootable zImage for a

# given platform.



# Options:

# -o zImage	specify output file

# -p platform	specify platform (links in $platform.o)

# -i initrd	specify initrd file

# -d devtree	specify device-tree blob

# -s tree.dts	specify device-tree source file (needs dtc installed)

# -c		cache $kernel.strip.gz (use if present & newer, else make)

# -C prefix	specify command prefix for cross-building tools

#		(strip, objcopy, ld)

# -D dir	specify directory containing data files used by script

#		(default ./arch/powerpc/boot)

# -W dir	specify working directory for temporary files (default .)



# defaults

kernel=

ofile=zImage

platform=of

initrd=

dtb=

dts=

cacheit=



# cross-compilation prefix

CROSS=



# directory for object and other files used by this script

object=arch/powerpc/boot



# directory for working files

tmpdir=.



usage() {

    echo 'Usage: wrapper [-o output] [-p platform] [-i initrd]' >&2

    echo '       [-d devtree] [-s tree.dts] [-c] [-C cross-prefix]' >&2

    echo '       [-D datadir] [-W workingdir] [vmlinux]' >&2

    exit 1

}



while [ "$#" -gt 0 ]; do

    case "$1" in

    -o)

	shift

	[ "$#" -gt 0 ] || usage

	ofile="$1"

	;;

    -p)

	shift

	[ "$#" -gt 0 ] || usage

	platform="$1"

	;;

    -i)

	shift

	[ "$#" -gt 0 ] || usage

	initrd="$1"

	;;

    -d)

	shift

	[ "$#" -gt 0 ] || usage

	dtb="$1"

	;;

    -s)

	shift

	[ "$#" -gt 0 ] || usage

	dts="$1"

	;;

    -c)

	cacheit=y

	;;

    -C)

	shift

	[ "$#" -gt 0 ] || usage

	CROSS="$1"

	;;

    -D)

	shift

	[ "$#" -gt 0 ] || usage

	object="$1"

	;;

    -W)

	shift

	[ "$#" -gt 0 ] || usage

	tmpdir="$1"

	;;

    -?)

	usage

	;;

    *)

	[ -z "$kernel" ] || usage

	kernel="$1"

	;;

    esac

    shift

done



if [ -n "$dts" ]; then

    if [ -z "$dtb" ]; then

	dtb="$platform.dtb"

    fi

    dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts" || exit 1

fi



if [ -z "$kernel" ]; then

    kernel=vmlinux

fi



platformo=$object/"$platform".o

lds=$object/zImage.lds

ext=strip

objflags=-S

tmp=$tmpdir/zImage.$$.o

ksection=.kernel:vmlinux.strip

isection=.kernel:initrd



case "$platform" in

pmac|pseries|chrp)

    platformo=$object/of.o

    ;;

pmaccoff)

    platformo=$object/of.o

    lds=$object/zImage.coff.lds

    ;;

miboot|uboot)

    # miboot and U-boot want just the bare bits, not an ELF binary

    ext=bin

    objflags="-O binary"

    tmp="$ofile"

    ksection=image

    isection=initrd

    ;;

esac



vmz="$tmpdir/`basename \"$kernel\"`.$ext"

if [ -z "$cacheit" -o ! -f "$vmz.gz" -o "$vmz.gz" -ot "$kernel" ]; then

    ${CROSS}objcopy $objflags "$kernel" "$vmz.$$"

    gzip -f -9 "$vmz.$$"

    if [ -n "$cacheit" ]; then

	mv -f "$vmz.$$.gz" "$vmz.gz"

    else

	vmz="$vmz.$$"

    fi

fi



case "$platform" in

uboot)

    rm -f "$ofile"

    version=`${CROSS}strings "$kernel" | grep '^Linux version [-0-9.]' | \

	cut -d' ' -f3`

    if [ -n "$version" ]; then

	version="-n Linux-$version"

    fi

    mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 \

	$version -d "$vmz.gz" "$ofile"

    if [ -z "$cacheit" ]; then

	rm -f $vmz.gz

    fi

    exit 0

    ;;

esac



addsec() {

    ${CROSS}objcopy $4 $1 \

	--add-section=$3="$2" \

	--set-section-flags=$3=contents,alloc,load,readonly,data

}



addsec $tmp "$vmz.gz" $ksection $object/empty.o

if [ -z "$cacheit" ]; then

    rm -f "$vmz.gz"

fi



if [ -n "$initrd" ]; then

    addsec $tmp "$initrd" initrd

fi



if [ -n "$dtb" ]; then

    addsec $tmp "$dtb" dtb

fi



if [ "$platform" != "miboot" ]; then

    ${CROSS}ld -m elf32ppc -T $lds -o "$ofile" \

	$object/crt0.o $platformo $tmp $object/wrapper.a

    rm $tmp

fi



# post-processing needed for some platforms

case "$platform" in

pseries|chrp)

    $object/addnote "$ofile"

    ;;

pmaccoff)

    ${CROSS}objcopy -O aixcoff-rs6000 --set-start 0x500000 "$ofile"

    $object/hack-coff "$ofile"

    ;;

esac

CRA Git | Maintained and supported by SUSTech CRA and CCSE