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

bootstd: Allow hunting for a bootdev by label

Browse source 
Add a function to hunt for a bootdev label and find the bootdev produced
by the hunter (or already present).

Add a few extra flags so that we can distinguish between "mmc1", "mmc" and
"1" which all need to be handled differently.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-01-17 10:48:09 -07:00 • committed by Tom Rini
parent eacc261178
commit 66e3dce787
6 changed files with 195 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
boot/bootdev-uclass.c
View file

@ -442,6 +442,13 @@ int bootdev_find_by_label(const char *label, struct udevice **devp,
if (!ret) {
log_debug("- found %s\n", bdev->name);
*devp = bdev;
/*
* if no sequence number was provided, we must scan all
* bootdevs for this media uclass
*/
if (IS_ENABLED(CONFIG_BOOTSTD_FULL) && seq == -1)
method_flags |= BOOTFLOW_METHF_SINGLE_UCLASS;
if (method_flagsp)
*method_flagsp = method_flags;
return 0;
@ -458,7 +465,7 @@ int bootdev_find_by_any(const char *name, struct udevice **devp,
{
struct udevice *dev;
int method_flags = 0;
int ret, seq;
int ret = -ENODEV, seq;
char *endp;
seq = simple_strtol(name, &endp, 16);
@ -480,8 +487,9 @@ int bootdev_find_by_any(const char *name, struct udevice **devp,
ret);
return log_msg_ret("pro", ret);
}
} else {
} else if (IS_ENABLED(CONFIG_BOOTSTD_FULL)) {
ret = uclass_get_device_by_seq(UCLASS_BOOTDEV, seq, &dev);
method_flags |= BOOTFLOW_METHF_SINGLE_DEV;
}
if (ret) {
printf("Cannot find '%s' (err=%d)\n", name, ret);
@ -495,6 +503,21 @@ int bootdev_find_by_any(const char *name, struct udevice **devp,
return 0;
}
int bootdev_hunt_and_find_by_label(const char *label, struct udevice **devp,
int *method_flagsp)
{
int ret;
ret = bootdev_hunt(label, false);
if (ret)
return log_msg_ret("scn", ret);
ret = bootdev_find_by_label(label, devp, method_flagsp);
if (ret)
return log_msg_ret("fnd", ret);
return 0;
}
static int default_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
struct bootflow *bflow)
{