aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-03-25 22:15:47 -0400
committerTom Rini <trini@konsulko.com>2024-03-25 22:15:47 -0400
commitab8d9ca3044acf51d8ff3bf3c4718c48f30ad606 (patch)
tree35c2e2eae8ed2cf1dda331b19dd806a33aaad913 /cmd
parent8ef8dcc54a0d507912ee57e15a541c5cebcfca76 (diff)
parentdde373bde392c38649c8c4420e0c98ef8d38d9dc (diff)
downloadu-boot-ab8d9ca3044acf51d8ff3bf3c4718c48f30ad606.zip
u-boot-ab8d9ca3044acf51d8ff3bf3c4718c48f30ad606.tar.gz
u-boot-ab8d9ca3044acf51d8ff3bf3c4718c48f30ad606.tar.bz2
Merge tag 'v2024.04-rc5' into nextWIP/25Mar2024-next
Prepare v2024.04-rc5
Diffstat (limited to 'cmd')
-rw-r--r--cmd/bootefi.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 9cf9027..578dbb1 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -154,9 +154,7 @@ static int do_bootefi(struct cmd_tbl *cmdtp, int flag, int argc,
!strcmp(argv[1], "bootmgr")) {
ret = efi_bootmgr_run(fdt);
- if (ret == EFI_INVALID_PARAMETER)
- return CMD_RET_USAGE;
- else if (ret)
+ if (ret != EFI_SUCCESS)
return CMD_RET_FAILURE;
return CMD_RET_SUCCESS;
@@ -173,9 +171,7 @@ static int do_bootefi(struct cmd_tbl *cmdtp, int flag, int argc,
}
ret = efi_install_fdt(fdt);
- if (ret == EFI_INVALID_PARAMETER)
- return CMD_RET_USAGE;
- else if (ret != EFI_SUCCESS)
+ if (ret != EFI_SUCCESS)
return CMD_RET_FAILURE;
return do_efi_selftest();
@@ -218,9 +214,7 @@ static int do_bootefi(struct cmd_tbl *cmdtp, int flag, int argc,
ret = efi_binary_run(image_buf, size, fdt);
- if (ret == EFI_INVALID_PARAMETER)
- return CMD_RET_USAGE;
- else if (ret)
+ if (ret != EFI_SUCCESS)
return CMD_RET_FAILURE;
return CMD_RET_SUCCESS;