Commit 07e88e1b authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: bzip2/lzma zImage support. 



This plugs in bzip2 and lzma support for zImages.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent df8ce259

arch/sh/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ config SUPERH 
	select HAVE_DMA_API_DEBUG

	select HAVE_PERF_COUNTERS

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select RTC_LIB

	select GENERIC_ATOMIC64

	help

arch/sh/boot/compressed/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
vmlinux.bin.*

arch/sh/boot/compressed/Makefile

+16 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \

		   vmlinux.bin.bz2 vmlinux.bin.lzma \

		   head_$(BITS).o misc_$(BITS).o piggy.o



OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc_$(BITS).o $(obj)/cache.o
@@ -38,10 +39,22 @@ $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE 
$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

vmlinux.bin.all-y := $(obj)/vmlinux.bin



$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,gzip)

$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,bzip2)

$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,lzma)



suffix-$(CONFIG_KERNEL_GZIP)	:= gz

suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2

suffix-$(CONFIG_KERNEL_LZMA)	:= lzma



OBJCOPYFLAGS += -R .empty_zero_page



$(obj)/piggy.o: $(obj)/piggy.S $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,as_o_S)
 
LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T



$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE

	$(call if_changed,ld)

arch/sh/boot/compressed/misc_32.c

+13 −1
Original line number Diff line number Diff line
@@ -41,12 +41,24 @@ extern int _end; 
static unsigned long free_mem_ptr;

static unsigned long free_mem_end_ptr;



#ifdef CONFIG_HAVE_KERNEL_BZIP2

#define HEAP_SIZE	0x400000

#else

#define HEAP_SIZE	0x10000

#endif



#ifdef CONFIG_KERNEL_GZIP

#include "../../../../lib/decompress_inflate.c"

#endif



#ifdef CONFIG_KERNEL_BZIP2

#include "../../../../lib/decompress_bunzip2.c"

#endif



#ifdef CONFIG_KERNEL_LZMA

#include "../../../../lib/decompress_unlzma.c"

#endif



#ifdef CONFIG_SH_STANDARD_BIOS

size_t strlen(const char *s)

{

arch/sh/boot/compressed/misc_64.c

+13 −1
Original line number Diff line number Diff line
@@ -40,12 +40,24 @@ extern int _end; 
static unsigned long free_mem_ptr;

static unsigned long free_mem_end_ptr;



#ifdef CONFIG_HAVE_KERNEL_BZIP2

#define HEAP_SIZE	0x400000

#else

#define HEAP_SIZE	0x10000

#endif



#ifdef CONFIG_KERNEL_GZIP

#include "../../../../lib/decompress_inflate.c"

#endif



#ifdef CONFIG_KERNEL_BZIP2

#include "../../../../lib/decompress_bunzip2.c"

#endif



#ifdef CONFIG_KERNEL_LZMA

#include "../../../../lib/decompress_unlzma.c"

#endif



void puts(const char *s)

{

}