sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: uncompress.c: copy executable to SDRAM if necessary 

We used to relocate the executable to the current address. This does
not work when the executable runs from a readonly location like for
example NOR Flash. Test if we run from inside the available memory and
if we do, relocate to the current address as before. Otherwise copy
the executable to the start of memory and relocate to that address.
While at it add some comments to the code.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-06-12 08:11:21 +02:00
parent 3ce85ca4eb
commit 352ddc86ae
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/setupc.S
View File

@ -37,7 +37,6 @@ ENTRY(setup_c)
mov pc, lr
ENDPROC(setup_c)
#ifdef CONFIG_RELOCATABLE
/*
* void relocate_to_adr(unsigned long targetadr)
*
@ -93,4 +92,3 @@ ENTRY(relocate_to_adr)
mov pc, lr
ENDPROC(relocate_to_adr)
#endif

27
arch/arm/cpu/uncompress.c
View File

@ -47,15 +47,27 @@ static void __noreturn noinline uncompress_start_payload(unsigned long membase,
void __noreturn (*barebox)(unsigned long, unsigned long, void *);
uint32_t endmem = membase + memsize;
unsigned long barebox_base;
uint32_t *ptr;
uint32_t *image_end;
void *pg_start;
unsigned long pc = get_pc();
arm_early_mmu_cache_invalidate();
endmem -= STACK_SIZE; /* stack */
if (IS_ENABLED(CONFIG_PBL_RELOCATABLE))
relocate_to_current_adr();
image_end = (void *)ld_var(__image_end) - get_runtime_offset();
if (IS_ENABLED(CONFIG_PBL_RELOCATABLE)) {
/*
* If we run from inside the memory just relocate the binary
* to the current address. Otherwise it may be a readonly location.
* Copy and relocate to the start of the memory in this case.
*/
if (pc > membase && pc < membase + memsize)
relocate_to_current_adr();
else
relocate_to_adr(membase);
}
if (IS_ENABLED(CONFIG_RELOCATABLE))
barebox_base = arm_barebox_image_place(membase + memsize);
@ -74,9 +86,12 @@ static void __noreturn noinline uncompress_start_payload(unsigned long membase,
free_mem_ptr = endmem;
free_mem_end_ptr = free_mem_ptr + SZ_128K;
ptr = (void *)__image_end;
pg_start = ptr + 1;
pg_len = *(ptr);
/*
* image_end is the first location after the executable. It contains
* the size of the appended compressed binary followed by the binary.
*/
pg_start = image_end + 1;
pg_len = *(image_end);
pbl_barebox_uncompress((void*)barebox_base, pg_start, pg_len);