aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorTony Dinh <mibodhi@gmail.com>2023-11-02 11:51:15 -0700
committerTom Rini <trini@konsulko.com>2023-11-10 11:01:50 -0500
commitee2ce29223c594d5c3f2f7743fb88a8d05e9918b (patch)
treea158a2588aafc13a72ae05270af06ed23e693002 /boot
parenta94a4071d449e12c9fb5ac37d6362d22efcb27da (diff)
downloadu-boot-ee2ce29223c594d5c3f2f7743fb88a8d05e9918b.zip
u-boot-ee2ce29223c594d5c3f2f7743fb88a8d05e9918b.tar.gz
u-boot-ee2ce29223c594d5c3f2f7743fb88a8d05e9918b.tar.bz2
bootstd: Skip over bad device during bootflows scanning
During bootstd scanning for bootdevs, if bootdev_hunt_drv() encounters a device not found error (e.g. ENOENT), let it return a successful status so that bootstd will continue scanning the next devices, not stopping prematurely. Background: During scanning for bootflows, it's possible for bootstd to encounter a faulty device controller. Also when the same u-boot is used for another variant of the same board, some device controller such as SATA might not exist. I've found this issue while converting the Marvell Sheevaplug board to use bootstd. This board has 2 variants, the original Sheevaplug has MMC and USB only, but the later variant comes with USB, MMC, and eSATA ports. We have been using the same u-boot (starting with CONFIG_IDE and later with DM CONFIG_SATA) for both variants. This worked well with the old envs-scripting booting scheme. Signed-off-by: Tony Dinh <mibodhi@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'boot')
-rw-r--r--boot/bootdev-uclass.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
index 44ae98a..4926a50 100644
--- a/boot/bootdev-uclass.c
+++ b/boot/bootdev-uclass.c
@@ -784,7 +784,7 @@ static int bootdev_hunt_drv(struct bootdev_hunter *info, uint seq, bool show)
if (info->hunt) {
ret = info->hunt(info, show);
log_debug(" - hunt result %d\n", ret);
- if (ret)
+ if (ret && ret != -ENOENT)
return ret;
}
std->hunters_used |= BIT(seq);