diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-22 08:56:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-22 12:43:30 -0400 |
| commit | f055f2e5a2038002519e5b9affbf259345f4ade9 (patch) | |
| tree | 2388e5ea59e1e246d8f51b680d04861178f9608f /cmd | |
| parent | 06685f9de2c1ae37cd015848d245f8a59cbc93dc (diff) | |
| parent | af484011f12e2aa37bcf4f9cbb4258dea4ef14ac (diff) | |
| download | u-boot-f055f2e5a2038002519e5b9affbf259345f4ade9.tar.gz u-boot-f055f2e5a2038002519e5b9affbf259345f4ade9.tar.bz2 u-boot-f055f2e5a2038002519e5b9affbf259345f4ade9.zip | |
Merge tag 'efi-2022-01-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc1
Documentation:
Use Sphinx 3.43.
Move system reset documentation to HTML
UEFI:
Fix linking EFI apps with LLVM
Fix alignment of loaded image
Correct simple network protocol test
Code cleanup
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/efidebug.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 67ab06aefc..a977ca9c72 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -1143,10 +1143,7 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size) { struct efi_device_path *initrd_path = NULL; struct efi_load_option lo; - u16 *dp_str; efi_status_t ret; - efi_uintn_t initrd_dp_size; - const efi_guid_t lf2_initrd_guid = EFI_INITRD_MEDIA_GUID; ret = efi_deserialize_load_option(&lo, data, size); if (ret != EFI_SUCCESS) { @@ -1165,15 +1162,11 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size) lo.attributes); printf(" label: %ls\n", lo.label); - dp_str = efi_dp_str(lo.file_path); - printf(" file_path: %ls\n", dp_str); - efi_free_pool(dp_str); + printf(" file_path: %pD\n", lo.file_path); - initrd_path = efi_dp_from_lo(&lo, &initrd_dp_size, lf2_initrd_guid); + initrd_path = efi_dp_from_lo(&lo, &efi_lf2_initrd_guid); if (initrd_path) { - dp_str = efi_dp_str(initrd_path); - printf(" initrd_path: %ls\n", dp_str); - efi_free_pool(dp_str); + printf(" initrd_path: %pD\n", initrd_path); efi_free_pool(initrd_path); } |