aboutsummaryrefslogtreecommitdiff
path: root/common/board_r.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-08-21 21:16:55 -0600
committerTom Rini <trini@konsulko.com>2023-08-31 13:16:54 -0400
commitdd802467f44b68d6ed9315ffe3002b17dc43b622 (patch)
tree4e44642f6b9e8a7113af38d59ecb8a40297cf361 /common/board_r.c
parentc9eff0a6b6ea2bcd54d30f8a02281681f3730223 (diff)
downloadu-boot-dd802467f44b68d6ed9315ffe3002b17dc43b622.zip
u-boot-dd802467f44b68d6ed9315ffe3002b17dc43b622.tar.gz
u-boot-dd802467f44b68d6ed9315ffe3002b17dc43b622.tar.bz2
initcall: Support manual relocation
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>
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 8586086..7c1fbc6 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -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();