From 2ff5490d7dee933eaf0b73d4d50d76660e5da6ff Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 30 Jul 2022 15:52:29 -0600 Subject: 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 --- test/boot/bootflow.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'test/boot/bootflow.c') 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 #include #include -#include #include #include #include @@ -337,7 +336,7 @@ static int bootflow_system(struct unit_test_state *uts) ut_assert_skip_to_line( " 0 efi_mgr ready (none) 0 "); 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(); -- cgit v1.2.3