diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-28 18:51:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-28 18:51:16 -0400 |
| commit | bbcacdf4cd23f2e5deb9ef916096c956c955243d (patch) | |
| tree | 3065b9346139a0f30bc3f9e77f1ee27e8fba3fdd /drivers/usb/cdns3 | |
| parent | 22ecb12132a2de80a08654f139ff978176034c38 (diff) | |
| parent | 537892065ac1428a48193d4b0fa7bf827e8d0d44 (diff) | |
Merge branch '2021-07-28-build-improvements'
- Assorted Makefile cleanups
- A few code / build cleanups
Diffstat (limited to 'drivers/usb/cdns3')
| -rw-r--r-- | drivers/usb/cdns3/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/cdns3/core.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/cdns3/Kconfig b/drivers/usb/cdns3/Kconfig index 05785fc4fe..35b61497d9 100644 --- a/drivers/usb/cdns3/Kconfig +++ b/drivers/usb/cdns3/Kconfig @@ -41,7 +41,7 @@ config SPL_USB_CDNS3_GADGET config SPL_USB_CDNS3_HOST bool "Cadence USB3 host controller" - depends on USB_XHCI_HCD && SPL_USB_HOST_SUPPORT + depends on USB_XHCI_HCD && SPL_USB_HOST help Say Y here to enable host controller functionality of the Cadence driver. diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c index 798a21793f..644a9791b9 100644 --- a/drivers/usb/cdns3/core.c +++ b/drivers/usb/cdns3/core.c @@ -149,7 +149,7 @@ static int cdns3_core_init_role(struct cdns3 *cdns) dr_mode = best_dr_mode; -#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SPL_USB_HOST) || !defined(CONFIG_SPL_BUILD) if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_HOST) { ret = cdns3_host_init(cdns); if (ret) { @@ -403,7 +403,7 @@ int cdns3_bind(struct udevice *parent) dr_mode = usb_get_dr_mode(node); switch (dr_mode) { -#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || \ +#if defined(CONFIG_SPL_USB_HOST) || \ (!defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB_HOST)) case USB_DR_MODE_HOST: debug("%s: dr_mode: HOST\n", __func__); @@ -466,7 +466,7 @@ U_BOOT_DRIVER(cdns_usb3_peripheral) = { }; #endif -#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || \ +#if defined(CONFIG_SPL_USB_HOST) || \ (!defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB_HOST)) static int cdns3_host_probe(struct udevice *dev) { |