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>
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 @@
#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();
diff --git a/include/initcall.h b/include/initcall.h
index 62d3bb6..208effd 100644
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -35,4 +35,11 @@
*/
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
diff --git a/lib/initcall.c b/lib/initcall.c
index 33b7d76..480490e 100644
--- a/lib/initcall.c
+++ b/lib/initcall.c
@@ -97,3 +97,13 @@
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);
+ }
+}