bootstd: Add a way to set up a bootflow

Add a function to init a bootflow, to reduce code duplication.

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

diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
index 9d98bee..affe0d3 100644 (file)
--- a/boot/bootdev-uclass.c
+++ b/boot/bootdev-uclass.c
@@ -440,10 +440,7 @@ int bootdev_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
 
        if (!ops->get_bootflow)
                return -ENOSYS;
-       memset(bflow, '\0', sizeof(*bflow));
-       bflow->dev = dev;
-       bflow->method = iter->method;
-       bflow->state = BOOTFLOWST_BASE;
+       bootflow_init(bflow, dev, iter->method);
 
        return ops->get_bootflow(dev, iter, bflow);
 }

diff --git a/boot/bootflow.c b/boot/bootflow.c
index 5d94a27..f9ad409 100644 (file)
--- a/boot/bootflow.c
+++ b/boot/bootflow.c
@@ -339,6 +339,15 @@ int bootflow_scan_next(struct bootflow_iter *iter, struct bootflow *bflow)
        } while (1);
 }
 
+void bootflow_init(struct bootflow *bflow, struct udevice *bootdev,
+                  struct udevice *meth)
+{
+       memset(bflow, '\0', sizeof(*bflow));
+       bflow->dev = bootdev;
+       bflow->method = meth;
+       bflow->state = BOOTFLOWST_BASE;
+}
+
 void bootflow_free(struct bootflow *bflow)
 {
        free(bflow->name);

diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c
index 2d7652e..25552dd 100644 (file)
--- a/boot/bootmeth-uclass.c
+++ b/boot/bootmeth-uclass.c
@@ -77,10 +77,7 @@ int bootmeth_get_bootflow(struct udevice *dev, struct bootflow *bflow)
 
        if (!ops->read_bootflow)
                return -ENOSYS;
-       memset(bflow, '\0', sizeof(*bflow));
-       bflow->dev = NULL;
-       bflow->method = dev;
-       bflow->state = BOOTFLOWST_BASE;
+       bootflow_init(bflow, NULL, dev);
 
        return ops->read_bootflow(dev, bflow);
 }

diff --git a/include/bootflow.h b/include/bootflow.h
index 6aa3d1f..32dbbbb 100644 (file)
--- a/include/bootflow.h
+++ b/include/bootflow.h
@@ -145,6 +145,18 @@ struct bootflow_iter {
 };
 
 /**
+ * bootflow_init() - Set up a bootflow struct
+ *
+ * The bootflow is zeroed and set to state BOOTFLOWST_BASE
+ *
+ * @bflow: Struct to set up
+ * @bootdev: Bootdev to use
+ * @meth: Bootmeth to use
+ */
+void bootflow_init(struct bootflow *bflow, struct udevice *bootdev,
+                  struct udevice *meth);
+
+/**
  * bootflow_iter_init() - Reset a bootflow iterator
  *
  * This sets everything to the starting point, ready for use.