diff options
| author | Simon Glass <sjg@chromium.org> | 2023-01-17 20:48:05 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-24 02:11:41 +0300 |
| commit | d9f48579dced9c897e718a8b0b84d56ac564a486 (patch) | |
| tree | 710c4821aed33cde985e0a0b6f4ca2e52e72ed4c /cmd | |
| parent | 5143a41e10da67fe9542a42e947b6a375f0a08d6 (diff) | |
| download | u-boot-d9f48579dced9c897e718a8b0b84d56ac564a486.tar.xz | |
bootstd: Treat DHCP and PXE as bootdev labels
These are associated with the ethernet boot device but do not match its
uclass name, so handle them as special cases.
Provide a way to pass flags through with the bootdev so that we know
how to process it. The flags are checked by the bootmeths, to ensure that
only the selected bootmeth is used.
While these both use the network device, they work quite differently. It
is common to run only one of these, or to run PXE before DHCP. Provide
bootflow flags to control which methods are used. Check these in the two
bootmeths so that only the chosen one is used.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootdev.c | 2 | ||||
| -rw-r--r-- | cmd/bootflow.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/bootdev.c b/cmd/bootdev.c index 28866faac7..5b1efaaee8 100644 --- a/cmd/bootdev.c +++ b/cmd/bootdev.c @@ -57,7 +57,7 @@ static int do_bootdev_select(struct cmd_tbl *cmdtp, int flag, int argc, std->cur_bootdev = NULL; return 0; } - if (bootdev_find_by_any(argv[1], &dev)) + if (bootdev_find_by_any(argv[1], &dev, NULL)) return CMD_RET_FAILURE; std->cur_bootdev = dev; diff --git a/cmd/bootflow.c b/cmd/bootflow.c index 56dd35b69c..c8b2f5efde 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -121,7 +121,7 @@ static int do_bootflow_scan(struct cmd_tbl *cmdtp, int flag, int argc, if (argc > 1) { const char *label = argv[1]; - if (bootdev_find_by_any(label, &dev)) + if (bootdev_find_by_any(label, &dev, NULL)) return CMD_RET_FAILURE; } } else { |