d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to be a little smart at guessing where _start is located in flash, instead

Browse Source 
of relying on a binutils bug.

Reported by:	dim
This commit is contained in:
cognet 2010-11-01 21:04:23 +00:00
parent a4ab528826
commit 71407681fd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arm/arm/elf_trampoline.c
View File

@ -159,7 +159,7 @@ _startC(void)
#if defined(FLASHADDR) && defined(LOADERRAMADDR) #if defined(FLASHADDR) && defined(LOADERRAMADDR)
unsigned int pc; unsigned int pc;
__asm __volatile("adr %0, _start\n" __asm __volatile("mov %0, pc\n"
: "=r" (pc)); : "=r" (pc));
if ((FLASHADDR > LOADERRAMADDR && pc >= FLASHADDR) || if ((FLASHADDR > LOADERRAMADDR && pc >= FLASHADDR) ||
(FLASHADDR < LOADERRAMADDR && pc < LOADERRAMADDR)) { (FLASHADDR < LOADERRAMADDR && pc < LOADERRAMADDR)) {
@ -173,11 +173,13 @@ _startC(void)
*/ */
unsigned int target_addr; unsigned int target_addr;
unsigned int tmp_sp; unsigned int tmp_sp;
uint32_t src_addr = (uint32_t)&_start - PHYSADDR + FLASHADDR
+ (pc - FLASHADDR - ((uint32_t)&_startC - PHYSADDR)) & 0xfffff000;
target_addr = (unsigned int)&_start - PHYSADDR + LOADERRAMADDR; target_addr = (unsigned int)&_start - PHYSADDR + LOADERRAMADDR;
tmp_sp = target_addr + 0x100000 + tmp_sp = target_addr + 0x100000 +
(unsigned int)&_end - (unsigned int)&_start; (unsigned int)&_end - (unsigned int)&_start;
memcpy((char *)target_addr, (char *)pc, memcpy((char *)target_addr, (char *)src_addr,
(unsigned int)&_end - (unsigned int)&_start); (unsigned int)&_end - (unsigned int)&_start);
/* Temporary set the sp and jump to the new location. */ /* Temporary set the sp and jump to the new location. */
__asm __volatile( __asm __volatile(