Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootstd: Move bootflow-clearing to bootstd

Browse source 
This relates to more than just the bootdev, since there is a global list
of bootflows. Move the function to the bootstd file and rename it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Simon Glass 2024-11-15 16:19:09 -07:00 • committed by Tom Rini
parent 47903aacc5
commit 9218225773
5 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

19
boot/bootdev-uclass.c
View file

@ -557,19 +557,6 @@ int bootdev_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
return ops->get_bootflow(dev, iter, bflow); return ops->get_bootflow(dev, iter, bflow);
} }
void bootdev_clear_bootflows(struct udevice *dev)
{
struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev);
while (!list_empty(&ucp->bootflow_head)) {
struct bootflow *bflow;
bflow = list_first_entry(&ucp->bootflow_head, struct bootflow,
bm_node);
bootflow_remove(bflow);
}
}
int bootdev_next_label(struct bootflow_iter *iter, struct udevice **devp, int bootdev_next_label(struct bootflow_iter *iter, struct udevice **devp,
int *method_flagsp) int *method_flagsp)
{ {
@ -935,7 +922,11 @@ static int bootdev_post_bind(struct udevice *dev)
static int bootdev_pre_unbind(struct udevice *dev) static int bootdev_pre_unbind(struct udevice *dev)
{ {
bootdev_clear_bootflows(dev); int ret;
ret = bootstd_clear_bootflows_for_bootdev(dev);
if (ret)
return log_msg_ret("bun", ret);
return 0; return 0;
} }

15
boot/bootstd-uclass.c
View file

@ -86,6 +86,21 @@ int bootstd_add_bootflow(struct bootflow *bflow)
return 0; return 0;
} }
int bootstd_clear_bootflows_for_bootdev(struct udevice *dev)
{
struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev);
while (!list_empty(&ucp->bootflow_head)) {
struct bootflow *bflow;
bflow = list_first_entry(&ucp->bootflow_head, struct bootflow,
bm_node);
bootflow_remove(bflow);
}
return 0;
}
static int bootstd_remove(struct udevice *dev) static int bootstd_remove(struct udevice *dev)
{ {
struct bootstd_priv *priv = dev_get_priv(dev); struct bootstd_priv *priv = dev_get_priv(dev);

2
cmd/bootflow.c
View file

@ -197,7 +197,7 @@ static int do_bootflow_scan(struct cmd_tbl *cmdtp, int flag, int argc,
show_header(); show_header();
} }
if (dev) if (dev)
bootdev_clear_bootflows(dev); bootstd_clear_bootflows_for_bootdev(dev);
else else
bootstd_clear_glob(); bootstd_clear_glob();
for (i = 0, for (i = 0,

10
include/bootdev.h
View file

@ -185,16 +185,6 @@ int bootdev_find_in_blk(struct udevice *dev, struct udevice *blk,
*/ */
void bootdev_list(bool probe); void bootdev_list(bool probe);
/**
* bootdev_clear_bootflows() - Clear bootflows from a bootdev
*
* Each bootdev maintains a list of discovered bootflows. This provides a
* way to clear it. These bootflows are removed from the global list too.
*
* @dev: bootdev device to update
*/
void bootdev_clear_bootflows(struct udevice *dev);
/** /**
* bootdev_first_bootflow() - Get the first bootflow from a bootdev * bootdev_first_bootflow() - Get the first bootflow from a bootdev
* *

10
include/bootstd.h
View file

@ -122,4 +122,14 @@ int bootstd_prog_boot(void);
*/ */
int bootstd_add_bootflow(struct bootflow *bflow); int bootstd_add_bootflow(struct bootflow *bflow);
/**
* bootstd_clear_bootflows_for_bootdev() - Clear bootflows from a bootdev
*
* Each bootdev maintains a list of discovered bootflows. This provides a
* way to clear it. These bootflows are removed from the global list too.
*
* @dev: bootdev device to update
*/
int bootstd_clear_bootflows_for_bootdev(struct udevice *dev);
#endif #endif