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

Commit 7179304b authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: remove bit-rotten STANDALONE_DEBUG for decompressor 



I tried to get this running to debug the regression introduced by
e7db7b42 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent be6f9f00

arch/arm/boot/compressed/Makefile.debug

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
#

# linux/arch/arm/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



COMPRESSED_EXTRA=../../lib/ll_char_wr.o

OBJECTS=misc-debug.o ll_char_wr.aout.o



CFLAGS=-D__KERNEL__ -O2 -DSTDC_HEADERS -DSTANDALONE_DEBUG -Wall -I../../../../include -c



test-gzip: piggy.aout.o $(OBJECTS)

	$(CC) -o $@ $(OBJECTS) piggy.aout.o



misc-debug.o: misc.c

	$(CC) $(CFLAGS) -o $@ misc.c



piggy.aout.o: piggy.o

	arm-linuxelf-objcopy --change-leading-char -I elf32-arm -O arm-aout32-linux piggy.o piggy.aout.o



ll_char_wr.aout.o: $(COMPRESSED_EXTRA)

	arm-linuxelf-objcopy --change-leading-char -I elf32-arm -O arm-aout32-linux $(COMPRESSED_EXTRA) ll_char_wr.aout.o

arch/arm/boot/compressed/misc.c

+0 −20
Original line number Diff line number Diff line
@@ -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);
@@ -116,7 +113,6 @@ static void putstr(const char *ptr) 
	flush();

}



#endif



void *memcpy(void *__dest, __const void *__src, size_t __n)

{
@@ -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,
@@ -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