colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initcall: Support manual relocation

Browse Source 
Move the manual-relocation code to the initcall file. Make sure to avoid
manually relocating event types. Only true function pointers should be
relocated.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-08-21 21:16:55 -06:00
committed by Tom Rini
parent c9eff0a6b6
commit dd802467f4
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/board_r.c
View File

@@ -813,10 +813,8 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
#endif
gd->flags &= ~GD_FLG_LOG_READY;
if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) {
for (int i = 0; i < ARRAY_SIZE(init_sequence_r); i++)
MANUAL_RELOC(init_sequence_r[i]);
}
if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
initcall_manual_reloc(init_sequence_r);
if (initcall_run_list(init_sequence_r))
hang();

7
include/initcall.h
View File

@@ -35,4 +35,11 @@ typedef int (*init_fnc_t)(void);
*/
int initcall_run_list(const init_fnc_t init_sequence[]);
/**
* initcall_manual_reloc() - Do manual relocation on an initcall sequence
*
* @init_sequence: NULL-terminated init sequence to relocate
*/
void initcall_manual_reloc(init_fnc_t init_sequence[]);
#endif

10
lib/initcall.c
View File

@@ -97,3 +97,13 @@ int initcall_run_list(const init_fnc_t init_sequence[])
return 0;
}
void initcall_manual_reloc(init_fnc_t init_sequence[])
{
init_fnc_t *ptr;
for (ptr = init_sequence; *ptr; ptr++) {
if (!initcall_is_event(*ptr))
MANUAL_RELOC(*ptr);
}
}