aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/lib
diff options
context:
space:
mode:
authorVladimir Zapolskiy2016-11-28 00:15:32 +0200
committerTom Rini2016-12-02 21:32:52 -0500
commitbccf09e0e16f812dd61c4972a1125b58a221a87d (patch)
tree91ed8d86c533656412ab3f8a3be0734f35076281 /arch/sh/lib
parentcdbb0cf8ecf30d5dbbfa500e8939a32ef45896c5 (diff)
sh: add shared relocate_code() function and call board_init_r()
Commits b61e90e6fd83 ("sh: Drop the arch-specific board init") and f41e6088eb1a ("sh: Fix build errors for generic board") left code and data relocation done in start.S, however further actual U-boot configuration is not started anymore. Practically SH boards with the code relocated into the expected position by start.S still can be booted, so the change adds this option and provides an option how to relocate code for board_init_r() execution. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sh/lib')
-rw-r--r--arch/sh/lib/board.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 7cb594e31a3..aa967c04e7a 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -15,3 +15,21 @@ int dram_init(void)
return 0;
}
+
+void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaddr)
+{
+ void (*reloc_board_init_r)(gd_t *gd, ulong dest) = board_init_r;
+
+ if (new_gd->reloc_off) {
+ memcpy((void *)new_gd->relocaddr,
+ (void *)(new_gd->relocaddr - new_gd->reloc_off),
+ new_gd->mon_len);
+
+ reloc_board_init_r += new_gd->reloc_off;
+ }
+
+ __asm__ __volatile__("mov.l %0, r15\n" : : "m" (new_gd->start_addr_sp));
+
+ while (1)
+ reloc_board_init_r(new_gd, 0x0);
+}