X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=lib%2Finitcall.c;h=db7c558bde5efc9fbf03b33298936614e6a61bf3;hb=ebddc2e8fca7c1a3e05e6b0764a99fdb89638fc3;hp=7597bad555404a276a72afd4bda981e0f4187ce7;hpb=84f24ac8278d287581e5a559a7299e1dc2b53481;p=karo-tx-uboot.git

diff --git a/lib/initcall.c b/lib/initcall.c
index 7597bad555..db7c558bde 100644
--- a/lib/initcall.c
+++ b/lib/initcall.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <initcall.h>
+#include <efi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -15,14 +16,23 @@ int initcall_run_list(const init_fnc_t init_sequence[])
 
 	for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
 		unsigned long reloc_ofs = 0;
+		int ret;
 
 		if (gd->flags & GD_FLG_RELOC)
 			reloc_ofs = gd->reloc_off;
-		debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs);
-		if ((*init_fnc_ptr)()) {
-			printf("initcall sequence %p failed at call %p\n",
+#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);
+		else
+			debug("\n");
+		ret = (*init_fnc_ptr)();
+		if (ret) {
+			printf("initcall sequence %p failed at call %p (err=%d)\n",
 			       init_sequence,
-			       (char *)*init_fnc_ptr - reloc_ofs);
+			       (char *)*init_fnc_ptr - reloc_ofs, ret);
 			return -1;
 		}
 	}