summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-03-27 15:51:02 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-03-27 15:51:02 +0000
commit9a4eb9867e40c7ba350964e5feced1b4f7186f63 (patch)
tree3bf57b5a4c6afe9de77516c2d0012aa045bdc1b6
parent14e96a8a42a27f36a7e53bc87acdb134b1fbdbd8 (diff)
Revert [10668] was accidental
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10669 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/image/lzma-loader/src/Makefile4
-rw-r--r--target/linux/generic-2.6/image/lzma-loader/src/decompress.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/Makefile b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
index d5f712a1d..910172c4f 100644
--- a/target/linux/generic-2.6/image/lzma-loader/src/Makefile
+++ b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
@@ -49,7 +49,7 @@ lzma.bin: lzma.elf
ifeq ($(IMAGE_COPY),1)
LOADER_ENTRY ?= $(KERNEL_ENTRY)
-lzma.o: decompress.o LzmaDecode.o kernel.o print.o printf.o uart16550.o
+lzma.o: decompress.o LzmaDecode.o kernel.o
sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,entry,g' lzma.lds.in >lzma-stage2.lds
$(LD) -static --no-warn-mismatch -e entry -Tlzma-stage2.lds -o temp-$@ $^
$(OBJCOPY) temp-$@ lzma.tmp
@@ -60,7 +60,7 @@ lzma.elf: start.o lzma.o
sed -e 's,@LOADADDR@,$(LOADER_ENTRY),g' lzma-copy.lds.in >lzma-copy.lds
$(LD) -s -Tlzma-copy.lds -o $@ $^
else
-lzma.elf: start.o decompress.o LzmaDecode.o kernel.o print.o printf.o uart16550.o
+lzma.elf: start.o decompress.o LzmaDecode.o kernel.o
$(LD) -s -Tlzma.lds -o $@ $^
endif
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/decompress.c b/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
index e31f4183d..45ac509cd 100644
--- a/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
+++ b/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
@@ -145,7 +145,6 @@ void entry(unsigned long icache_size, unsigned long icache_lsize,
get_byte();
/* decompress kernel */
- printf("Decompressing kernel\n");
if ((i = LzmaDecode(&vs, &callback,
(unsigned char*)KERNEL_ENTRY, osize, &osize)) == LZMA_RESULT_OK)
{
@@ -153,8 +152,6 @@ void entry(unsigned long icache_size, unsigned long icache_lsize,
blast_icache(icache_size, icache_lsize);
/* Jump to load address */
- printf("Jumping !\n");
((void (*)(int a0, int a1, int a2, int a3)) KERNEL_ENTRY)(arg0, arg1, arg2, arg3);
}
- printf("Failed to decompress !\n");
}