initcall: Improve debugging support

Add the ability to display the code offset of an initcall even after it
is relocated. This makes it much easier to relate initcalls back to the
U-Boot System.map file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/initcall.h b/include/initcall.h
index 2378077361dae9a1bf0e238882438ec25ce288ee..65f67dca8321679ac50a09fb5e29f919a36a2f6b 100644 (file)
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -6,4 +6,4 @@
 
 typedef int (*init_fnc_t)(void);
 
-int initcall_run_list(init_fnc_t init_sequence[]);
+int initcall_run_list(const init_fnc_t init_sequence[]);

diff --git a/lib/initcall.c b/lib/initcall.c
index fa76dd73c19ed89c58a5f79b65a7f4ab49ec7a06..7597bad555404a276a72afd4bda981e0f4187ce7 100644 (file)
--- a/lib/initcall.c
+++ b/lib/initcall.c
@@ -7,15 +7,22 @@
 #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);
+               unsigned long reloc_ofs = 0;
+
+               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)()) {
-                       debug("initcall sequence %p failed at call %p\n",
-                             init_sequence, *init_fnc_ptr);
+                       printf("initcall sequence %p failed at call %p\n",
+                              init_sequence,
+                              (char *)*init_fnc_ptr - reloc_ofs);
                        return -1;
                }
        }