diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/cpu-85xx/start.S | 36 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc85xx/barebox.lds.S | 7 |
2 files changed, 19 insertions, 24 deletions
diff --git a/arch/ppc/cpu-85xx/start.S b/arch/ppc/cpu-85xx/start.S index 5bcba5fcc9..638b6b8fe7 100644 --- a/arch/ppc/cpu-85xx/start.S +++ b/arch/ppc/cpu-85xx/start.S @@ -52,8 +52,8 @@ GOT_ENTRY(_end_of_vectors) GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) GOT_ENTRY(__bss_start) + GOT_ENTRY(__bss_stop) END_GOT /* @@ -775,27 +775,19 @@ e500_write_tlb: relocate_code: mr r9, r3 /* Save end of RAM */ - lis r10, (_end - _start)@h /* Size */ - ori r10, r10, (_end - _start)@l - sub r3, r3, r10 - - /* 64KB aligned */ - lis r10, 0xffff0000@h - ori r10, r10, 0xffff0000@l - and r3, r3, r10 - - mr r1, r3 /* Set new stack just below barebox code */ - mr r10, r3 /* Save copy of Destination Address */ - - bl calc_source -calc_source: - mfspr r4, LR /* r4 = address in memory (flash, RAM) */ - subi r4, r4, (calc_source - _start) - GET_GOT - lis r5, __init_size@h - ori r5, r5, __init_size@l - + lis r4,TEXT_BASE@h + ori r4,r4,TEXT_BASE@l + lwz r5,GOT(__bss_stop) /* size */ + sub r5,r5,r4 + sub r3, r3, r5 + lwz r5,GOT(__init_end) /* Copy to init_end only */ + sub r5,r5,r4 + lis r10, 0xffff0000@h /* Round down to 64KB */ + ori r10, r10, 0xffff0000@l + and r3, r3, r10 /* Destination */ + mr r1, r3 + mr r10, r3 li r6,CACHELINE_SIZE /* @@ -921,7 +913,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_stop) cmplw 0,r3,r4 beq 6f diff --git a/arch/ppc/mach-mpc85xx/barebox.lds.S b/arch/ppc/mach-mpc85xx/barebox.lds.S index 4d156e8935..980359e3a1 100644 --- a/arch/ppc/mach-mpc85xx/barebox.lds.S +++ b/arch/ppc/mach-mpc85xx/barebox.lds.S @@ -20,7 +20,6 @@ #else #define RESET_VECTOR_ADDRESS 0xfffffffc #endif -#define BSS_START_ADDRESS 0x2000 OUTPUT_ARCH("powerpc") @@ -143,7 +142,11 @@ SECTIONS . = RESET_VECTOR_ADDRESS + 0x4; - . = BSS_START_ADDRESS; +#if (RESET_VECTOR_ADDRESS == 0xfffffffc) + /* This avoids wrapping around to offset 0 */ + . |= 0x10; +#endif + __bss_start = .; .bss : { |