diff options
| author | Simon Glass <sjg@chromium.org> | 2015-07-31 09:31:38 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-08-05 08:42:41 -0600 |
| commit | f134ed7df1167c6b2f0a62e3765abedced3feacc (patch) | |
| tree | eb8a8c3e567b858193ce7f3c4c754dda81c73a6e | |
| parent | 9b2174984e58972e657292dc8ff08e8d58dfbf06 (diff) | |
| download | u-boot-imx-f134ed7df1167c6b2f0a62e3765abedced3feacc.zip u-boot-imx-f134ed7df1167c6b2f0a62e3765abedced3feacc.tar.gz u-boot-imx-f134ed7df1167c6b2f0a62e3765abedced3feacc.tar.bz2 | |
efi: Display the correct initcall pre-relocation values
With EFI the start address of U-Boot is specified differently. We could
consider just setting GD_FLG_RELOC and then setting up reloc_off. But that
flag has other implementations and we are not able to use U-Boot relocation
which this flag implies.
Instead, just add a special case for EFI.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | lib/initcall.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/initcall.c b/lib/initcall.c index 7142744..db7c558 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; @@ -19,6 +20,9 @@ int initcall_run_list(const init_fnc_t init_sequence[]) if (gd->flags & GD_FLG_RELOC) reloc_ofs = gd->reloc_off; +#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); |