karo: tx28: adjust parameters to mxs_common_spl_init() to match new U-Boot version

[karo-tx-uboot.git] / lib / initcall.c

diff --git a/lib/initcall.c b/lib/initcall.c
index fa76dd73c19ed89c58a5f79b65a7f4ab49ec7a06..714274415c9f2e3ab21783f3e0806c466908d84d 100644 (file)
--- a/lib/initcall.c
+++ b/lib/initcall.c
@@ -7,15 +7,28 @@
 #include <common.h>
 #include <initcall.h>
 
-int initcall_run_list(init_fnc_t init_sequence[])
+DECLARE_GLOBAL_DATA_PTR;
+
+int initcall_run_list(const init_fnc_t init_sequence[])
 {
-       init_fnc_t *init_fnc_ptr;
+       const init_fnc_t *init_fnc_ptr;
 
        for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
-               debug("initcall: %p\n", *init_fnc_ptr);
-               if ((*init_fnc_ptr)()) {
-                       debug("initcall sequence %p failed at call %p\n",
-                             init_sequence, *init_fnc_ptr);
+               unsigned long reloc_ofs = 0;
+               int ret;
+
+               if (gd->flags & GD_FLG_RELOC)
+                       reloc_ofs = gd->reloc_off;
+               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, ret);
                        return -1;
                }
        }