diff options
| author | Simon Glass <sjg@chromium.org> | 2023-09-23 14:50:15 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2023-10-13 10:15:41 -0700 |
| commit | e824d0d0c219bc6da767f13f90c5b00eefe929f0 (patch) | |
| tree | 9fcc524f96e053a341f09cbac5bed17008dd697e /boot/bootflow.c | |
| parent | d5d24e2e0a3f54175e458d89acd626da939e1130 (diff) | |
bootstd: Scan all bootdevs in a boot_targets entry
When the boot_targets environment variable is used with the distro-boot
scripts, each device is included individually. For example, if there
are three mmc devices, then we will have something like:
boot_targets="mmc0 mmc1 mmc2"
In contrast, standard boot supports specifying just the uclass, i.e.:
boot_targets="mmc"
The intention is that this should scan all MMC devices, but in fact it
currently only scans the first.
Update the logic to handle this case, without required BOOTSTD_FULL to
be enabled.
I believe at least three people reported this, but I found two.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Date Huang <tjjh89017@hotmail.com>
Reported-by: Vincent Stehlé <vincent.stehle@arm.com>
Diffstat (limited to 'boot/bootflow.c')
| -rw-r--r-- | boot/bootflow.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/boot/bootflow.c b/boot/bootflow.c index 6ef62e1d189..e03932e65a7 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -260,8 +260,25 @@ static int iter_incr(struct bootflow_iter *iter) } else { log_debug("labels %p\n", iter->labels); if (iter->labels) { - ret = bootdev_next_label(iter, &dev, - &method_flags); + /* + * when the label is "mmc" we want to scan all + * mmc bootdevs, not just the first. See + * bootdev_find_by_label() where this flag is + * set up + */ + if (iter->method_flags & BOOTFLOW_METHF_SINGLE_UCLASS) { + uclass_next_device(&dev); + log_debug("looking for next device %s: %s\n", + iter->dev->name, + dev ? dev->name : "<none>"); + } else { + dev = NULL; + } + if (!dev) { + log_debug("looking at next label\n"); + ret = bootdev_next_label(iter, &dev, + &method_flags); + } } else { ret = bootdev_next_prio(iter, &dev); method_flags = 0; |