From: Simon Glass <sjg@chromium.org>
Date: Fri, 31 Jul 2015 15:31:38 +0000 (-0600)
Subject: efi: Display the correct initcall pre-relocation values
X-Git-Tag: v2015.10-rc2~410^2~38
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f134ed7df1167c6b2f0a62e3765abedced3feacc;p=oweals%2Fu-boot.git

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>
---

diff --git a/lib/initcall.c b/lib/initcall.c
index 714274415c..db7c558bde 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);