summaryrefslogtreecommitdiff
path: root/include/configs/ds414.h
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-06-04 07:35:03 +0900
committerMarek Vasut <marex@denx.de>2016-06-04 00:43:53 +0200
commit0a8cc1a3a4206d556da784a0e98598190dfe5408 (patch)
tree82e93ae04467fda3d717a99387cc55799ccb5a30 /include/configs/ds414.h
parent0ff27eb25f027602261fd009b1cf588f7918f02c (diff)
usb: move CONFIG_USB_XHCI to Kconfig with renaming
Move CONFIG_USB_XHCI to defconfig files for all boards, renaming it into CONFIG_USB_XHCI_HCD. As commented in the help of "config USB_XHCI" entry, this has been a TODO for a long time; now CONFIG_USB_XHCI_HCD and CONFIG_USB_XHCI have been unified in favor of the former. Note: Some boards define CONFIG_USB_XHCI in their headers without CONFIG_USB, which does not meet the "depends on" in Kconfig. I added CONFIG_USB=y for those boards when converting. Otherwise, they would fail to build. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include/configs/ds414.h')
-rw-r--r--include/configs/ds414.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 64c546cc82..23373cdb58 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -71,12 +71,11 @@
* - USB init fails, controller does not respond in time */
#if 0
#undef CONFIG_DM_USB
-#define CONFIG_USB_XHCI
#define CONFIG_USB_XHCI_PCI
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif
-#if !defined(CONFIG_USB_XHCI)
+#if !defined(CONFIG_USB_XHCI_HCD)
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MARVELL
#define CONFIG_EHCI_IS_TDI