Prepare v2023.10

[platform/kernel/u-boot.git] / include / initcall.h

diff --git a/include/initcall.h b/include/initcall.h
index 3ac01aa..69ce268 100644 (file)
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -8,12 +8,17 @@
 
 typedef int (*init_fnc_t)(void);
 
-#include <common.h>
-#include <initcall.h>
+#include <log.h>
+#ifdef CONFIG_EFI_APP
 #include <efi.h>
+#endif
+#include <asm/global_data.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
+/*
+ * To enable debugging. add #define DEBUG at the top of the including file.
+ *
+ * To find a symbol, use grep on u-boot.map
+ */
 static inline int initcall_run_list(const init_fnc_t init_sequence[])
 {
        const init_fnc_t *init_fnc_ptr;
@@ -22,16 +27,22 @@ static inline int initcall_run_list(const init_fnc_t init_sequence[])
                unsigned long reloc_ofs = 0;
                int ret;
 
-               if (gd->flags & GD_FLG_RELOC)
+               /*
+                * Sandbox is relocated by the OS, so symbols always appear at
+                * the relocated address.
+                */
+               if (IS_ENABLED(CONFIG_SANDBOX) || (gd->flags & GD_FLG_RELOC))
                        reloc_ofs = gd->reloc_off;
 #ifdef CONFIG_EFI_APP
                reloc_ofs = (unsigned long)image_base;
 #endif
-               debug("initcall: %p", (char *)*init_fnc_ptr - reloc_ofs);
-               if (gd->flags & GD_FLG_RELOC)
-                       debug(" (relocated to %p)\n", (char *)*init_fnc_ptr);
+               if (reloc_ofs)
+                       debug("initcall: %p (relocated to %p)\n",
+                                       (char *)*init_fnc_ptr - reloc_ofs,
+                                       (char *)*init_fnc_ptr);
                else
-                       debug("\n");
+                       debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs);
+
                ret = (*init_fnc_ptr)();
                if (ret) {
                        printf("initcall sequence %p failed at call %p (err=%d)\n",