bootstd: Introduce programmatic boot

At present bootstd requires CONFIG_CMDLINE to operate. Add a new
'programmatic' boot which can be used when no command line is available.
For now it does almost nothing, since most bootmeths require the
command line.

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

diff --git a/boot/Kconfig b/boot/Kconfig
index ef71883a5026c47a744ce1403d00bb01335a3c78..b438002059c33f78833588b3d203c318d49ea529 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -459,6 +459,18 @@ config BOOTSTD_BOOTCOMMAND
          standard boot does not support all of the features of distro boot
          yet.
 
+config BOOTSTD_PROG
+       bool "Use programmatic boot"
+       depends on !CMDLINE
+       default y
+       help
+         Enable this to provide a board_run_command() function which can boot
+         a systen without using commands. If the boot fails, then U-Boot will
+         panic.
+
+         Note: This currently has many limitations and is not a useful booting
+         solution. Future work will eventually make this a viable option.
+
 config BOOTMETH_GLOBAL
        bool
        help

diff --git a/boot/Makefile b/boot/Makefile
index 3fd048bb41abb47edd5a5acb86a3e295ad1ab89a..de0eafed14b1e0fd56058a1d8f7782cbc5d899ae 100644 (file)
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -25,6 +25,8 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootmeth-uclass.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootstd-uclass.o
 
+obj-$(CONFIG_$(SPL_TPL_)BOOTSTD_PROG) += prog_boot.o
+
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EXTLINUX) += bootmeth_extlinux.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EXTLINUX_PXE) += bootmeth_pxe.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o

diff --git a/boot/prog_boot.c b/boot/prog_boot.c
new file mode 100644 (file)
index 0000000..045554b
--- /dev/null
+++ b/boot/prog_boot.c
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2021 Google LLC
+ * Written by Simon Glass <sjg@chromium.org>
+ */
+
+#define LOG_CATEGORY UCLASS_BOOTSTD
+
+#include <bootflow.h>
+#include <bootstd.h>
+#include <command.h>
+#include <dm.h>
+
+/*
+ * show_bootmeths() - List available bootmeths
+ *
+ * We could refactor this to use do_bootmeth_list() if more detail (or ordering)
+ * are needed
+ */
+static void show_bootmeths(void)
+{
+       struct udevice *dev;
+       struct uclass *uc;
+
+       printf("Bootmeths: ");
+       uclass_id_foreach_dev(UCLASS_BOOTMETH, dev, uc)
+               printf(" %s", dev->name);
+       printf("\n");
+}
+
+int bootstd_prog_boot(void)
+{
+       struct bootflow_iter iter;
+       struct bootflow bflow;
+       int ret, flags, i;
+
+       printf("Programmatic boot starting\n");
+       show_bootmeths();
+       flags = BOOTFLOWIF_HUNT | BOOTFLOWIF_SHOW | BOOTFLOWIF_SKIP_GLOBAL;
+
+       bootstd_clear_glob();
+       for (i = 0, ret = bootflow_scan_first(NULL, NULL, &iter, flags, &bflow);
+            i < 1000 && ret != -ENODEV;
+            i++, ret = bootflow_scan_next(&iter, &bflow)) {
+               if (!bflow.err)
+                       bootflow_run_boot(&iter, &bflow);
+               bootflow_free(&bflow);
+       }
+
+       return -EFAULT;
+}

diff --git a/common/main.c b/common/main.c
index 7c70de2e59a8e2d928c74e1588245884d62e04b6..6dba6cba144bfa093e4d55e1eebcfd8f4451ef24 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <autoboot.h>
 #include <bootstage.h>
+#include <bootstd.h>
 #include <cli.h>
 #include <command.h>
 #include <console.h>
@@ -67,6 +68,16 @@ void main_loop(void)
 
        autoboot_command(s);
 
+       /* if standard boot if enabled, assume that it will be able to boot */
+       if (IS_ENABLED(CONFIG_BOOTSTD_PROG)) {
+               int ret;
+
+               ret = bootstd_prog_boot();
+               printf("Standard boot failed (err=%dE)\n", ret);
+               panic("Failed to boot");
+       }
+
        cli_loop();
+
        panic("No CLI available");
 }

diff --git a/include/bootstd.h b/include/bootstd.h
index 7802564bcc630d73b9b830718da442bcaae6f5ad..99ce7b64e7c538968cae1c71d1771236bc371e90 100644 (file)
--- a/include/bootstd.h
+++ b/include/bootstd.h
@@ -94,4 +94,13 @@ int bootstd_get_priv(struct bootstd_priv **stdp);
  */
 void bootstd_clear_glob(void);
 
+/**
+ * bootstd_prog_boot() - Run standard boot in a fully programmatic mode
+ *
+ * Attempts to boot without making any use of U-Boot commands
+ *
+ * Returns: -ve error value (does not return except on failure to boot)
+ */
+int bootstd_prog_boot(void);
+
 #endif