aboutsummaryrefslogtreecommitdiff
path: root/common/board_r.c
diff options
context:
space:
mode:
authorSimon Glass2021-12-29 11:57:54 -0700
committerHeinrich Schuchardt2021-12-31 07:37:48 +0100
commit86bb48880d75653d692cd02edb81888a2ed2dbb2 (patch)
tree5e4efe9805e01a7d11b75b2b6b7e997564fad942 /common/board_r.c
parent40b172314bb68886fce409efbd4db7cbe9d0926a (diff)
x86: efi: Don't set up global_data again with EFI
Since EFI does not relocate and uses the same global_data pointer throughout the board-init process, drop this unnecessary setup, to avoid a hang. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 6d520662dbb..760c2d05ed0 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -841,9 +841,8 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
* TODO(sjg@chromium.org): Consider doing this for all archs, or
* dropping the new_gd parameter.
*/
-#if CONFIG_IS_ENABLED(X86_64)
- arch_setup_gd(new_gd);
-#endif
+ if (CONFIG_IS_ENABLED(X86_64) && !IS_ENABLED(CONFIG_EFI_APP))
+ arch_setup_gd(new_gd);
#ifdef CONFIG_NEEDS_MANUAL_RELOC
int i;