ChangeSet 1.1148.6.20, 2003/10/24 14:00:57-07:00, [EMAIL PROTECTED]
[PATCH] USB: usb gadget Config.in updates
This is a subset of work from Al Borchers <[EMAIL PROTECTED]>
which he sent as part of his "serial" gadget driver.
The patch eliminates some of the mis-configurations that are possible
with the 2.4 kconfig syntax.
drivers/usb/gadget/Config.in | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff -Nru a/drivers/usb/gadget/Config.in b/drivers/usb/gadget/Config.in
--- a/drivers/usb/gadget/Config.in Fri Oct 24 17:00:44 2003
+++ b/drivers/usb/gadget/Config.in Fri Oct 24 17:00:44 2003
@@ -5,6 +5,8 @@
# Long term, this likely doesn't all belong in one directory
# Plan to split it up eventually.
#
+# CAREFUL! Some versions of "xconfig" don't execute this correctly.
+#
mainmenu_option next_comment
comment 'Support for USB gadgets'
@@ -18,11 +20,14 @@
comment 'USB Peripheral Controller Drivers'
# assume all the dependencies may be undefined ("== true", yeech)
+ define_tristate CONFIG_USB_GADGET_CONTROLLER n
if [ "$CONFIG_PCI" = "y" ] ; then
tristate ' NetChip 2280 support' CONFIG_USB_NET2280
define_tristate CONFIG_USB_GADGET_CONTROLLER $CONFIG_USB_NET2280
fi
+ # pxa2xx_udc, goku_udc, and others also work on 2.4 ...
+
if [ "$CONFIG_USB_GADGET_CONTROLLER" = "y" -o "$CONFIG_USB_GADGET_CONTROLLER" = "m"
] ; then
#
@@ -44,25 +49,28 @@
if [ "$CONFIG_USB_ZERO" = "y" -o "$CONFIG_USB_ZERO" = "m" ]; then
if [ "$CONFIG_USB_NET2280" = "y" -o "$CONFIG_USB_NET2280" = "m" ]; then
define_bool CONFIG_USB_ZERO_NET2280 y
- fi
- if [ "$CONFIG_USB_PXA2XX" = "y" -o "$CONFIG_USB_PXA2XX" = "m" ]; then
+ else if [ "$CONFIG_USB_PXA2XX" = "y" -o "$CONFIG_USB_PXA2XX" = "m" ]; then
define_bool CONFIG_USB_ZERO_PXA2XX y
- fi
+ else if [ "$CONFIG_USB_GOKU" = "y" -o "$CONFIG_USB_GOKU" = "m" ]; then
+ define_bool CONFIG_USB_ZERO_GOKU y
+ fi fi fi
# ...
fi
- dep_tristate ' Ethernet Gadget (EXPERIMENTAL)' CONFIG_USB_ETH
$CONFIG_USB_GADGET_CONTROLLER
+ dep_tristate ' Ethernet Gadget (EXPERIMENTAL)' CONFIG_USB_ETH
$CONFIG_USB_GADGET_CONTROLLER $CONFIG_NET
if [ "$CONFIG_USB_ETH" = "y" -o "$CONFIG_USB_ETH" = "m" ]; then
if [ "$CONFIG_USB_NET2280" = "y" -o "$CONFIG_USB_NET2280" = "m" ]; then
define_bool CONFIG_USB_ETH_NET2280 y
- fi
- if [ "$CONFIG_USB_PXA2XX" = "y" -o "$CONFIG_USB_PXA2XX" = "m" ]; then
+ else if [ "$CONFIG_USB_PXA2XX" = "y" -o "$CONFIG_USB_PXA2XX" = "m" ]; then
define_bool CONFIG_USB_ETH_PXA2XX y
- fi
+ else if [ "$CONFIG_USB_GOKU" = "y" -o "$CONFIG_USB_GOKU" = "m" ]; then
+ define_bool CONFIG_USB_ETH_GOKU y
+ fi fi fi
# ...
fi
- # ... or other gadget drivers: printer class, storage, hid, etc ...
+
+ # ... or other gadget drivers: printer class, hid, etc ...
fi
fi
-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community? Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
