Commit 264bffad authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/boot: Add lzo support for uImage 



This patch allows to generate lzo compressed uImage

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 1cc9a21b

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ config PPC 
	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA			if DEFAULT_UIMAGE

	select HAVE_KERNEL_LZO			if DEFAULT_UIMAGE

	select HAVE_KERNEL_XZ			if PPC_BOOK3S || 44x

	select HAVE_KPROBES

	select HAVE_KPROBES_ON_FTRACE

arch/powerpc/boot/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ all: $(obj)/zImage 
compress-$(CONFIG_KERNEL_GZIP) := CONFIG_KERNEL_GZIP

compress-$(CONFIG_KERNEL_XZ)   := CONFIG_KERNEL_XZ

compress-$(CONFIG_KERNEL_LZMA) := CONFIG_KERNEL_LZMA

compress-$(CONFIG_KERNEL_LZO)   := CONFIG_KERNEL_LZO



ifdef CROSS32_COMPILE

    BOOTCC := $(CROSS32_COMPILE)gcc
@@ -259,6 +260,7 @@ endif 
compressor-$(CONFIG_KERNEL_GZIP) := gz

compressor-$(CONFIG_KERNEL_XZ)   := xz

compressor-$(CONFIG_KERNEL_LZMA)   := lzma

compressor-$(CONFIG_KERNEL_LZO) := lzo



# args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd

quiet_cmd_wrap	= WRAP    $@

arch/powerpc/boot/wrapper

+4 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ while [ "$#" -gt 0 ]; do 
    -Z)

	shift

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

        [ "$1" != "gz" -o "$1" != "xz" -o "$1" != "lzma" -o "$1" != "none" ] || usage

        [ "$1" != "gz" -o "$1" != "xz" -o "$1" != "lzma" -o "$1" != "lzo" -o "$1" != "none" ] || usage



	compression=".$1"

	uboot_comp=$1
@@ -377,6 +377,9 @@ if [ -z "$cacheit" -o ! -f "$vmz$compression" -o "$vmz$compression" -ot "$kernel 
    .lzma)

        xz --format=lzma -f -6 "$vmz.$$"

	;;

    .lzo)

        lzop -f -9 "$vmz.$$"

	;;

    *)

        # drop the compression suffix so the stripped vmlinux is used

        compression=