diff options
| author | Tom Rini <[email protected]> | 2024-05-01 19:39:45 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-01 19:39:45 -0600 |
| commit | 3132b7982af501f7f62f7b2c7f89d00205de33d1 (patch) | |
| tree | cd5b5ae2fd542e757e052f7beb6407bbf07ed8b5 /cmd | |
| parent | ff0de1f0557ed7d2dab47ba976a37347a1fdc432 (diff) | |
| parent | 8745f13fe102968f58a9e2e5f69ad153a675b59c (diff) | |
Merge tag 'efi-2024-07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-07-rc2
Documentation:
* correct description of 'env print -e'
UEFI:
* remove superfluous efi_restore_gd after EFI_CALL
* terminate efidebug test bootmgr early on error
* do not install device-tree if bootmgr fails
* pass GUID by address to efi_dp_from_lo
* remove dead code in efi_var_mem_init()
* enable QueryVariableInfo at runtime for file backed variables
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootefi.c | 1 | ||||
| -rw-r--r-- | cmd/efidebug.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 578dbb19a7e..c1454ffb948 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -107,7 +107,6 @@ static int do_efi_selftest(void) /* Execute the test */ ret = EFI_CALL(efi_selftest(&image_obj->header, &systab)); - efi_restore_gd(); free(loaded_image_info->load_options); efi_free_pool(test_device_path); efi_free_pool(test_image_path); diff --git a/cmd/efidebug.c b/cmd/efidebug.c index a587860e2a5..c2c525f2351 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -1397,6 +1397,8 @@ static __maybe_unused int do_efi_test_bootmgr(struct cmd_tbl *cmdtp, int flag, ret = efi_bootmgr_load(&image, &load_options); printf("efi_bootmgr_load() returned: %ld\n", ret & ~EFI_ERROR_MASK); + if (ret != EFI_SUCCESS) + return CMD_RET_SUCCESS; /* We call efi_start_image() even if error for test purpose. */ ret = EFI_CALL(efi_start_image(image, &exit_data_size, &exit_data)); @@ -1404,8 +1406,6 @@ static __maybe_unused int do_efi_test_bootmgr(struct cmd_tbl *cmdtp, int flag, if (ret && exit_data) efi_free_pool(exit_data); - efi_restore_gd(); - free(load_options); return CMD_RET_SUCCESS; } |