[U-Boot] [PATCH v2 11/14] cmd: bootefi: run an EFI application of a specific load option

AKASHI Takahiro
2018-11-05T09:06:50Z

With this patch applied, we will be able to selectively execute
an EFI application by specifying a load option, say "1" for Boot0001,
"2" for Boot0002 and so on.

=> bootefi bootmgr <fdt addr> 1, or
bootefi bootmgr - 1

Please note that BootXXXX need not be included in "BootOrder".

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
cmd/bootefi.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 3aedf5a09f93..7580008f691b 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -509,13 +509,13 @@ exit:
return ret;
}

-static int do_bootefi_bootmgr_exec(void)
+static int do_bootefi_bootmgr_exec(int boot_id)
{
struct efi_device_path *device_path, *file_path;
void *addr;
efi_status_t r;

- addr = efi_bootmgr_load(&device_path, &file_path);
+ addr = efi_bootmgr_load(boot_id, &device_path, &file_path);
if (!addr)
return 1;

@@ -595,8 +595,20 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} else
#endif
if (!strcmp(argv[1], "bootmgr")) {
- if (efi_handle_fdt(argc > 2 ? argv[2] : NULL))
- return CMD_RET_FAILURE;
+ char *endp;
+ int boot_id = -1;
+
+ if (argc > 2)
+ if (efi_handle_fdt((argv[2][0] == '-') ?
+ NULL : argv[2]))
+ return CMD_RET_FAILURE;
+
+ if (argc > 3) {
+ boot_id = (int)simple_strtoul(argv[3], &endp, 0);
+ if ((argv[3] + strlen(argv[3]) != endp) ||
+ boot_id > 0xffff)
+ return CMD_RET_USAGE;
+ }

return do_bootefi_bootmgr_exec(boot_id);
} else {
@@ -639,7 +651,7 @@ static char bootefi_help_text[] =
" Use environment variable efi_selftest to select a single test.\n"
" Use 'setenv efi_selftest list' to enumerate all tests.\n"
#endif
- "bootefi bootmgr [fdt addr]\n"
+ "bootefi bootmgr [<fdt addr>|'-' [<boot id>]]\n"
" - load and boot EFI payload based on BootOrder/BootXXXX variables.\n"
"\n"
" If specified, the device tree located at <fdt address> gets\n"
@@ -647,7 +659,7 @@ static char bootefi_help_text[] =
#endif

U_BOOT_CMD(
- bootefi, 3, 0, do_bootefi,
+ bootefi, 5, 0, do_bootefi,
"Boots an EFI payload from memory",
bootefi_help_text
);
--
2.19.0