dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-22 10:31:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

efi_loader: rename parent to header

Browse Source 
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>
This commit is contained in:
Heinrich Schuchardt
2018-09-26 05:27:56 +02:00
committed by Alexander Graf
parent fae0118e7a
commit d39646a38b
6 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/bootefi.c
View File

@@ -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