mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
sh: add shared relocate_code() function and call board_init_r()
Commitsb61e90e6fd
("sh: Drop the arch-specific board init") andf41e6088eb
("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>
This commit is contained in:
parent
cdbb0cf8ec
commit
bccf09e0e1
4 changed files with 18 additions and 18 deletions
|
@ -83,9 +83,3 @@ int dcache_status(void)
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
|
||||
{
|
||||
/* TODO(sh maintainer): Implement this */
|
||||
while (1);
|
||||
}
|
||||
|
|
|
@ -66,9 +66,3 @@ int dcache_status(void)
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
|
||||
{
|
||||
/* TODO(sh maintainer): Implement this */
|
||||
while (1);
|
||||
}
|
||||
|
|
|
@ -41,9 +41,3 @@ int cpu_eth_init(bd_t *bis)
|
|||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaaddr)
|
||||
{
|
||||
/* TODO(sh maintainer): Implement this */
|
||||
while (1);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue