summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2018-09-26 06:27:56 +0300
committerAlexander Graf <agraf@suse.de>2018-12-02 23:59:36 +0300
commitd39646a38b504c377b5bcf282a2a9407f99b5f57 (patch)
treec209137981e665ecf5a176246e49c5ec8bbef4b3 /cmd
parentfae0118e7ae3a209b30205f02e8349c36ec0dbd9 (diff)
downloadu-boot-d39646a38b504c377b5bcf282a2a9407f99b5f57.tar.xz
efi_loader: rename parent to header
Rename the component parent of some EFI objects to header. This avoids misunderstandings. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/bootefi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index faa00f75c2..a1650d6cd1 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -418,7 +418,7 @@ static efi_status_t do_bootefi_exec(void *efi,
/* Move into EL2 and keep running there */
armv8_switch_to_el2((ulong)entry,
- (ulong)&image_obj->parent,
+ (ulong)&image_obj->header,
(ulong)&systab, 0, (ulong)efi_run_in_el2,
ES_TO_AARCH64);
@@ -435,7 +435,7 @@ static efi_status_t do_bootefi_exec(void *efi,
secure_ram_addr(_do_nonsec_entry)(
efi_run_in_hyp,
(uintptr_t)entry,
- (uintptr_t)&image_obj->parent,
+ (uintptr_t)&image_obj->header,
(uintptr_t)&systab);
/* Should never reach here, efi exits with longjmp */
@@ -443,12 +443,12 @@ static efi_status_t do_bootefi_exec(void *efi,
}
#endif
- ret = efi_do_enter(&image_obj->parent, &systab, entry);
+ ret = efi_do_enter(&image_obj->header, &systab, entry);
exit:
/* image has returned, loaded-image obj goes *poof*: */
if (image_obj)
- efi_delete_handle(&image_obj->parent);
+ efi_delete_handle(&image_obj->header);
if (mem_handle)
efi_delete_handle(mem_handle);
@@ -546,10 +546,10 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* Transfer environment variable efi_selftest as load options */
set_load_options(loaded_image_info, "efi_selftest");
/* Execute the test */
- r = efi_selftest(&image_obj->parent, &systab);
+ r = efi_selftest(&image_obj->header, &systab);
efi_restore_gd();
free(loaded_image_info->load_options);
- efi_delete_handle(&image_obj->parent);
+ efi_delete_handle(&image_obj->header);
return r != EFI_SUCCESS;
} else
#endif