summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorJérémy Dufour2012-07-20 15:33:03 +0200
committerJérémy Dufour2012-10-18 10:46:13 +0200
commite6e980b87ed17458c9fc78bfdcf0e093332be576 (patch)
treec7d20670ffd2620bfcbde0c39cf8098ff7c035a8 /cleopatre
parente17d13f535a2c17b38e8ac20da0a1d607c2a739b (diff)
cleo/linux/arm: use modular compression method at boot, refs #3204
This commit still uses the old gzip method we are using but in a more configurable fashion method.
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig1
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/.gitignore2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/Makefile15
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/piggy.gzip.S (renamed from cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/piggy.S)2
4 files changed, 12 insertions, 8 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig b/cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig
index ab0872d8a5..354acaf7e1 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/Kconfig
@@ -13,6 +13,7 @@ config ARM
select HAVE_OPROFILE
select HAVE_KPROBES if (!XIP_KERNEL)
select HAVE_KRETPROBES if (HAVE_KPROBES)
+ select HAVE_KERNEL_GZIP
help
The ARM series is a line of low-power-consumption RISC chip designs
licensed by ARM Ltd and targeted at embedded applications and
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/.gitignore b/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/.gitignore
index b15f927a59..2cb9e9ec5a 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/.gitignore
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/.gitignore
@@ -1,2 +1,2 @@
-piggy.gz
+piggy.gzip
font.c
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/Makefile b/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/Makefile
index 3fc8ac1133..c8fa302034 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/Makefile
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/Makefile
@@ -71,8 +71,11 @@ endif
SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
-targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
- head.o misc.o $(OBJS)
+suffix_$(CONFIG_KERNEL_GZIP) = gzip
+
+targets := vmlinux vmlinux.lds \
+ piggy.$(suffix_y) piggy.$(suffix_y).o \
+ font.o font.c head.o misc.o $(OBJS)
EXTRA_CFLAGS := -fpic -fno-builtin
EXTRA_AFLAGS :=
@@ -93,15 +96,15 @@ LDFLAGS_vmlinux += -p --no-undefined -X \
# would otherwise mess up our GOT table
CFLAGS_misc.o := -Dstatic=
-$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
+$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
$(addprefix $(obj)/, $(OBJS)) FORCE
$(call if_changed,ld)
@:
-$(obj)/piggy.gz: $(obj)/../Image FORCE
- $(call if_changed,gzip)
+$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE
+ $(call if_changed,$(suffix_y))
-$(obj)/piggy.o: $(obj)/piggy.gz FORCE
+$(obj)/piggy.$(suffix_y).o: $(obj)/piggy.$(suffix_y) FORCE
CFLAGS_font.o := -Dstatic=
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/piggy.S b/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/piggy.gzip.S
index 54c951800e..a68adf91a1 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/piggy.S
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/compressed/piggy.gzip.S
@@ -1,6 +1,6 @@
.section .piggydata,#alloc
.globl input_data
input_data:
- .incbin "arch/arm/boot/compressed/piggy.gz"
+ .incbin "arch/arm/boot/compressed/piggy.gzip"
.globl input_data_end
input_data_end: