lkml.org 
[lkml]   [2012]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] usb: Don't make USB_ARCH_HAS_OHCI and USB_ARCH_HAS_EHCI depend on USB_SUPPORT.
    Date
    From: David Daney <david.daney@cavium.com>

    The fact that an architecture/board has 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: David Daney <david.daney@cavium.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/usb/Kconfig | 42 +++++++++++++++++++++---------------------
    1 files changed, 21 insertions(+), 21 deletions(-)

    diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
    index 0b0afc8..b9ffe6e 100644
    --- a/drivers/usb/Kconfig
    +++ b/drivers/usb/Kconfig
    @@ -10,27 +10,6 @@ menuconfig USB_SUPPORT
    This option adds core support for Universal Serial Bus (USB).
    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
    config USB_ARCH_HAS_OHCI
    boolean
    @@ -79,6 +58,27 @@ config USB_ARCH_HAS_EHCI
    default y if MACH_LOONGSON1
    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
    +
    # some non-PCI HCDs implement xHCI
    config USB_ARCH_HAS_XHCI
    boolean
    --
    1.7.2.3


    \
     
     \ /
      Last update: 2012-03-12 20:05    [W:0.030 / U:95.192 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site