tx25: copy SPL directly, not using relocate_code.
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 19 May 2013 01:48:13 +0000 (01:48 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 30 May 2013 18:23:36 +0000 (20:23 +0200)
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>
board/karo/tx25/tx25.c

index 2952eba8c82d48d34758b2a7d7975344be325d38..461e21f3fd12d2c9ecb669d8ba04a8f08c646adc 100644 (file)
@@ -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