Skip to contentSkip to conversation

menuconfig looks funny since recently, i.e. USB gains on importance :)

PATCH In review Borislav Petkov 6 participants 9 messages Mar 30, 2012 USB

lore
Share & tools
lore

Borislav Petkov

author
#0 lore raw

Hi guys,

Linus tree from today gives the following in menuconfig:

...

  │ │                            Graphics support  --->
  │ │                        < > Sound card support  --->
  │ │                        [*] HID Devices  --->
  │ │                        [*] USB support  --->
  │ │                        <*> Support for Host-side USB
  │ │                        [ ]   USB verbose debug messages
  │ │                        [*]   USB announce new devices
  │ │                              *** Miscellaneous USB options ***
  │ │                        [ ]   USB device filesystem (DEPRECATED)
  │ │                        [ ]   USB device class-devices (DEPRECATED)
  │ │                        [ ]   Dynamic USB minor allocation
  │ │                        [*]   USB runtime power management (autosuspend) and wakeup
  │ │                        [ ]     OTG support
  │ │                        <*> USB Monitor
  │ │                        < > Support WUSB Cable Based Association (CBA)
  │ │                            *** USB Host Controller Drivers ***
  │ │                        < > Cypress C67x00 HCD support
  │ │                        <M> xHCI HCD (USB 3.0) support (EXPERIMENTAL)
  │ │                        [ ]   Debugging for the xHCI host controller
  │ │                        <M> EHCI HCD (USB 2.0) support
  │ │
  │ │                        [ ]   Root Hub Transaction Translators
  │ │                        [ ]   Improved Transaction Translator scheduling
  │ │                        < > OXU210HP HCD support
  │ │                        < > ISP116X HCD support
  │ │                        < > ISP 1760 HCD support
  │ │                        < > ISP1362 HCD support
  │ │                        <M> OHCI HCD support

...

This is the "Device Drivers" menu and all the USB-related options should appear in the submenu "USB support" but they're merged with the "Device Drivers" menu. Looks like someone funnied up Kconfig somewhere...

Thanks.

Signature · 2 lines
Regards/Gruss,
Boris.
#2 lore raw

PATCH 1/1 Fix USB Kconfig

In reply to Borislav Petkov

Fix menuconfig option for USB.

Signed-off-by Rupesh Gujare <[email protected]>
Reported-by Borislav Petkov <[email protected]>
---
 drivers/usb/Kconfig |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/usb/Kconfig +7 -7
index cbd8f5f..884f3fa 100644
@@ -10,6 +10,13 @@ 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
+
 # many non-PCI SOC chips embed OHCI
 config USB_ARCH_HAS_OHCI
 	boolean

@@ -63,13 +70,6 @@ config USB_ARCH_HAS_XHCI
 	boolean
 	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 ...
Signature · 1 line
1.7.5.4
author
#3 lore raw

Re: [PATCH] Fix USB Kconfig

Quoted 30 lines · Rupesh Gujare

Fix menuconfig option for USB.

Signed-off-by Rupesh Gujare <[email protected]>
Reported-by Borislav Petkov <[email protected]>
---
 drivers/usb/Kconfig |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/usb/Kconfig +7 -0
index cbd8f5f..884f3fa 100644
@@ -10,6 +10,13 @@ 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
+
 # many non-PCI SOC chips embed OHCI
 config USB_ARCH_HAS_OHCI
 	boolean

@@ -63,13 +70,6 @@ config USB_ARCH_HAS_XHCI
 	boolean
 	default PCI

drivers/usb/Kconfig config USB_ARCH_HAS_XHCI · line 75

Quoted 10 lines
drivers/usb/Kconfig +0 -7
-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 ...

Reportedly, there's a fix for this already, see thread at
http://marc.info/?l=linux-usb&m=133310173203793&w=2

Thanks.

Signature · 2 lines
Regards/Gruss,
Boris.
#5 lore raw
In reply to Borislav Petkov
Quoted 34 lines · Borislav Petkov

Hi guys,

Linus tree from today gives the following in menuconfig:

...

  │ │                            Graphics support  --->
  │ │                        < > Sound card support  --->
  │ │                        [*] HID Devices  --->
  │ │                        [*] USB support  --->
  │ │                        <*> Support for Host-side USB
  │ │                        [ ]   USB verbose debug messages
  │ │                        [*]   USB announce new devices
  │ │                              *** Miscellaneous USB options ***
  │ │                        [ ]   USB device filesystem (DEPRECATED)
  │ │                        [ ]   USB device class-devices (DEPRECATED)
  │ │                        [ ]   Dynamic USB minor allocation
  │ │                        [*]   USB runtime power management (autosuspend) and wakeup
  │ │                        [ ]     OTG support
  │ │                        <*> USB Monitor
  │ │                        < > Support WUSB Cable Based Association (CBA)
  │ │                            *** USB Host Controller Drivers ***
  │ │                        < > Cypress C67x00 HCD support
  │ │                        <M> xHCI HCD (USB 3.0) support (EXPERIMENTAL)
  │ │                        [ ]   Debugging for the xHCI host controller
  │ │                        <M> EHCI HCD (USB 2.0) support
  │ │
  │ │                        [ ]   Root Hub Transaction Translators
  │ │                        [ ]   Improved Transaction Translator scheduling
  │ │                        < > OXU210HP HCD support
  │ │                        < > ISP116X HCD support
  │ │                        < > ISP 1760 HCD support
  │ │                        < > ISP1362 HCD support
  │ │                        <M> OHCI HCD support
Quoted 5 lines

...

This is the "Device Drivers" menu and all the USB-related options should appear in the submenu "USB support" but they're merged with the "Device Drivers" menu. Looks like someone funnied up Kconfig somewhere...

Caued by 53c6bc24fdc, adding David Daney.

Signature · 2 lines
Jiri Kosina
SUSE Labs
#8 lore raw
Quoted 10 lines · David Daney
Quoted 6 lines · Borislav Petkov
Quoted 1 line · Jiri Kosina

Caued by 53c6bc24fdc, adding David Daney.

Thanks to all for the swift help, fixed by
http://marc.info/?l=linux-kernel&m=133245014825438&w=2

That's right. One would hope Greg Kroah-Hartman would send that patch on its way soon.

I will once 3.4-rc1 is out.

thanks,

greg k-h