Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh

[oweals/u-boot.git] / include / initcall.h

diff --git a/include/initcall.h b/include/initcall.h
index 78d15afe69b7c7889eebda7ff2f343c69218c878..41b74dc52d2ff1ee751bba9333d6f517e4f829e3 100644 (file)
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -8,6 +8,11 @@
 
 typedef int (*init_fnc_t)(void);
 
+#include <log.h>
+#ifdef CONFIG_EFI_APP
+#include <efi.h>
+#endif
+
 /*
  * To enable debugging. add #define DEBUG at the top of the including file.
  *
@@ -30,11 +35,13 @@ static inline int initcall_run_list(const init_fnc_t init_sequence[])
 #ifdef CONFIG_EFI_APP
                reloc_ofs = (unsigned long)image_base;
 #endif
-               debug("initcall: %p", (char *)*init_fnc_ptr - reloc_ofs);
                if (reloc_ofs)
-                       debug(" (relocated to %p)\n", (char *)*init_fnc_ptr);
+                       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",