Revert [10668] was accidental
SVN-Revision: 10669
This commit is contained in:
parent
e9c19c7de9
commit
52c65355ea
2 changed files with 2 additions and 5 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue