Skip to content

Commit

Permalink
ARM: remove bit-rotten STANDALONE_DEBUG for decompressor
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Uwe Kleine-König committed Jul 7, 2010
1 parent be6f9f0 commit 7179304
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 43 deletions.
23 changes: 0 additions & 23 deletions arch/arm/boot/compressed/Makefile.debug

This file was deleted.

20 changes: 0 additions & 20 deletions arch/arm/boot/compressed/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ unsigned int __machine_arch_type;

#include <asm/unaligned.h>

#ifdef STANDALONE_DEBUG
#define putstr printf
#else

static void putstr(const char *ptr);
extern void error(char *x);
Expand Down Expand Up @@ -116,7 +113,6 @@ static void putstr(const char *ptr)
flush();
}

#endif

void *memcpy(void *__dest, __const void *__src, size_t __n)
{
Expand Down Expand Up @@ -186,7 +182,6 @@ asmlinkage void __div0(void)

extern void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));

#ifndef STANDALONE_DEBUG

unsigned long
decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
Expand All @@ -211,18 +206,3 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
putstr(" done, booting the kernel.\n");
return output_ptr;
}
#else

char output_buffer[1500*1024];

int main()
{
output_data = output_buffer;

putstr("Uncompressing Linux...");
decompress(input_data, input_data_end - input_data,
NULL, NULL, output_data, NULL, error);
putstr("done.\n");
return 0;
}
#endif

0 comments on commit 7179304

Please sign in to comment.