bootstd: Add a SCSI bootdev
Add a bootdev for SCSI so that these devices can be used with standard
boot.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c
index db0e0ca..5661a3c 100644
--- a/test/boot/bootdev.c
+++ b/test/boot/bootdev.c
@@ -240,8 +240,9 @@
ut_assert_nextlinen("----");
ut_assert_nextline(" 50 ethernet eth_bootdev");
ut_assert_nextline(" 10 mmc mmc_bootdev");
+ ut_assert_nextline(" 30 scsi scsi_bootdev");
ut_assert_nextline(" 40 usb usb_bootdev");
- ut_assert_nextline("(total hunters: 3)");
+ ut_assert_nextline("(total hunters: 4)");
ut_assert_console_end();
ut_assertok(bootdev_hunt("usb1", false));
@@ -249,8 +250,8 @@
"Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found");
ut_assert_console_end();
- /* USB is third in the list, so bit 2 */
- ut_asserteq(BIT(2), std->hunters_used);
+ /* USB is fourth in the list, so bit 3 */
+ ut_asserteq(BIT(3), std->hunters_used);
return 0;
}
@@ -270,7 +271,7 @@
ut_assertok(run_command("bootdev hunt -l", 0));
ut_assert_nextline("Prio Used Uclass Hunter");
ut_assert_nextlinen("----");
- ut_assert_skip_to_line("(total hunters: 3)");
+ ut_assert_skip_to_line("(total hunters: 4)");
ut_assert_console_end();
/* Scan all hunters */
@@ -279,7 +280,9 @@
ut_assertok(run_command("bootdev hunt", 0));
ut_assert_nextline("Hunting with: ethernet");
ut_assert_nextline("Hunting with: mmc");
- ut_assert_nextline("Hunting with: usb");
+ ut_assert_nextline("Hunting with: scsi");
+ ut_assert_nextline("scanning bus for devices...");
+ ut_assert_skip_to_line("Hunting with: usb");
ut_assert_nextline(
"Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found");
ut_assert_console_end();
@@ -290,12 +293,13 @@
ut_assert_nextlinen("----");
ut_assert_nextline(" 50 * ethernet eth_bootdev");
ut_assert_nextline(" 10 * mmc mmc_bootdev");
+ ut_assert_nextline(" 30 * scsi scsi_bootdev");
ut_assert_nextline(" 40 * usb usb_bootdev");
- ut_assert_nextline("(total hunters: 3)");
+ ut_assert_nextline("(total hunters: 4)");
ut_assert_console_end();
- ut_asserteq(GENMASK(2, 0), std->hunters_used);
+ ut_asserteq(GENMASK(3, 0), std->hunters_used);
return 0;
}