aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-04-15 07:30:25 -0400
committerTom Rini <trini@konsulko.com>2019-04-15 07:30:25 -0400
commit38f94d3539d070485e773c660a1d1a3429c52743 (patch)
tree1c3bc4aabaaae5451a3c9c65701c798161cafc1b /common
parent939803e1303f4329896a566883593325c6d75057 (diff)
parent8688b753916bfdde3c2911f14d4489c36e705db7 (diff)
downloadu-boot-38f94d3539d070485e773c660a1d1a3429c52743.zip
u-boot-38f94d3539d070485e773c660a1d1a3429c52743.tar.gz
u-boot-38f94d3539d070485e773c660a1d1a3429c52743.tar.bz2
Merge tag 'efi-2019-07-rc1-2' of git://git.denx.de/u-boot-efi
Pull request for UEFI sub-system for v2019.07-rc1 (2) In the aarch64 crash dump information about the loaded EFI images is added. In README.uefi the development target is for the UEFI subsystem is described as "Embedded Base Boot Requirements (EBBR) Specification" compliance. Several bug fixes are supplied.
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 472987d..1ad44bb 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -154,6 +154,13 @@ static int initr_reloc_global_data(void)
gd->fdt_blob += gd->reloc_off;
#endif
#ifdef CONFIG_EFI_LOADER
+ /*
+ * On the ARM architecture gd is mapped to a fixed register (r9 or x18).
+ * As this register may be overwritten by an EFI payload we save it here
+ * and restore it on every callback entered.
+ */
+ efi_save_gd();
+
efi_runtime_relocate(gd->relocaddr, NULL);
#endif