Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22750d98 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/boot: Use CONFIG_KERNEL_GZIP 



Most architectures allow the compression algorithm used to produced the
vmlinuz image to be selected as a kernel config option. In preperation
for supporting algorithms other than gzip in the powerpc boot wrapper
the makefile needs to be modified to use these config options.

Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 1a13de6d

arch/powerpc/Kconfig

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

	select HAVE_VIRT_CPU_ACCOUNTING

	select HAVE_ARCH_HARDENED_USERCOPY

	select HAVE_KERNEL_GZIP



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN

arch/powerpc/boot/Makefile

+18 −12
Original line number Diff line number Diff line
@@ -19,10 +19,14 @@ 


all: $(obj)/zImage



compress-$(CONFIG_KERNEL_GZIP) := CONFIG_KERNEL_GZIP



BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		 -fno-strict-aliasing -Os -msoft-float -pipe \

		 -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \

		 -isystem $(shell $(CROSS32CC) -print-file-name=include)

		 -isystem $(shell $(CROSS32CC) -print-file-name=include) \

		 -D$(compress-y)



ifdef CONFIG_PPC64_BOOT_WRAPPER

BOOTCFLAGS	+= -m64

endif
@@ -59,13 +63,15 @@ $(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405 
$(obj)/treeboot-akebono.o: BOOTCFLAGS += -mcpu=405

$(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405



# the kernel's version of zlib pulls in a lot of other kernel headers

# which we don't provide inside the wrapper.

zlib-$(CONFIG_KERNEL_GZIP) := inffast.c inflate.c inftrees.c

zlibheader-$(CONFIG_KERNEL_GZIP) := inffast.h inffixed.h inflate.h inftrees.h infutil.h

zliblinuxheader-$(CONFIG_KERNEL_GZIP) := zlib.h zconf.h zutil.h



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) cuboot-c2k.o gunzip_util.o main.o): \

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

$(addprefix $(obj)/,$(zlib-y) cuboot-c2k.o gunzip_util.o main.o): \

	$(addprefix $(obj)/,$(zliblinuxheader-y)) \

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



libfdt       := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c

libfdtheader := fdt.h libfdt.h libfdt_internal.h
@@ -76,7 +82,7 @@ $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o): \ 
src-wlib-y := string.S crt0.S crtsavres.S stdio.c main.c \

		$(libfdt) libfdt-wrapper.c \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		gunzip_util.c elf_util.c $(zlib) devtree.c stdlib.c \

		gunzip_util.c elf_util.c $(zlib-y) devtree.c stdlib.c \

		oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \

		uartlite.c mpc52xx-psc.c opal.c opal-calls.S

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c
@@ -128,13 +134,13 @@ obj-plat: $(libfdt) 
quiet_cmd_copy_kern_src = COPY    $@

      cmd_copy_kern_src = sed -f $(srctree)/arch/powerpc/boot/fixup-headers.sed $< > $@



$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%

$(addprefix $(obj)/,$(zlib-y)): $(obj)/%: $(srctree)/lib/zlib_inflate/%

	$(call cmd,copy_kern_src)



$(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/%

$(addprefix $(obj)/,$(zlibheader-y)): $(obj)/%: $(srctree)/lib/zlib_inflate/%

	$(call cmd,copy_kern_src)



$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%

$(addprefix $(obj)/,$(zliblinuxheader-y)): $(obj)/%: $(srctree)/include/linux/%

	$(call cmd,copy_kern_src)



quiet_cmd_copy_libfdt = COPY    $@
@@ -153,7 +159,7 @@ $(obj)/zImage.lds: $(obj)/%: $(srctree)/$(src)/%.S 
$(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)/%.S

	$(Q)cp $< $@



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

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

		$(libfdt) $(libfdtheader) \

		empty.c zImage.coff.lds zImage.ps3.lds zImage.lds