diff options
| author | Tom Rini <[email protected]> | 2024-04-14 15:58:31 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-04-14 15:58:31 -0600 |
| commit | b03b49046af5dfca599d2ce8f0aafed89b97aa91 (patch) | |
| tree | 36f06c2f124f8181549bc57a59777976ed1eaee1 /include | |
| parent | 57cb92de7a9d01be1ce72af003651efc80ac67e2 (diff) | |
| parent | 63f6a449bffe46beca89580d3efa48e5d041025c (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/env_default.h | 11 | ||||
| -rw-r--r-- | include/usb.h | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/env_default.h b/include/env_default.h index 2ca4a087d3b..8ee500d1709 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -99,6 +99,17 @@ const char default_environment[] = { #ifdef CONFIG_SYS_SOC "soc=" CONFIG_SYS_SOC "\0" #endif +#ifdef CONFIG_USB_HOST + "usb_ignorelist=" +#ifdef CONFIG_USB_KEYBOARD + /* Ignore Yubico devices. Currently only a single USB keyboard device is + * supported and the emulated HID keyboard Yubikeys present is useless + * as keyboard. + */ + "0x1050:*," +#endif + "\0" +#endif #ifdef CONFIG_ENV_IMPORT_FDT "env_fdt_path=" CONFIG_ENV_FDT_PATH "\0" #endif diff --git a/include/usb.h b/include/usb.h index 09e3f0cb309..3aafdc8bfd1 100644 --- a/include/usb.h +++ b/include/usb.h @@ -49,6 +49,12 @@ extern bool usb_started; /* flag for the started/stopped USB status */ */ #define USB_TIMEOUT_MS(pipe) (usb_pipebulk(pipe) ? 5000 : 1000) +/* + * The xhcd hcd driver prepares only a limited number interfaces / endpoints. + * Define this limit so that drivers do not exceed it. + */ +#define USB_MAX_ACTIVE_INTERFACES 2 + /* device request (setup) */ struct devrequest { __u8 requesttype; |