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

Commit 900e0621 authored by David Daney's avatar David Daney Committed by Greg Kroah-Hartman
Browse files

usb: Move definition of USB_EHCI_BIG_ENDIAN_MMIO et al. out side of the ifs. 



When CONFIG_USB_SUPPORT is not selected we get things like:

scripts/kconfig/mconf Kconfig
warning: (MIPS_SEAD3 && PMC_MSP && CPU_CAVIUM_OCTEON) selects USB_EHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)

It is much cleaner to make the various system Kconfigs select
USB_EHCI_BIG_ENDIAN_MMIO rather than move the system config
information into USB's Kconfig, but the warnings are annoying.

Eliminate the warning by moving the definition of
USB_EHCI_BIG_ENDIAN_MMIO outside of all the Kconfig if statements.
While we are at it move USB_OHCI_BIG_ENDIAN_DESC,
USB_OHCI_BIG_ENDIAN_MMIO, USB_OHCI_LITTLE_ENDIAN and
USB_EHCI_BIG_ENDIAN_DESC too, as they could very well suffer similar
problems for other systems.

Get rid of the redundant "default n" in USB_OHCI_BIG_ENDIAN_DESC and
USB_OHCI_BIG_ENDIAN_MMIO

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cffedd67

drivers/usb/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -6,9 +6,26 @@ 
config USB_ARCH_HAS_OHCI

	bool



config USB_OHCI_BIG_ENDIAN_DESC

	bool



config USB_OHCI_BIG_ENDIAN_MMIO

	bool



config USB_OHCI_LITTLE_ENDIAN

	bool

	default n if STB03xxx || PPC_MPC52xx

	default y



config USB_ARCH_HAS_EHCI

	bool



config USB_EHCI_BIG_ENDIAN_MMIO

	bool



config USB_EHCI_BIG_ENDIAN_DESC

	bool



config USB_ARCH_HAS_XHCI

	bool

drivers/usb/host/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -113,12 +113,6 @@ config USB_EHCI_HCD_PMC_MSP 
		Enables support for the onchip USB controller on the PMC_MSP7100 Family SoC's.

		If unsure, say N.



config USB_EHCI_BIG_ENDIAN_MMIO

	bool



config USB_EHCI_BIG_ENDIAN_DESC

	bool



config XPS_USB_HCD_XILINX

	bool "Use Xilinx usb host EHCI controller core"

	depends on (PPC32 || MICROBLAZE)
@@ -509,20 +503,6 @@ config USB_OCTEON_OHCI 
	  controller.  It is needed for low-speed USB 1.0 device

	  support.  All CN6XXX based chips with USB are supported.





config USB_OHCI_BIG_ENDIAN_DESC

	bool

	default n



config USB_OHCI_BIG_ENDIAN_MMIO

	bool

	default n



config USB_OHCI_LITTLE_ENDIAN

	bool

	default n if STB03xxx || PPC_MPC52xx

	default y



endif # USB_OHCI_HCD



config USB_UHCI_HCD