diff options
| author | Simon Glass <sjg@chromium.org> | 2023-10-23 00:02:10 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-23 13:05:13 -0400 |
| commit | abd1e94f70c9a2828d5ebec05013b055fb33c21d (patch) | |
| tree | 7c96ccacb0b677096b2c6144587059839cc5afa4 /test | |
| parent | d6b3297dde4a14f60a9cec55cd1c01bccc1bf1a6 (diff) | |
| download | u-boot-abd1e94f70c9a2828d5ebec05013b055fb33c21d.tar.gz u-boot-abd1e94f70c9a2828d5ebec05013b055fb33c21d.tar.bz2 u-boot-abd1e94f70c9a2828d5ebec05013b055fb33c21d.zip | |
Revert "bootstd: Scan all bootdevs in a boot_targets entry"
This commit was intended to allow all bootdevs in each boot_targets
entry to be scanned. However it causes bad ordering with bootdevs, e.g.
scanning Ethernet bootdevs when it should be keeping to mmc.
Revert it so we can try another approach.
This reverts commit e824d0d0c219bc6da767f13f90c5b00eefe929f0.
Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Ivan T.Ivanov <iivanov@suse.de>
Diffstat (limited to 'test')
| -rw-r--r-- | test/boot/bootdev.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c index c5f14a7a13..6b29213416 100644 --- a/test/boot/bootdev.c +++ b/test/boot/bootdev.c @@ -221,16 +221,6 @@ static int bootdev_test_order(struct unit_test_state *uts) ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name); bootflow_iter_uninit(&iter); - /* Make sure it scans a bootdevs in each target */ - ut_assertok(env_set("boot_targets", "mmc spi")); - ut_asserteq(0, bootflow_scan_first(NULL, NULL, &iter, 0, &bflow)); - ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow)); - ut_asserteq(3, iter.num_devs); - ut_asserteq_str("mmc2.bootdev", iter.dev_used[0]->name); - ut_asserteq_str("mmc1.bootdev", iter.dev_used[1]->name); - ut_asserteq_str("mmc0.bootdev", iter.dev_used[2]->name); - bootflow_iter_uninit(&iter); - return 0; } BOOTSTD_TEST(bootdev_test_order, UT_TESTF_DM | UT_TESTF_SCAN_FDT); |