bootstd: Add a bootmeth command

Add a 'bootmeth' command to handle listing and ordering of boot methods.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index d2ffc5370a95c2bef2eb613ec0ff51eb9f7f43fb..1205ef501e9a659a73e3337adc4ee52a86451dd8 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -239,6 +239,17 @@ config CMD_BOOTFLOW_FULL
 
          This command is not necessary for bootstd to work.
 
+config CMD_BOOTMETH
+       bool "bootmeth"
+       depends on BOOTSTD
+       default y if BOOTSTD_FULL
+       help
+         Support listing available bootmethds (methods used to boot an
+         Operating System), as well as selecting the order that the bootmeths
+         are used.
+
+         This command is not necessary for bootstd to work.
+
 config BOOTM_EFI
        bool "Support booting UEFI FIT images"
        depends on CMD_BOOTEFI && CMD_BOOTM && FIT

diff --git a/cmd/Makefile b/cmd/Makefile
index addb8f020560382dc94dc93d072c6ec3ec6ce856..5e43a1e022e8023915f90feb7d19951a83b05322 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_CMD_ARMFLASH) += armflash.o
 obj-$(CONFIG_HAVE_BLOCK_DEVICE) += blk_common.o
 obj-$(CONFIG_CMD_BOOTDEV) += bootdev.o
 obj-$(CONFIG_CMD_BOOTFLOW) += bootflow.o
+obj-$(CONFIG_CMD_BOOTMETH) += bootmeth.o
 obj-$(CONFIG_CMD_SOURCE) += source.o
 obj-$(CONFIG_CMD_BCB) += bcb.o
 obj-$(CONFIG_CMD_BDI) += bdinfo.o

diff --git a/cmd/bootmeth.c b/cmd/bootmeth.c
new file mode 100644 (file)
index 0000000..c9a27fe
--- /dev/null
+++ b/cmd/bootmeth.c
@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * 'bootmeth' command
+ *
+ * Copyright 2021 Google LLC
+ * Written by Simon Glass <sjg@chromium.org>
+ */
+
+#include <common.h>
+#include <bootdev.h>
+#include <bootmeth.h>
+#include <bootstd.h>
+#include <command.h>
+#include <dm.h>
+#include <malloc.h>
+#include <dm/uclass-internal.h>
+
+static int do_bootmeth_list(struct cmd_tbl *cmdtp, int flag, int argc,
+                           char *const argv[])
+{
+       struct bootstd_priv *std;
+       struct udevice *dev;
+       bool use_order;
+       bool all = false;
+       int ret;
+       int i;
+
+       if (argc > 1 && *argv[1] == '-') {
+               all = strchr(argv[1], 'a');
+               argc--;
+               argv++;
+       }
+
+       ret = bootstd_get_priv(&std);
+       if (ret) {
+               printf("Cannot get bootstd (err=%d)\n", ret);
+               return CMD_RET_FAILURE;
+       }
+
+       printf("Order  Seq  Name                Description\n");
+       printf("-----  ---  ------------------  ------------------\n");
+
+       /*
+        * Use the ordering if we have one, so long as we are not trying to list
+        * all bootmethds
+        */
+       use_order = std->bootmeth_count && !all;
+       if (use_order)
+               dev = std->bootmeth_order[0];
+       else
+               ret = uclass_find_first_device(UCLASS_BOOTMETH, &dev);
+
+       for (i = 0; dev;) {
+               struct bootmeth_uc_plat *ucp = dev_get_uclass_plat(dev);
+               int order = i;
+
+               /*
+                * With the -a flag we may list bootdevs that are not in the
+                * ordering. Find their place in the order
+                */
+               if (all && std->bootmeth_count) {
+                       int j;
+
+                       /* Find the position of this bootmeth in the order */
+                       order = -1;
+                       for (j = 0; j < std->bootmeth_count; j++) {
+                               if (std->bootmeth_order[j] == dev)
+                                       order = j;
+                       }
+               }
+
+               if (order == -1)
+                       printf("%5s", "-");
+               else
+                       printf("%5x", order);
+               printf("  %3x  %-19.19s %s\n", dev_seq(dev), dev->name,
+                      ucp->desc);
+               i++;
+               if (use_order)
+                       dev = std->bootmeth_order[i];
+               else
+                       uclass_find_next_device(&dev);
+       }
+       printf("-----  ---  ------------------  ------------------\n");
+       printf("(%d bootmeth%s)\n", i, i != 1 ? "s" : "");
+
+       return 0;
+}
+
+static int do_bootmeth_order(struct cmd_tbl *cmdtp, int flag, int argc,
+                            char *const argv[])
+{
+       int ret;
+
+       ret = bootmeth_set_order(argv[1]);
+       if (ret) {
+               printf("Failed (err=%d)\n", ret);
+               return CMD_RET_FAILURE;
+       }
+       env_set("bootmeths", argv[1]);
+
+       return 0;
+}
+
+#ifdef CONFIG_SYS_LONGHELP
+static char bootmeth_help_text[] =
+       "list [-a]     - list available bootmeths (-a all)\n"
+       "bootmeth order [<bd> ...]  - select bootmeth order / subset to use";
+#endif
+
+U_BOOT_CMD_WITH_SUBCMDS(bootmeth, "Boot methods", bootmeth_help_text,
+       U_BOOT_SUBCMD_MKENT(list, 2, 1, do_bootmeth_list),
+       U_BOOT_SUBCMD_MKENT(order, CONFIG_SYS_MAXARGS, 1, do_bootmeth_order));