Le 28/01/2013 20:29, David Daney a écrit :
On 01/28/2013 11:06 AM, Florian Fainelli wrote:This configuration symbol can be used by CPUs supporting the on-chip EHCI controller, and ensures that all relevant EHCI-related configuration options are selected. So far BCM6328, BCM6358 and BCM6368 have an EHCI controller and do select this symbol. Update drivers/usb/host/Kconfig with BCM63XX to update direct unmet dependencies. Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx> --- arch/mips/bcm63xx/Kconfig | 9 +++++++++ drivers/usb/host/Kconfig | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig index 23b1ffd..b899359 100644 --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig @@ -7,10 +7,17 @@ config BCM63XX_OHCI select USB_OHCI_BIG_ENDIAN_DESC if USB_OHCI_HCD select USB_OHCI_BIG_ENDIAN_MMIO if USB_OHCI_HCD +config BCM63XX_EHCI + bool + select USB_ARCH_HAS_EHCI + select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD + select USB_EHCI_BIG_ENDIAN_MMIO if USB_EHCI_HCD + config BCM63XX_CPU_6328 bool "support 6328 CPU" select HW_HAS_PCI select BCM63XX_OHCI + select BCM63XX_EHCI[...]diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index d6bb128..e16b2cb 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -115,14 +115,15 @@ config USB_EHCI_BIG_ENDIAN_MMIO depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || \ ARCH_IXP4XX || XPS_USB_HCD_XILINX || \ PPC_MPC512x || CPU_CAVIUM_OCTEON || \ - PMC_MSP || SPARC_LEON || MIPS_SEAD3) + PMC_MSP || SPARC_LEON || MIPS_SEAD3 || \ + BCM63XX) default yThis is a complete mess. Can we get rid of the 'default y' and all those things after the '&&', and select USB_EHCI_BIG_ENDIAN_MMIO in the board Kconfig files?
Yes, pretty much like what exists for OHCI, scales much better.
I am as guilty as anyone here (see || CPU_CAVIUM_OCTEON above). But this doesn't seem sustainable. We should be trying to keep the configuration information for all this in one spot. Now you have it spread across two files. One to enable it, and the other to select it. But do you really need to select it if it defaults to 'y'
I do agree with you, but I don't want this patchset to be blocked by the removal of the depends on (FOO && BAR && ...), but I can send a preliminary patch for this and get it merged with Greg's tree first.
config USB_EHCI_BIG_ENDIAN_DESC bool depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX || \ PPC_MPC512x || PMC_MSP || SPARC_LEON || \ - MIPS_SEAD3) + MIPS_SEAD3 || BCM63XX) default ySame here. Thanks, David (on a mission against Kconfig insanity) Daney
