bootstd: Allow the bootdev to be optional in bootflows

With global bootmeths we want to scan without a bootdev. Update the logic
to allow this.

Change the bootflow command to show the bootdev only when valid.

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

diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
index 5683006c73c6f6255377a79ca9ea19d12c544d01..13ac69eb392fd70822e4ddbbeafe472858d2b761 100644 (file)
--- a/boot/bootdev-uclass.c
+++ b/boot/bootdev-uclass.c
@@ -36,7 +36,6 @@ enum {
 
 int bootdev_add_bootflow(struct bootflow *bflow)
 {
-       struct bootdev_uc_plat *ucp = dev_get_uclass_plat(bflow->dev);
        struct bootstd_priv *std;
        struct bootflow *new;
        int ret;
@@ -52,7 +51,11 @@ int bootdev_add_bootflow(struct bootflow *bflow)
        memcpy(new, bflow, sizeof(*bflow));
 
        list_add_tail(&new->glob_node, &std->glob_head);
-       list_add_tail(&new->bm_node, &ucp->bootflow_head);
+       if (bflow->dev) {
+               struct bootdev_uc_plat *ucp = dev_get_uclass_plat(bflow->dev);
+
+               list_add_tail(&new->bm_node, &ucp->bootflow_head);
+       }
 
        return 0;
 }

diff --git a/boot/bootflow.c b/boot/bootflow.c
index 24ba3c346602f04feacab104d0e76246717a406b..37bccb823a1405c9f9e21f4431a0d98ed6fb3a04 100644 (file)
--- a/boot/bootflow.c
+++ b/boot/bootflow.c
@@ -307,7 +307,8 @@ void bootflow_free(struct bootflow *bflow)
 
 void bootflow_remove(struct bootflow *bflow)
 {
-       list_del(&bflow->bm_node);
+       if (bflow->dev)
+               list_del(&bflow->bm_node);
        list_del(&bflow->glob_node);
 
        bootflow_free(bflow);

diff --git a/cmd/bootflow.c b/cmd/bootflow.c
index af4b9c3732371a364a038c40caabef4aeca85b0f..47899245ee804a082dc90d51ccd2ca0ca241fb7b 100644 (file)
--- a/cmd/bootflow.c
+++ b/cmd/bootflow.c
@@ -69,8 +69,8 @@ static void show_bootflow(int index, struct bootflow *bflow, bool errors)
 {
        printf("%3x  %-11s  %-6s  %-9.9s %4x  %-25.25s %s\n", index,
               bflow->method->name, bootflow_state_get_name(bflow->state),
-              dev_get_uclass_name(dev_get_parent(bflow->dev)), bflow->part,
-              bflow->name, bflow->fname);
+              bflow->dev ? dev_get_uclass_name(dev_get_parent(bflow->dev)) :
+              "(none)", bflow->part, bflow->name, bflow->fname);
        if (errors)
                report_bootflow_err(bflow, bflow->err);
 }