projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: zynq: Do not select options if SPL is not enabled
[oweals/u-boot.git]
/
lib
/
initcall.c
diff --git
a/lib/initcall.c
b/lib/initcall.c
index 39f4b3f8ad5ffecc59afa59f9e96a93f4e16fe5c..db7c558bde5efc9fbf03b33298936614e6a61bf3 100644
(file)
--- a/
lib/initcall.c
+++ b/
lib/initcall.c
@@
-6,6
+6,7
@@
#include <common.h>
#include <initcall.h>
#include <common.h>
#include <initcall.h>
+#include <efi.h>
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
@@
-19,7
+20,14
@@
int initcall_run_list(const init_fnc_t init_sequence[])
if (gd->flags & GD_FLG_RELOC)
reloc_ofs = gd->reloc_off;
if (gd->flags & GD_FLG_RELOC)
reloc_ofs = gd->reloc_off;
- debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs);
+#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",
ret = (*init_fnc_ptr)();
if (ret) {
printf("initcall sequence %p failed at call %p (err=%d)\n",