During scanning for the next bootdev, if bootdev_next_prio() encounters a device error (e.g. ENOSYS), let it 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 ---
boot/bootdev-uclass.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 44ae98a926..b1d48e5b69 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -677,8 +677,6 @@ int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp) BOOTFLOWIF_SHOW); log_debug("- bootdev_hunt_prio() ret %d\n", ret); - if (ret) - return log_msg_ret("hun", ret); } } else { ret = device_probe(dev);