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>
This commit is contained in:
Simon Glass
2022-07-30 15:52:29 -06:00
committed by Tom Rini
parent bd18b69de1
commit 2ff5490d7d
4 changed files with 2 additions and 79 deletions

View File

@@ -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();