bootstd: Add a hunter for ethernet
Sometimes ethernet devices are attached to PCI. Since it is quick to scan,
add this into the ethernet hunter.
Run dhcp to establish the network connection. Drop this from the bootdev
since that is not needed now. Update a log message for clarity.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c
index 78cb0ac..32a31c4 100644
--- a/test/boot/bootdev.c
+++ b/test/boot/bootdev.c
@@ -238,9 +238,10 @@
bootdev_list_hunters(std);
ut_assert_nextline("Prio Used Uclass Hunter");
ut_assert_nextlinen("----");
+ ut_assert_nextline(" 50 ethernet eth_bootdev");
ut_assert_nextline(" 10 mmc mmc_bootdev");
ut_assert_nextline(" 40 usb usb_bootdev");
- ut_assert_nextline("(total hunters: 2)");
+ ut_assert_nextline("(total hunters: 3)");
ut_assert_console_end();
ut_assertok(bootdev_hunt("usb1", false));
@@ -248,8 +249,8 @@
"Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found");
ut_assert_console_end();
- /* USB is second in the list, so bit 1 */
- ut_asserteq(BIT(1), std->hunters_used);
+ /* USB is third in the list, so bit 2 */
+ ut_asserteq(BIT(2), std->hunters_used);
return 0;
}
@@ -269,11 +270,14 @@
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: 2)");
+ ut_assert_skip_to_line("(total hunters: 3)");
ut_assert_console_end();
/* Scan all hunters */
+ sandbox_set_eth_enable(false);
+
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(
@@ -284,13 +288,14 @@
ut_assertok(run_command("bootdev hunt -l", 0));
ut_assert_nextlinen("Prio");
ut_assert_nextlinen("----");
+ ut_assert_nextline(" 50 * ethernet eth_bootdev");
ut_assert_nextline(" 10 * mmc mmc_bootdev");
ut_assert_nextline(" 40 * usb usb_bootdev");
- ut_assert_nextline("(total hunters: 2)");
+ ut_assert_nextline("(total hunters: 3)");
ut_assert_console_end();
- ut_asserteq(GENMASK(1, 0), std->hunters_used);
+ ut_asserteq(GENMASK(2, 0), std->hunters_used);
return 0;
}