vbe: Add a command to show the VBE state

Add a VBE comment which shows the current state. Currently this is just
the phases which booted via VBE.

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

diff --git a/cmd/vbe.c b/cmd/vbe.c
index a5737edc047e34b831ded3fa66d88c06fd89d46c..befaf07c64d990efb154829a5c9a5fd594b44a9a 100644 (file)
--- a/cmd/vbe.c
+++ b/cmd/vbe.c
@@ -7,9 +7,11 @@
  */
 
 #include <common.h>
+#include <bloblist.h>
 #include <bootmeth.h>
 #include <bootstd.h>
 #include <command.h>
+#include <spl.h>
 #include <vbe.h>
 
 static int do_vbe_list(struct cmd_tbl *cmdtp, int flag, int argc,
@@ -74,14 +76,41 @@ static int do_vbe_info(struct cmd_tbl *cmdtp, int flag, int argc,
        return 0;
 }
 
+static int do_vbe_state(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
+{
+       struct vbe_handoff *handoff;
+       int i;
+
+       handoff = bloblist_find(BLOBLISTT_VBE, sizeof(struct vbe_handoff));
+       if (!handoff) {
+               printf("No VBE state\n");
+               return CMD_RET_FAILURE;
+       }
+
+       printf("Phases:");
+       for (i = PHASE_NONE; i < PHASE_COUNT; i++) {
+               if (handoff->phases & (1 << i))
+                       printf(" %s", spl_phase_name(i));
+
+       }
+       if (!handoff->phases)
+               printf(" (none)");
+       printf("\n");
+
+       return 0;
+}
+
 #ifdef CONFIG_SYS_LONGHELP
 static char vbe_help_text[] =
        "list   - list VBE bootmeths\n"
        "vbe select - select a VBE bootmeth by sequence or name\n"
-       "vbe info   - show information about a VBE bootmeth";
+       "vbe info   - show information about a VBE bootmeth\n"
+       "vbe state  - show VBE state";
 #endif
 
 U_BOOT_CMD_WITH_SUBCMDS(vbe, "Verified Boot for Embedded", vbe_help_text,
        U_BOOT_SUBCMD_MKENT(list, 1, 1, do_vbe_list),
        U_BOOT_SUBCMD_MKENT(select, 2, 1, do_vbe_select),
+       U_BOOT_SUBCMD_MKENT(state, 2, 1, do_vbe_state),
        U_BOOT_SUBCMD_MKENT(info, 2, 1, do_vbe_info));

diff --git a/include/spl.h b/include/spl.h
index 7286f4b5ca0e91afb6cd2152129c491aeb72482f..3eb27de616666231bba338bf53282ac14f80adc5 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -66,6 +66,8 @@ enum u_boot_phase {
        PHASE_SPL,      /* Running in SPL */
        PHASE_BOARD_F,  /* Running in U-Boot before relocation */
        PHASE_BOARD_R,  /* Running in U-Boot after relocation */
+
+       PHASE_COUNT,
 };
 
 /**