Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53c6bc24 authored by David Daney's avatar David Daney Committed by Greg Kroah-Hartman
Browse files

usb: Don't make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT. 



The fact that an architecture/board has XHCI, OHCI or EHCI does not
depend on the fact that the kernel is configured with USB_SUPPORT.

Make the Kconfig reflect this fact thus avoiding ugly messages like:

warning: (MIPS_ALCHEMY && CAVIUM_OCTEON_REFERENCE_BOARD && SOC_AR71XX && SOC_AR724X && SOC_AR913X && SOC_AR933X) selects USB_ARCH_HAS_EHCI which has unmet direct dependencies (USB_SUPPORT)

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d069842

drivers/usb/Kconfig

+21 −21
Original line number Original line Diff line number Diff line
@@ -10,27 +10,6 @@ menuconfig USB_SUPPORT 
	  This option adds core support for Universal Serial Bus (USB).

	  This option adds core support for Universal Serial Bus (USB).

	  You will also need drivers from the following menu to make use of it.

	  You will also need drivers from the following menu to make use of it.





if USB_SUPPORT



config USB_COMMON

	tristate

	default y

	depends on USB || USB_GADGET



# Host-side USB depends on having a host controller

# NOTE:  dummy_hcd is always an option, but it's ignored here ...

# NOTE:  SL-811 option should be board-specific ...

config USB_ARCH_HAS_HCD

	boolean

	default y if USB_ARCH_HAS_OHCI

	default y if USB_ARCH_HAS_EHCI

	default y if USB_ARCH_HAS_XHCI

	default y if PCMCIA && !M32R			# sl811_cs

	default y if ARM				# SL-811

	default y if BLACKFIN				# SL-811

	default y if SUPERH				# r8a66597-hcd

	default PCI



# many non-PCI SOC chips embed OHCI

# many non-PCI SOC chips embed OHCI

config USB_ARCH_HAS_OHCI

config USB_ARCH_HAS_OHCI

	boolean

	boolean
@@ -84,6 +63,27 @@ config USB_ARCH_HAS_XHCI 
	boolean

	boolean

	default PCI

	default PCI





if USB_SUPPORT



config USB_COMMON

	tristate

	default y

	depends on USB || USB_GADGET



# Host-side USB depends on having a host controller

# NOTE:  dummy_hcd is always an option, but it's ignored here ...

# NOTE:  SL-811 option should be board-specific ...

config USB_ARCH_HAS_HCD

	boolean

	default y if USB_ARCH_HAS_OHCI

	default y if USB_ARCH_HAS_EHCI

	default y if USB_ARCH_HAS_XHCI

	default y if PCMCIA && !M32R			# sl811_cs

	default y if ARM				# SL-811

	default y if BLACKFIN				# SL-811

	default y if SUPERH				# r8a66597-hcd

	default PCI



# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.

# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.

config USB

config USB

	tristate "Support for Host-side USB"

	tristate "Support for Host-side USB"