diff options
| author | Florian Fainelli <florian@openwrt.org> | 2008-03-27 15:51:02 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2008-03-27 15:51:02 +0000 |
| commit | 70b661d66b83066c60ea4718b6d520008cc9d476 (patch) | |
| tree | 3bf57b5a4c6afe9de77516c2d0012aa045bdc1b6 | |
| parent | b43169c8a5b277318084a4147851a1a0fefcb750 (diff) | |
| download | master-187ad058-70b661d66b83066c60ea4718b6d520008cc9d476.tar.gz master-187ad058-70b661d66b83066c60ea4718b6d520008cc9d476.tar.bz2 master-187ad058-70b661d66b83066c60ea4718b6d520008cc9d476.zip | |
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/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/generic-2.6/image/lzma-loader/src/decompress.c | 3 |
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 d5f712a1db..910172c4f8 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 e31f4183db..45ac509cdc 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"); } |