diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-19 01:48:13 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-30 20:23:36 +0200 |
| commit | 91607ac17e534927f3086df6d663b02e900c596a (patch) | |
| tree | 729d0bd2393059fe3c4579d9cb3170e418e74b22 | |
| parent | 3acb324ff1597d7e2ac6597d18cdb96d49ec8d93 (diff) | |
| download | talos-obmc-uboot-91607ac17e534927f3086df6d663b02e900c596a.tar.gz talos-obmc-uboot-91607ac17e534927f3086df6d663b02e900c596a.zip | |
tx25: copy SPL directly, not using relocate_code.
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Tested-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | board/karo/tx25/tx25.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c index 2952eba8c8..461e21f3fd 100644 --- a/board/karo/tx25/tx25.c +++ b/board/karo/tx25/tx25.c @@ -35,7 +35,21 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_SPL_BUILD void board_init_f(ulong bootflag) { - relocate_code(CONFIG_SPL_TEXT_BASE); + /* + * copy ourselves from where we are running to where we were + * linked at. Use ulong pointers as all addresses involved + * are 4-byte-aligned. + */ + ulong *start_ptr, *end_ptr, *link_ptr, *run_ptr, *dst; + asm volatile ("ldr %0, =_start" : "=r"(start_ptr)); + asm volatile ("ldr %0, =_end" : "=r"(end_ptr)); + asm volatile ("ldr %0, =board_init_f" : "=r"(link_ptr)); + asm volatile ("adr %0, board_init_f" : "=r"(run_ptr)); + for (dst = start_ptr; dst < end_ptr; dst++) + *dst = *(dst+(run_ptr-link_ptr)); + /* + * branch to nand_boot's link-time address. + */ asm volatile("ldr pc, =nand_boot"); } #endif |
