Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

bootstd: Add a default method to get bootflows

Browse source 
The code in these functions turns out to often be the same. Add a default
get_bootflow() function and allow the drivers to select it by setting
the method to NULL.

This saves a little code space.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-01-17 10:47:26 -07:00 committed by Tom Rini
parent 3a2cb96e5d
commit b85fc8dbab
4 changed files with 29 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
boot/bootdev-uclass.c
View file

@ -450,14 +450,37 @@ int bootdev_find_by_any(const char *name, struct udevice **devp)
return 0;
}
static int default_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
struct bootflow *bflow)
{
struct udevice *blk;
int ret;
ret = bootdev_get_sibling_blk(dev, &blk);
/*
* If there is no media, indicate that no more partitions should be
* checked
*/
if (ret == -EOPNOTSUPP)
ret = -ESHUTDOWN;
if (ret)
return log_msg_ret("blk", ret);
assert(blk);
ret = bootdev_find_in_blk(dev, blk, iter, bflow);
if (ret)
return log_msg_ret("find", ret);
return 0;
}
int bootdev_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
struct bootflow *bflow)
{
const struct bootdev_ops *ops = bootdev_get_ops(dev);
if (!ops->get_bootflow)
return -ENOSYS;
bootflow_init(bflow, dev, iter->method);
if (!ops->get_bootflow)
return default_get_bootflow(dev, iter, bflow);
return ops->get_bootflow(dev, iter, bflow);
}

25
drivers/mmc/mmc_bootdev.c
View file

@ -11,30 +11,6 @@
#include <dm.h>
#include <mmc.h>
static int mmc_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
struct bootflow *bflow)
{
struct udevice *mmc_dev = dev_get_parent(dev);
struct udevice *blk;
int ret;
ret = mmc_get_blk(mmc_dev, &blk);
/*
* If there is no media, indicate that no more partitions should be
* checked
*/
if (ret == -EOPNOTSUPP)
ret = -ESHUTDOWN;
if (ret)
return log_msg_ret("blk", ret);
assert(blk);
ret = bootdev_find_in_blk(dev, blk, iter, bflow);
if (ret)
return log_msg_ret("find", ret);
return 0;
}
static int mmc_bootdev_bind(struct udevice *dev)
{
struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev);
@ -45,7 +21,6 @@ static int mmc_bootdev_bind(struct udevice *dev)
}
struct bootdev_ops mmc_bootdev_ops = {
.get_bootflow = mmc_get_bootflow,
};
static const struct udevice_id mmc_bootdev_ids[] = {

24
drivers/usb/host/usb_bootdev.c
View file

@ -11,29 +11,6 @@
#include <dm.h>
#include <usb.h>
static int usb_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
struct bootflow *bflow)
{
struct udevice *blk;
int ret;
ret = bootdev_get_sibling_blk(dev, &blk);
/*
* If there is no media, indicate that no more partitions should be
* checked
*/
if (ret == -EOPNOTSUPP)
ret = -ESHUTDOWN;
if (ret)
return log_msg_ret("blk", ret);
assert(blk);
ret = bootdev_find_in_blk(dev, blk, iter, bflow);
if (ret)
return log_msg_ret("find", ret);
return 0;
}
static int usb_bootdev_bind(struct udevice *dev)
{
struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev);
@ -44,7 +21,6 @@ static int usb_bootdev_bind(struct udevice *dev)
}
struct bootdev_ops usb_bootdev_ops = {
.get_bootflow = usb_get_bootflow,
};
static const struct udevice_id usb_bootdev_ids[] = {

5
include/bootdev.h
View file

@ -50,7 +50,10 @@ struct bootdev_uc_plat {
/** struct bootdev_ops - Operations for the bootdev uclass */
struct bootdev_ops {
/**
* get_bootflow() - get a bootflow
* get_bootflow() - get a bootflow (optional)
*
* If this is NULL then the default implementaton is used, which is
* default_get_bootflow()
*
* @dev: Bootflow device to check
* @iter: Provides current dev, part, method to get. Should update