diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-04 04:23:58 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-07-07 10:38:16 -0400 |
commit | 7179304bfcffbbc66ca8a8498d92e023833b017d (patch) | |
tree | d300a2fe4b39af72db24fced8d4cab5d5d0abb9a | |
parent | be6f9f006a1fb4d46a0c0b01179862375f0d53bd (diff) |
ARM: remove bit-rotten STANDALONE_DEBUG for decompressor
I tried to get this running to debug the regression introduced by
e7db7b4 without success. But this has several problems that make it
hard to fix:
- lib/decompress_inflate.c includes in-kernel headers that make
it difficult to compile for user space.
- the binary formats changed both in kernel and user space and
at least for the kernel side there isn't only a single
variant.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
-rw-r--r-- | arch/arm/boot/compressed/Makefile.debug | 23 | ||||
-rw-r--r-- | arch/arm/boot/compressed/misc.c | 20 |
2 files changed, 0 insertions, 43 deletions
diff --git a/arch/arm/boot/compressed/Makefile.debug b/arch/arm/boot/compressed/Makefile.debug deleted file mode 100644 index 491a037b2973..000000000000 --- a/arch/arm/boot/compressed/Makefile.debug +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | # | ||
2 | # linux/arch/arm/boot/compressed/Makefile | ||
3 | # | ||
4 | # create a compressed vmlinux image from the original vmlinux | ||
5 | # | ||
6 | |||
7 | COMPRESSED_EXTRA=../../lib/ll_char_wr.o | ||
8 | OBJECTS=misc-debug.o ll_char_wr.aout.o | ||
9 | |||
10 | CFLAGS=-D__KERNEL__ -O2 -DSTDC_HEADERS -DSTANDALONE_DEBUG -Wall -I../../../../include -c | ||
11 | |||
12 | test-gzip: piggy.aout.o $(OBJECTS) | ||
13 | $(CC) -o $@ $(OBJECTS) piggy.aout.o | ||
14 | |||
15 | misc-debug.o: misc.c | ||
16 | $(CC) $(CFLAGS) -o $@ misc.c | ||
17 | |||
18 | piggy.aout.o: piggy.o | ||
19 | arm-linuxelf-objcopy --change-leading-char -I elf32-arm -O arm-aout32-linux piggy.o piggy.aout.o | ||
20 | |||
21 | ll_char_wr.aout.o: $(COMPRESSED_EXTRA) | ||
22 | arm-linuxelf-objcopy --change-leading-char -I elf32-arm -O arm-aout32-linux $(COMPRESSED_EXTRA) ll_char_wr.aout.o | ||
23 | |||
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index d2b2ef41cd4f..e653a6d3c8d9 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
@@ -28,9 +28,6 @@ unsigned int __machine_arch_type; | |||
28 | 28 | ||
29 | #include <asm/unaligned.h> | 29 | #include <asm/unaligned.h> |
30 | 30 | ||
31 | #ifdef STANDALONE_DEBUG | ||
32 | #define putstr printf | ||
33 | #else | ||
34 | 31 | ||
35 | static void putstr(const char *ptr); | 32 | static void putstr(const char *ptr); |
36 | extern void error(char *x); | 33 | extern void error(char *x); |
@@ -116,7 +113,6 @@ static void putstr(const char *ptr) | |||
116 | flush(); | 113 | flush(); |
117 | } | 114 | } |
118 | 115 | ||
119 | #endif | ||
120 | 116 | ||
121 | void *memcpy(void *__dest, __const void *__src, size_t __n) | 117 | void *memcpy(void *__dest, __const void *__src, size_t __n) |
122 | { | 118 | { |
@@ -186,7 +182,6 @@ asmlinkage void __div0(void) | |||
186 | 182 | ||
187 | extern void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x)); | 183 | extern void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x)); |
188 | 184 | ||
189 | #ifndef STANDALONE_DEBUG | ||
190 | 185 | ||
191 | unsigned long | 186 | unsigned long |
192 | decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, | 187 | decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, |
@@ -211,18 +206,3 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, | |||
211 | putstr(" done, booting the kernel.\n"); | 206 | putstr(" done, booting the kernel.\n"); |
212 | return output_ptr; | 207 | return output_ptr; |
213 | } | 208 | } |
214 | #else | ||
215 | |||
216 | char output_buffer[1500*1024]; | ||
217 | |||
218 | int main() | ||
219 | { | ||
220 | output_data = output_buffer; | ||
221 | |||
222 | putstr("Uncompressing Linux..."); | ||
223 | decompress(input_data, input_data_end - input_data, | ||
224 | NULL, NULL, output_data, NULL, error); | ||
225 | putstr("done.\n"); | ||
226 | return 0; | ||
227 | } | ||
228 | #endif | ||