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 /drivers | |
| 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 'drivers')
| -rw-r--r-- | drivers/usb/host/usb-uclass.c | 1 | ||||
| -rw-r--r-- | drivers/usb/host/usb_bootdev.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index 28f7ca9654d..02c0138a206 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -18,7 +18,6 @@ #include <dm/lists.h> #include <dm/uclass-internal.h> -extern bool usb_started; /* flag for the started/stopped USB status */ static bool asynch_allowed; struct usb_uclass_priv { diff --git a/drivers/usb/host/usb_bootdev.c b/drivers/usb/host/usb_bootdev.c index 32919f99286..06e8f61aa1c 100644 --- a/drivers/usb/host/usb_bootdev.c +++ b/drivers/usb/host/usb_bootdev.c @@ -22,6 +22,9 @@ static int usb_bootdev_bind(struct udevice *dev) static int usb_bootdev_hunt(struct bootdev_hunter *info, bool show) { + if (usb_started) + return 0; + return usb_init(); } |