Commit f134ed7d authored by Simon Glass's avatar Simon Glass
Browse files

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: default avatarSimon Glass <sjg@chromium.org>
Reviewed-by: default avatarBin Meng <bmeng.cn@gmail.com>
parent 9b217498
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <common.h> #include <common.h>
#include <initcall.h> #include <initcall.h>
#include <efi.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -19,6 +20,9 @@ int initcall_run_list(const init_fnc_t init_sequence[]) ...@@ -19,6 +20,9 @@ int initcall_run_list(const init_fnc_t init_sequence[])
if (gd->flags & GD_FLG_RELOC) if (gd->flags & GD_FLG_RELOC)
reloc_ofs = gd->reloc_off; 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); debug("initcall: %p", (char *)*init_fnc_ptr - reloc_ofs);
if (gd->flags & GD_FLG_RELOC) if (gd->flags & GD_FLG_RELOC)
debug(" (relocated to %p)\n", (char *)*init_fnc_ptr); debug(" (relocated to %p)\n", (char *)*init_fnc_ptr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment