diff options
| -rw-r--r-- | common/board_r.c | 7 | ||||
| -rw-r--r-- | lib/efi_driver/efi_uclass.c | 3 | ||||
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 7 |
3 files changed, 7 insertions, 10 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 diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index 7cdf81f..b14746e 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -300,9 +300,6 @@ efi_status_t efi_driver_init(void) struct driver *drv; efi_status_t ret = EFI_SUCCESS; - /* Save 'gd' pointer */ - efi_save_gd(); - debug("EFI: Initializing EFI driver framework\n"); for (drv = ll_entry_start(struct driver, driver); drv < ll_entry_end(struct driver, driver); ++drv) { diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index a908843..6e9d5fe 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -21,13 +21,6 @@ efi_status_t efi_init_obj_list(void) efi_status_t ret = EFI_SUCCESS; /* - * 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(); - - /* * Variable PlatformLang defines the language that the machine has been * configured for. */ |