On 18.12.18 06:02, AKASHI Takahiro wrote:
> The current way how command parameters, particularly "fdt addr," are
> handled makes it a bit complicated to add a subcommand-specific parameter.
> So just refactor the code and extract efi_handle_fdt().
>
> This commit is a preparatory change for enhancing bootmgr sub-command.
>
> Signed-off-by: AKASHI Takahiro <takahiro.aka...@linaro.org>
>
> Revert "fixup! fixup! cmd: bootefi: carve out fdt parameter handling"
>
> This reverts commit abc315426e37bdfb96a48d23c1fc96399b68baa5.
You sure you wanted this to be part of the commit message? ;)
> ---
> cmd/bootefi.c | 49 +++++++++++++++++++++++++++++++++----------------
> cmd/bootefi.h | 3 +++
> 2 files changed, 36 insertions(+), 16 deletions(-)
> create mode 100644 cmd/bootefi.h
>
> diff --git a/cmd/bootefi.c b/cmd/bootefi.c
> index 3ebae1cdad08..796ca6ee69ec 100644
> --- a/cmd/bootefi.c
> +++ b/cmd/bootefi.c
> @@ -279,6 +279,31 @@ static void bootefi_run_finish(struct
> efi_loaded_image_obj *image_obj,
> efi_delete_handle(&image_obj->header);
> }
>
> +int efi_handle_fdt(char *fdt_opt)
> +{
> + unsigned long fdt_addr;
> + efi_status_t r;
> +
> + if (fdt_opt) {
> + fdt_addr = simple_strtoul(fdt_opt, NULL, 16);
> + if (!fdt_addr && *fdt_opt != '0')
> + return CMD_RET_USAGE;
> +
> + /* Install device tree */
> + r = efi_install_fdt(fdt_addr);
> + if (r != EFI_SUCCESS) {
> + printf("ERROR: failed to install device tree\n");
> + return CMD_RET_FAILURE;
> + }
> + } else {
> + /* Remove device tree. EFI_NOT_FOUND can be ignored here */
> + efi_install_configuration_table(&efi_guid_fdt, NULL);
> + printf("WARNING: booting without device tree\n");
> + }
> +
> + return CMD_RET_SUCCESS;
> +}
> +
> /**
> * do_bootefi_exec() - execute EFI binary
> *
> @@ -473,7 +498,6 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int
> argc, char * const argv[])
> unsigned long addr;
> char *saddr;
> efi_status_t r;
> - unsigned long fdt_addr;
>
> /* Allow unaligned memory access */
> allow_unaligned();
> @@ -489,21 +513,6 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int
> argc, char * const argv[])
> if (argc < 2)
> return CMD_RET_USAGE;
>
> - if (argc > 2) {
> - fdt_addr = simple_strtoul(argv[2], NULL, 16);
> - if (!fdt_addr && *argv[2] != '0')
> - return CMD_RET_USAGE;
> - /* Install device tree */
> - r = efi_install_fdt(fdt_addr);
> - if (r != EFI_SUCCESS) {
> - printf("ERROR: failed to install device tree\n");
> - return CMD_RET_FAILURE;
> - }
> - } else {
> - /* Remove device tree. EFI_NOT_FOUND can be ignored here */
> - efi_install_configuration_table(&efi_guid_fdt, NULL);
> - printf("WARNING: booting without device tree\n");
> - }
> #ifdef CONFIG_CMD_BOOTEFI_HELLO
> if (!strcmp(argv[1], "hello")) {
> ulong size = __efi_helloworld_end - __efi_helloworld_begin;
> @@ -521,6 +530,9 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int
> argc, char * const argv[])
> struct efi_loaded_image_obj *image_obj;
> struct efi_loaded_image *loaded_image_info;
>
> + if (efi_handle_fdt(argc > 2 ? argv[2] : NULL))
> + return CMD_RET_FAILURE;
> +
> if (bootefi_test_prepare(&image_obj, &loaded_image_info,
> "\\selftest", (uintptr_t)&efi_selftest,
> "efi_selftest"))
> @@ -533,6 +545,9 @@ 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;
> +
> return do_bootefi_bootmgr_exec();
> } else {
> saddr = argv[1];
> @@ -542,6 +557,8 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int
> argc, char * const argv[])
> if (!addr && *saddr != '0')
> return CMD_RET_USAGE;
>
> + if (efi_handle_fdt(argc > 2 ? argv[2] : NULL))
> + return CMD_RET_FAILURE;
> }
>
> printf("## Starting EFI application at %08lx ...\n", addr);
> diff --git a/cmd/bootefi.h b/cmd/bootefi.h
> new file mode 100644
> index 000000000000..4e11ab1211cb
> --- /dev/null
> +++ b/cmd/bootefi.h
> @@ -0,0 +1,3 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
This should be a separate patch.
> +
> +int efi_handle_fdt(char *fdt_opt);
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
