diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-31 07:28:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-31 07:28:36 -0500 |
| commit | 5fec3c853d5e6b998db66f586871839c408195a3 (patch) | |
| tree | c3368f8625b3a9383f30745ce1fafafc35cafac3 /common | |
| parent | 87a9aa604de8a4a50642e25b88af328ab375893b (diff) | |
| parent | 86bb48880d75653d692cd02edb81888a2ed2dbb2 (diff) | |
| download | u-boot-5fec3c853d5e6b998db66f586871839c408195a3.zip u-boot-5fec3c853d5e6b998db66f586871839c408195a3.tar.gz u-boot-5fec3c853d5e6b998db66f586871839c408195a3.tar.bz2 | |
Merge tag 'efi-next' of https://source.denx.de/u-boot/custodians/u-boot-efi into nextWIP/31Dec2021-next
Pull request of efi-next
Documentation:
* Add Sunxi board description
UEFI:
* Improvements to U-Boot running on top of UEFI
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c index 6d52066..760c2d0 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; |