diff options
| author | Simon Glass <sjg@chromium.org> | 2022-07-30 15:52:29 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-12 08:17:11 -0400 |
| commit | 2ff5490d7dee933eaf0b73d4d50d76660e5da6ff (patch) | |
| tree | fd2dc157bc698cb29c127b5847703f4b75a500a2 /test | |
| parent | bd18b69de10d1a681e760f2ee65b3de29d3006fd (diff) | |
| download | u-boot-2ff5490d7dee933eaf0b73d4d50d76660e5da6ff.tar.gz u-boot-2ff5490d7dee933eaf0b73d4d50d76660e5da6ff.tar.bz2 u-boot-2ff5490d7dee933eaf0b73d4d50d76660e5da6ff.zip | |
bootstd: Drop the system bootdev
This was a work-around for the fact that global bootmeths such as EFI
bootmgr and VBE don't use a particular bootdev, or at least select it
themselves so that we don't need to scan all bootdevs when using that
bootmeth.
Drop the system bootdev entirely.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/boot/bootflow.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index b2f77972d1..39c2c33dea 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -12,7 +12,6 @@ #include <bootstd.h> #include <dm.h> #include <asm/test.h> -#include <dm/device-internal.h> #include <dm/lists.h> #include <test/suites.h> #include <test/ut.h> @@ -337,7 +336,7 @@ static int bootflow_system(struct unit_test_state *uts) ut_assert_skip_to_line( " 0 efi_mgr ready (none) 0 <NULL> <NULL>"); ut_assert_skip_to_line("No more bootdevs"); - ut_assert_skip_to_line("(6 bootflows, 6 valid)"); + ut_assert_skip_to_line("(5 bootflows, 5 valid)"); ut_assert_console_end(); return 0; @@ -358,10 +357,6 @@ static int bootflow_iter_disable(struct unit_test_state *uts) ut_assertok(device_bind_driver(bootstd, "bootmeth_sandbox", "sandbox", &dev)); - /* Add the system bootdev that it uses */ - ut_assertok(device_bind_driver(bootstd, "system_bootdev", - "system-bootdev", &dev)); - ut_assertok(bootstd_test_drop_bootdev_order(uts)); bootstd_clear_glob(); |