diff options
| author | Tom Rini <[email protected]> | 2023-05-14 11:27:18 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-14 11:27:18 -0400 |
| commit | 177e506952a8ee34011590c4bd578d191fafb1ca (patch) | |
| tree | 1c4be9b6329df4a1976125e87bf2fd8447990f29 /cmd | |
| parent | e94fbdd2729fdcd570035d43f67adda8e0dfc115 (diff) | |
| parent | fba0e7380269771bb9587fce84e56a059ebf7d42 (diff) | |
Merge branch '2023-05-13-bootstd-updates-and-improvements'
- Assorted bootstd fixes and cleanups. This should fix problems with
Debian, and make script-based distributions work when BOOTMETH_DISTRO
is enabled now (as BOOTMETH_DISTRO was renamed and then reintroduced).
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/bootflow.c | 4 | ||||
| -rw-r--r-- | cmd/usb.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 87291e2d84d..365371fb511 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -258,7 +258,7 @@ config CMD_BOOTFLOW config CMD_BOOTFLOW_FULL bool "bootflow - extract subcommands" depends on BOOTSTD_FULL - default y if BOOTSTD_FULL + default y help Add the ability to list the available bootflows, select one and obtain information about it. diff --git a/cmd/bootflow.c b/cmd/bootflow.c index cfe34226989..5c61286a2a7 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -55,7 +55,7 @@ static void report_bootflow_err(struct bootflow *bflow, int err) break; } - printf(", err=%d\n", err); + printf(", err=%dE\n", err); } /** @@ -125,7 +125,7 @@ static int do_bootflow_scan(struct cmd_tbl *cmdtp, int flag, int argc, dev = std->cur_bootdev; } else { if (has_args) { - printf("Flags not supported: enable CONFIG_BOOTFLOW_FULL\n"); + printf("Flags not supported: enable CONFIG_BOOTSTD_FULL\n"); return CMD_RET_USAGE; } boot = true; diff --git a/cmd/usb.c b/cmd/usb.c index 73addb04c49..61937283840 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -620,7 +620,6 @@ static int do_usb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct usb_device *udev = NULL; int i; - extern char usb_started; if (argc < 2) return CMD_RET_USAGE; |