diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-10 13:54:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-10 13:54:33 -0500 |
| commit | ddaa94978583d07ec515e7226e397221d8cc44c8 (patch) | |
| tree | 10a493992781507bcd885b3cb8d747935f0fa93e /lib/efi_selftest/efi_selftest_load_initrd.c | |
| parent | 03f1f78a9b44b5fd6fc09faf81639879d2d0f85f (diff) | |
| parent | 264485131c59c1c8fa17fe742bbca65cef868d94 (diff) | |
Merge tag 'efi-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi into next
Pull request for UEFI sub-system for next
Bug fixes
* avoid corruption of FAT file system when using long names
* correct values for RuntimeServicesSupport concerning UEFI capsule update
* link partition to block device via EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
New feature
* support EFI_LOAD_FILE_PROTOCOL in LoadImage() boot service
Diffstat (limited to 'lib/efi_selftest/efi_selftest_load_initrd.c')
| -rw-r--r-- | lib/efi_selftest/efi_selftest_load_initrd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/efi_selftest/efi_selftest_load_initrd.c b/lib/efi_selftest/efi_selftest_load_initrd.c index fe060a6644..f591dcd211 100644 --- a/lib/efi_selftest/efi_selftest_load_initrd.c +++ b/lib/efi_selftest/efi_selftest_load_initrd.c @@ -86,7 +86,6 @@ static int setup(const efi_handle_t handle, static int execute(void) { - efi_guid_t lf2_proto_guid = EFI_LOAD_FILE2_PROTOCOL_GUID; struct efi_load_file_protocol *lf2; struct efi_device_path *dp2, *dp2_invalid; efi_status_t status; @@ -99,13 +98,15 @@ static int execute(void) memset(buffer, 0, sizeof(buffer)); dp2 = (struct efi_device_path *)&dp; - status = boottime->locate_device_path(&lf2_proto_guid, &dp2, &handle); + status = boottime->locate_device_path(&efi_guid_load_file2_protocol, + &dp2, &handle); if (status != EFI_SUCCESS) { efi_st_error("Unable to locate device path\n"); return EFI_ST_FAILURE; } - status = boottime->handle_protocol(handle, &lf2_proto_guid, + status = boottime->handle_protocol(handle, + &efi_guid_load_file2_protocol, (void **)&lf2); if (status != EFI_SUCCESS) { efi_st_error("Unable to locate protocol\n"); |