Re: [PATCH] [2/5+1] menu -> menuconfig part 1

[randy_dunlap]

On Sun, 17 Jul 2005 13:31:23 +0200 (CEST) Bodo Eggert wrote:

> On Sun, 17 Jul 2005, Bodo Eggert wrote:
> 
> > These patches change some menus into menuconfig options.
> > 
> > Reworked to apply to linux-2.6.13-rc3-git3
> 
> The USB menu.

The USB Gadgets menu is also wacky.

  ? ? <*> USB Gadgets (device side)  ---> ? ?
  ? ? USB Peripheral Controller (NetChip 2280)  --->  ? ?
  ? ?   NetChip 2280 (NEW)? ?
  ? ?  USB Gadget Drivers  ? ?
  ? ? < >   Gadget Zero (DEVELOPMENT) (NEW)   ? ?
  ? ? < >   Ethernet Gadget (with CDC Ethernet support) (NEW) ? ?
  ? ? < >   Gadget Filesystem (EXPERIMENTAL) (NEW)? ?
  ? ? < >   File-backed Storage Gadget (NEW)  ? ?
  ? ? < >   Serial Gadget (with CDC ACM support) (NEW)

Those should all be visible only after pressing Enter on the
USB Gadgets menu item; they should not be expanded inline
in the Device Drivers menu.

---
~Randy
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] [2/5+1] menu -> menuconfig part 1

[Bodo Eggert]

On Sun, 17 Jul 2005, Bodo Eggert wrote:

> These patches change some menus into menuconfig options.
> 
> Reworked to apply to linux-2.6.13-rc3-git3

The USB menu.

 drivers/usb/Kconfig |   18 ++
 drivers/usb/atm/Kconfig |7 +--
 drivers/usb/class/Kconfig   |   11 ---
 drivers/usb/core/Kconfig|   11 ---
 drivers/usb/gadget/Kconfig  |8 ++--
 drivers/usb/host/Kconfig|8 +++-
 drivers/usb/image/Kconfig   |5 ++---
 drivers/usb/input/Kconfig   |2 --
 drivers/usb/media/Kconfig   |   24 +++-
 drivers/usb/misc/Kconfig|   17 -
 drivers/usb/net/Kconfig |   11 +++
 drivers/usb/serial/Kconfig  |1 -
 drivers/usb/storage/Kconfig |2 --
 13 files changed, 48 insertions(+), 77 deletions(-)

Signed-Off-By: Bodo Eggert <[EMAIL PROTECTED]>

diff -rNup a/drivers/usb/Kconfig b/drivers/usb/Kconfig
--- a/drivers/usb/Kconfig   2005-07-17 08:09:02.0 +0200
+++ b/drivers/usb/Kconfig   2005-07-17 10:47:59.0 +0200
@@ -2,8 +2,6 @@
 # USB device configuration
 #
 
-menu "USB support"
-
 # 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 ...
@@ -29,9 +27,12 @@ config USB_ARCH_HAS_OHCI
# more:
default PCI
 
+comment "USB (host side) may require PCI"
+   depends on !USB_ARCH_HAS_HCD && !PCI
+
 # ARM SA chips have a non-PCI based "OHCI-compatible" USB host interface.
-config USB
-   tristate "Support for Host-side USB"
+menuconfig USB
+   tristate "USB (host side)"
depends on USB_ARCH_HAS_HCD
---help---
  Universal Serial Bus (USB) is a specification for a serial bus
@@ -65,6 +66,8 @@ config USB
  To compile this driver as a module, choose M here: the
  module will be called usbcore.
 
+if USB
+
 source "drivers/usb/core/Kconfig"
 
 source "drivers/usb/host/Kconfig"
@@ -84,11 +87,10 @@ source "drivers/usb/net/Kconfig"
 source "drivers/usb/mon/Kconfig"
 
 comment "USB port drivers"
-   depends on USB
 
 config USB_USS720
tristate "USS720 parport driver"
-   depends on USB && PARPORT
+   depends on PARPORT
select PARPORT_NOT_PC
---help---
  This driver is for USB parallel port adapters that use the Lucent
@@ -121,7 +123,7 @@ source "drivers/usb/misc/Kconfig"
 
 source "drivers/usb/atm/Kconfig"
 
-source "drivers/usb/gadget/Kconfig"
+endif
 
-endmenu
+source "drivers/usb/gadget/Kconfig"
 
diff -rNup a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig
--- a/drivers/usb/atm/Kconfig   2005-07-17 08:10:01.0 +0200
+++ b/drivers/usb/atm/Kconfig   2005-07-17 11:11:22.0 +0200
@@ -2,10 +2,7 @@
 # USB/ATM DSL configuration
 #
 
-menu "USB DSL modem support"
-   depends on USB
-
-config USB_ATM
+menuconfig USB_ATM
tristate "USB DSL modem support"
depends on USB && ATM
select CRC32
@@ -56,5 +53,3 @@ config USB_XUSBATM
 
  To compile this driver as a module, choose M here: the
  module will be called xusbatm.
-
-endmenu
diff -rNup a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
--- a/drivers/usb/class/Kconfig 2005-07-17 08:06:24.0 +0200
+++ b/drivers/usb/class/Kconfig 2005-07-17 10:48:06.0 +0200
@@ -2,11 +2,10 @@
 # USB Class driver configuration
 #
 comment "USB Device Class drivers"
-   depends on USB
 
 config USB_AUDIO
tristate "USB Audio support"
-   depends on USB && SOUND
+   depends on SOUND
help
  Say Y here if you want to connect USB audio equipment such as
  speakers to your computer's USB port. You only need this if you use
@@ -16,11 +15,11 @@ config USB_AUDIO
  module will be called audio.
 
 comment "USB Bluetooth TTY can only be used with disabled Bluetooth subsystem"
-   depends on USB && BT
+   depends on BT
 
 config USB_BLUETOOTH_TTY
tristate "USB Bluetooth TTY support"
-   depends on USB && BT=n
+   depends on BT=n
---help---
  This driver implements a nonstandard tty interface to a Bluetooth
  device that can be used only by specialized Bluetooth HCI software.
@@ -40,7 +39,7 @@ config USB_BLUETOOTH_TTY
 
 config USB_MIDI
tristate "USB MIDI support"
-   depends on USB && SOUND
+   depends on SOUND
---help---
  Say Y here if you want to connect a USB MIDI device to your
  computer's USB port. This driver is for devices that comply with
@@ -61,7 +60,6 @@ config USB_MIDI
 
 config USB_ACM
tristate "USB Modem (CDC ACM) support"
-   depends on USB
---help---
  This driver supports USB modems and ISDN adapters which support the
  Communication Device Class Abstract Control Model interface.
@@ -76,7 +74,6 @@ config USB_ACM
 
 config USB_PRINTER
tristate "USB Printer support"
-   depends