leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstd: Add a way to set up a bootflow

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

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-10-20 18:22:51 -06:00 committed by Tom Rini
parent cbd71fad6d
commit b190deb895
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot/bootdev-uclass.c
View File

@ -440,10 +440,7 @@ int bootdev_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
if (!ops->get_bootflow) if (!ops->get_bootflow)
return -ENOSYS; return -ENOSYS;
memset(bflow, '\0', sizeof(*bflow)); bootflow_init(bflow, dev, iter->method);
bflow->dev = dev;
bflow->method = iter->method;
bflow->state = BOOTFLOWST_BASE;
return ops->get_bootflow(dev, iter, bflow); return ops->get_bootflow(dev, iter, bflow);
} }

9
boot/bootflow.c
View File

@ -339,6 +339,15 @@ int bootflow_scan_next(struct bootflow_iter *iter, struct bootflow *bflow)
} while (1); } 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) void bootflow_free(struct bootflow *bflow)
{ {
free(bflow->name); free(bflow->name);

5
boot/bootmeth-uclass.c
View File

@ -77,10 +77,7 @@ int bootmeth_get_bootflow(struct udevice *dev, struct bootflow *bflow)
if (!ops->read_bootflow) if (!ops->read_bootflow)
return -ENOSYS; return -ENOSYS;
memset(bflow, '\0', sizeof(*bflow)); bootflow_init(bflow, NULL, dev);
bflow->dev = NULL;
bflow->method = dev;
bflow->state = BOOTFLOWST_BASE;
return ops->read_bootflow(dev, bflow); return ops->read_bootflow(dev, bflow);
} }

12
include/bootflow.h
View File

@ -144,6 +144,18 @@ struct bootflow_iter {
bool doing_global; bool doing_global;
}; };
/**
* 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 * bootflow_iter_init() - Reset a bootflow iterator
* *