[ifxmips] uboot only builds with gcc 3.4.6

[openwrt.git] / package / kernel / modules / usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index af41339..c962e34 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -1,239 +1,851 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 

-USBMENU:=USB Support
+USB_MENU:=USB Support
+
+ifneq ($(CONFIG_LINUX_2_4),)
+  USBNET_DIR:=usb/net
+endif
+
+USBNET_DIR?=net/usb
+USBHID_DIR?=hid/usbhid
+USBINPUT_DIR?=input/misc

 
 define KernelPackage/usb-core
 
 define KernelPackage/usb-core

+  SUBMENU:=$(USB_MENU)

   TITLE:=Support for USB
   TITLE:=Support for USB

-  DESCRIPTION:=Kernel support for USB
-  DEPENDS:=@USB_SUPPORT
-  KCONFIG:=$(CONFIG_USB)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(USBMENU)
-  AUTOLOAD:=$(call AutoLoad,20,usb-core)
+  DEPENDS:=@USB_SUPPORT +LINUX_2_6_31:kmod-nls-base +LINUX_2_6_32:kmod-nls-base +LINUX_2_6_33:kmod-nls-base
+  KCONFIG:=CONFIG_USB
+  AUTOLOAD:=$(call AutoLoad,20,usbcore,1)
+endef
+
+define KernelPackage/usb-core/2.4
+  FILES:=$(LINUX_DIR)/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/usb-core/2.6
+  FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/usb-core/description
+ Kernel support for USB

 endef
 endef

+

 $(eval $(call KernelPackage,usb-core))
 
 
 $(eval $(call KernelPackage,usb-core))
 
 

+define KernelPackage/usb/Depends
+  SUBMENU:=$(USB_MENU)
+  DEPENDS:=kmod-usb-core $(1)
+endef
+
+

 define KernelPackage/usb-uhci
 define KernelPackage/usb-uhci

+$(call KernelPackage/usb/Depends,)

   TITLE:=Support for UHCI controllers
   TITLE:=Support for UHCI controllers

-  DESCRIPTION:=Kernel support for USB UHCI controllers
-  DEPENDS:=kmod-usb-core
-  PROVIDES:=usb-controller
-  SUBMENU:=$(USBMENU)
+  KCONFIG:= \
+       CONFIG_USB_UHCI_ALT \
+       CONFIG_USB_UHCI_HCD

 endef
 
 define KernelPackage/usb-uhci/2.4
 endef
 
 define KernelPackage/usb-uhci/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/uhci.o
-  KCONFIG:=$(CONFIG_USB_UHCI_ALT)
-  AUTOLOAD:=$(call AutoLoad,50,uhci)
+#  KCONFIG:=CONFIG_USB_UHCI_ALT
+  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o
+  AUTOLOAD:=$(call AutoLoad,50,uhci,1)

 endef
 
 define KernelPackage/usb-uhci/2.6
 endef
 
 define KernelPackage/usb-uhci/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko
-  KCONFIG:=$(CONFIG_USB_UHCI_HCD)
-  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
+#  KCONFIG:=CONFIG_USB_UHCI_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
+  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd,1)
+endef
+
+define KernelPackage/usb-uhci/description
+ Kernel support for USB UHCI controllers
+endef
+
+$(eval $(call KernelPackage,usb-uhci,1))
+
+
+define KernelPackage/usb-uhci-iv
+$(call KernelPackage/usb/Depends,@LINUX_2_4)
+  TITLE:=Support for Intel/VIA UHCI controllers
+  KCONFIG:=CONFIG_USB_UHCI
+  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,usb-uhci,1)

 endef
 endef

-$(eval $(call KernelPackage,usb-uhci))
+
+define KernelPackage/usb-uhci-iv/description
+ Kernel support for Intel/VIA USB UHCI controllers
+endef
+
+$(eval $(call KernelPackage,usb-uhci-iv,1))

 
 
 define KernelPackage/usb-ohci
 
 
 define KernelPackage/usb-ohci

+$(call KernelPackage/usb/Depends,)

   TITLE:=Support for OHCI controllers
   TITLE:=Support for OHCI controllers

-  DESCRIPTION:=Kernel support for USB OHCI controllers
-  DEPENDS:=kmod-usb-core
-  PROVIDES:=usb-controller
-  SUBMENU:=$(USBMENU)
+  KCONFIG:= \
+       CONFIG_USB_OHCI \
+       CONFIG_USB_OHCI_HCD \
+       CONFIG_USB_OHCI_AR71XX=y

 endef
 
 define KernelPackage/usb-ohci/2.4
 endef
 
 define KernelPackage/usb-ohci/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o
-  KCONFIG:=$(CONFIG_USB_OHCI)
-  AUTOLOAD:=$(call AutoLoad,50,usb-ohci)
+#  KCONFIG:=CONFIG_USB_OHCI
+  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-ohci.o
+  AUTOLOAD:=$(call AutoLoad,50,usb-ohci,1)

 endef
 
 define KernelPackage/usb-ohci/2.6
 endef
 
 define KernelPackage/usb-ohci/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko
-  KCONFIG:=$(CONFIG_USB_OHCI_HCD)
-  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
+#  KCONFIG:=CONFIG_USB_OHCI_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
+  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1)

 endef
 endef

-$(eval $(call KernelPackage,usb-ohci))
+
+define KernelPackage/usb-ohci/description
+ Kernel support for USB OHCI controllers
+endef
+
+$(eval $(call KernelPackage,usb-ohci,1))
+
+
+define KernelPackage/usb-adm5120
+$(call KernelPackage/usb/Depends,@TARGET_adm5120_router_be||@TARGET_adm5120_router_le)
+  TITLE:=Support for the ADM5120 HCD controller
+  KCONFIG:=CONFIG_USB_ADM5120_HCD
+  FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,adm5120-hcd,1)
+endef
+
+define KernelPackage/usb-adm5120/description
+ Kernel support for the ADM5120 HCD USB controller
+endef
+
+$(eval $(call KernelPackage,usb-adm5120))
+
+define KernelPackage/usb-etrax
+$(call KernelPackage/usb/Depends,@TARGET_etrax)
+  TITLE:=Support for the ETRAX USB host controller
+  KCONFIG:=CONFIG_ETRAX_USB_HOST \
+       CONFIG_ETRAX_USB_HOST_PORT1=y CONFIG_ETRAX_USB_HOST_PORT2=y
+  FILES:=$(LINUX_DIR)/drivers/usb/host/hc-crisv10.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,hc-crisv10,1)
+endef
+
+define KernelPackage/usb-etrax/description
+ Kernel support for the ETRAX USB host controller
+endef
+
+$(eval $(call KernelPackage,usb-etrax))
+
+define KernelPackage/usb-octeon
+$(call KernelPackage/usb/Depends,@TARGET_octeon)
+  TITLE:=Support for the Octeon USB OTG controller
+  KCONFIG:=CONFIG_USB_DWC_OTG
+  FILES:=$(LINUX_DIR)/drivers/usb/host/dwc_otg/dwc_otg.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,dwc_otg)
+endef
+
+define KernelPackage/usb-octeon/description
+  Kernel support for the Octeon USB host controller
+endef
+
+$(eval $(call KernelPackage,usb-octeon))

 
 
 define KernelPackage/usb2
 
 
 define KernelPackage/usb2

+$(call KernelPackage/usb/Depends,)

   TITLE:=Support for USB2 controllers
   TITLE:=Support for USB2 controllers

-  DESCRIPTION:=Kernel support for USB2 (EHCI) controllers
-  DEPENDS:=kmod-usb-core
-  PROVIDES:=usb-controller
-  KCONFIG:=$(CONFIG_USB)
-  SUBMENU:=$(USBMENU)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_USB_EHCI_HCD)
-  AUTOLOAD:=$(call AutoLoad,50,ehci-hcd)
+  KCONFIG:=CONFIG_USB_EHCI_HCD \
+    CONFIG_USB_EHCI_AR71XX=y
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1)

 endef
 endef

-$(eval $(call KernelPackage,usb2))
-

 
 

-define usbdep
-  SUBMENU:=$(USBMENU)
-  DEPENDS:=kmod-usb-core usb-controller $(1)
+define KernelPackage/usb2/description
+ Kernel support for USB2 (EHCI) controllers

 endef
 
 endef
 

+$(eval $(call KernelPackage,usb2))
+

 
 define KernelPackage/usb-acm
 
 define KernelPackage/usb-acm

-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)

   TITLE:=Support for modems/isdn controllers
   TITLE:=Support for modems/isdn controllers

-  DESCRIPTION:=Kernel support for USB ACM devices (modems/isdn controllers)
-  KCONFIG:=$(CONFIG_USB_ACM)
+  KCONFIG:=CONFIG_USB_ACM

 endef
 
 define KernelPackage/usb-acm/2.4
 endef
 
 define KernelPackage/usb-acm/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/acm.o
+  FILES:=$(LINUX_DIR)/drivers/usb/acm.o

   AUTOLOAD:=$(call AutoLoad,60,acm)
 endef
 
 define KernelPackage/usb-acm/2.6
   AUTOLOAD:=$(call AutoLoad,60,acm)
 endef
 
 define KernelPackage/usb-acm/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko
+  FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko

   AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
 endef
   AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
 endef

+
+define KernelPackage/usb-acm/description
+ Kernel support for USB ACM devices (modems/isdn controllers)
+endef
+

 $(eval $(call KernelPackage,usb-acm))
 
 
 define KernelPackage/usb-audio
 $(eval $(call KernelPackage,usb-acm))
 
 
 define KernelPackage/usb-audio

-  $(call usbdep,+kmod-soundcore)
-  TITLE:=Support for audio devices
-  DESCRIPTION:=Kernel support for USB audio devices
-  KCONFIG:=$(CONFIG_USB_AUDIO)
-  AUTOLOAD:=$(call AutoLoad,60,audio)
+$(call KernelPackage/usb/Depends,+kmod-sound-core)
+  TITLE:=Support for USB audio devices
+  KCONFIG:= \
+       CONFIG_USB_AUDIO \
+       CONFIG_SND_USB_AUDIO

 endef
 
 define KernelPackage/usb-audio/2.4
 endef
 
 define KernelPackage/usb-audio/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/audio.o
+#  KCONFIG:=CONFIG_USB_AUDIO
+  FILES:=$(LINUX_DIR)/drivers/usb/audio.o
+  AUTOLOAD:=$(call AutoLoad,60,audio)

 endef
 
 define KernelPackage/usb-audio/2.6
 endef
 
 define KernelPackage/usb-audio/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/audio.ko
+#  KCONFIG:=CONFIG_SND_USB_AUDIO
+  FILES:= \
+       $(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
+       $(LINUX_DIR)/sound/usb/snd-usb-audio.ko
+  AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)

 endef
 endef

+
+define KernelPackage/usb-audio/description
+ Kernel support for USB audio devices
+endef
+

 $(eval $(call KernelPackage,usb-audio))
 
 
 define KernelPackage/usb-printer
 $(eval $(call KernelPackage,usb-audio))
 
 
 define KernelPackage/usb-printer

-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)

   TITLE:=Support for printers
   TITLE:=Support for printers

-  DESCRIPTION:=Kernel support for USB printers
-  KCONFIG:=$(CONFIG_USB_PRINTER)
+  KCONFIG:=CONFIG_USB_PRINTER

 endef
 
 define KernelPackage/usb-printer/2.4
 endef
 
 define KernelPackage/usb-printer/2.4

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/printer.o
+  FILES:=$(LINUX_DIR)/drivers/usb/printer.o

   AUTOLOAD:=$(call AutoLoad,60,printer)
 endef
 
 define KernelPackage/usb-printer/2.6
   AUTOLOAD:=$(call AutoLoad,60,printer)
 endef
 
 define KernelPackage/usb-printer/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko
+  FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko

   AUTOLOAD:=$(call AutoLoad,60,usblp)
 endef
   AUTOLOAD:=$(call AutoLoad,60,usblp)
 endef

+
+define KernelPackage/usb-printer/description
+ Kernel support for USB printers
+endef
+

 $(eval $(call KernelPackage,usb-printer))
 
 
 define KernelPackage/usb-serial
 $(eval $(call KernelPackage,usb-printer))
 
 
 define KernelPackage/usb-serial

-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,)

   TITLE:=Support for USB-to-Serial converters
   TITLE:=Support for USB-to-Serial converters

-  DESCRIPTION:=Kernel support for USB-to-Serial converters
-  KCONFIG:=$(CONFIG_USB_SERIAL)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,60,usbserial)
 endef
   AUTOLOAD:=$(call AutoLoad,60,usbserial)
 endef

+
+define KernelPackage/usb-serial/description
+ Kernel support for USB-to-Serial converters
+endef
+

 $(eval $(call KernelPackage,usb-serial))
 
 
 $(eval $(call KernelPackage,usb-serial))
 
 

+define KernelPackage/usb-serial/Depends
+  SUBMENU:=$(USB_MENU)
+  DEPENDS:=kmod-usb-serial $(1)
+endef
+
+
+define KernelPackage/usb-serial-airprime
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
+  TITLE:=Support for Airprime (EVDO)
+  KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,airprime)
+endef
+
+define KernelPackage/usb-serial-airprime/description
+ Kernel support for Airprime (EVDO)
+endef
+
+$(eval $(call KernelPackage,usb-serial-airprime))
+
+

 define KernelPackage/usb-serial-belkin
 define KernelPackage/usb-serial-belkin

+$(call KernelPackage/usb-serial/Depends,)

   TITLE:=Support for Belkin devices
   TITLE:=Support for Belkin devices

-  DESCRIPTION:=Kernel support for Belkin USB-to-Serial converters
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_BELKIN)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_BELKIN
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,65,belkin_sa)
 endef
   AUTOLOAD:=$(call AutoLoad,65,belkin_sa)
 endef

+
+define KernelPackage/usb-serial-belkin/description
+ Kernel support for Belkin USB-to-Serial converters
+endef
+

 $(eval $(call KernelPackage,usb-serial-belkin))
 
 
 $(eval $(call KernelPackage,usb-serial-belkin))
 
 

+define KernelPackage/usb-serial-ch341
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
+  TITLE:=Support for CH341 devices
+  KCONFIG:=CONFIG_USB_SERIAL_CH341
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,ch341)
+endef
+
+define KernelPackage/usb-serial-belkin/description
+ Kernel support for Winchiphead CH341 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-ch341))
+
+

 define KernelPackage/usb-serial-ftdi
 define KernelPackage/usb-serial-ftdi

+$(call KernelPackage/usb-serial/Depends,)

   TITLE:=Support for FTDI devices
   TITLE:=Support for FTDI devices

-  DESCRIPTION:=Kernel support for FTDI USB-to-Serial converters
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_FTDI_SIO)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,65,ftdi_sio)
 endef
   AUTOLOAD:=$(call AutoLoad,65,ftdi_sio)
 endef

+
+define KernelPackage/usb-serial-ftdi/description
+ Kernel support for FTDI USB-to-Serial converters
+endef
+

 $(eval $(call KernelPackage,usb-serial-ftdi))
 
 
 define KernelPackage/usb-serial-mct
 $(eval $(call KernelPackage,usb-serial-ftdi))
 
 
 define KernelPackage/usb-serial-mct

+$(call KernelPackage/usb-serial/Depends,)

   TITLE:=Support for Magic Control Tech. devices
   TITLE:=Support for Magic Control Tech. devices

-  DESCRIPTION:=Kernel support for Magic Control Technology USB-to-Serial converters
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_MCT_U232)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_MCT_U232
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,65,mct_u232)
 endef
   AUTOLOAD:=$(call AutoLoad,65,mct_u232)
 endef

+
+define KernelPackage/usb-serial-mct/description
+ Kernel support for Magic Control Technology USB-to-Serial converters
+endef
+

 $(eval $(call KernelPackage,usb-serial-mct))
 
 $(eval $(call KernelPackage,usb-serial-mct))
 

+

 define KernelPackage/usb-serial-pl2303
 define KernelPackage/usb-serial-pl2303

+$(call KernelPackage/usb-serial/Depends,)

   TITLE:=Support for Prolific PL2303 devices
   TITLE:=Support for Prolific PL2303 devices

-  DESCRIPTION:=Kernel support for Prolific PL2303 USB-to-Serial converters
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_PL2303)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_PL2303
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,65,pl2303)
 endef
   AUTOLOAD:=$(call AutoLoad,65,pl2303)
 endef

+
+define KernelPackage/usb-serial-pl2303/description
+ Kernel support for Prolific PL2303 USB-to-Serial converters
+endef
+

 $(eval $(call KernelPackage,usb-serial-pl2303))
 
 
 $(eval $(call KernelPackage,usb-serial-pl2303))
 
 

+define KernelPackage/usb-serial-cp210x
+$(call KernelPackage/usb-serial/Depends,)
+  TITLE:=Support for Silicon Labs cp210x devices
+  KCONFIG:=CONFIG_USB_SERIAL_CP210X
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,cp210x)
+endef
+
+define KernelPackage/usb-serial-cp210x/description
+ Kernel support for Silicon Labs cp210x USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-cp210x))
+
+
+define KernelPackage/usb-serial-ark3116
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
+  TITLE:=Support for ArkMicroChips ARK3116 devices
+  KCONFIG:=CONFIG_USB_SERIAL_ARK3116
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,ark3116)
+endef
+
+define KernelPackage/usb-serial-ark3116/description
+ Kernel support for ArkMicroChips ARK3116 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-ark3116))
+
+
+define KernelPackage/usb-serial-oti6858
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
+  TITLE:=Support for Ours Technology OTI6858 devices
+  KCONFIG:=CONFIG_USB_SERIAL_OTI6858
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,oti6858)
+endef
+
+define KernelPackage/usb-serial-oti6858/description
+ Kernel support for Ours Technology OTI6858 USB-to-Serial converters
+endef
+
+$(eval $(call KernelPackage,usb-serial-oti6858))
+
+
+define KernelPackage/usb-serial-sierrawireless
+$(call KernelPackage/usb-serial/Depends,)
+  TITLE:=Support for Sierra Wireless devices
+  KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,sierra)
+endef
+
+define KernelPackage/usb-serial-sierrawireless/description
+ Kernel support for Sierra Wireless devices
+endef
+
+$(eval $(call KernelPackage,usb-serial-sierrawireless))
+
+
+define KernelPackage/usb-serial-motorola-phone
+$(call KernelPackage/usb-serial/Depends,)
+  TITLE:=Support for Motorola usb phone
+  KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,moto_modem)
+endef
+
+define KernelPackage/usb-serial-motorola-phone/description
+ Kernel support for Motorola usb phone
+endef
+
+$(eval $(call KernelPackage,usb-serial-motorola-phone))
+
+
+

 define KernelPackage/usb-serial-visor
 define KernelPackage/usb-serial-visor

+$(call KernelPackage/usb-serial/Depends,)

   TITLE:=Support for Handspring Visor devices
   TITLE:=Support for Handspring Visor devices

-  DESCRIPTION:=Kernel support for Handspring Visor PDAs
-  DEPENDS:=kmod-usb-serial
-  SUBMENU:=$(USBMENU)
-  KCONFIG:=$(CONFIG_USB_SERIAL_VISOR)
-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_SERIAL_VISOR
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,65,visor)
 endef
   AUTOLOAD:=$(call AutoLoad,65,visor)
 endef

+
+define KernelPackage/usb-serial-visor/description
+ Kernel support for Handspring Visor PDAs
+endef
+

 $(eval $(call KernelPackage,usb-serial-visor))
 
 
 $(eval $(call KernelPackage,usb-serial-visor))
 
 

+define KernelPackage/usb-serial-keyspan
+$(call KernelPackage/usb-serial/Depends,)
+  TITLE:=Support for Keyspan USB-to-Serial devices
+  KCONFIG:= \
+       CONFIG_USB_SERIAL_KEYSPAN \
+       CONFIG_USB_SERIAL_KEYSPAN_USA28 \
+       CONFIG_USB_SERIAL_KEYSPAN_USA28X \
+       CONFIG_USB_SERIAL_KEYSPAN_USA28XA \
+       CONFIG_USB_SERIAL_KEYSPAN_USA28XB \
+       CONFIG_USB_SERIAL_KEYSPAN_USA19 \
+       CONFIG_USB_SERIAL_KEYSPAN_USA18X \
+       CONFIG_USB_SERIAL_KEYSPAN_USA19W \
+       CONFIG_USB_SERIAL_KEYSPAN_USA19QW \
+       CONFIG_USB_SERIAL_KEYSPAN_USA19QI \
+       CONFIG_USB_SERIAL_KEYSPAN_MPR \
+       CONFIG_USB_SERIAL_KEYSPAN_USA49W \
+       CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,keyspan)
+endef
+
+define KernelPackage/usb-serial-keyspan/description
+ Kernel support for Keyspan USB-to-Serial devices
+endef
+
+$(eval $(call KernelPackage,usb-serial-keyspan))
+
+
+define KernelPackage/usb-serial-option
+$(call KernelPackage/usb-serial/Depends,@LINUX_2_6)
+  TITLE:=Support for Option HSDPA modems
+  KCONFIG:=CONFIG_USB_SERIAL_OPTION
+  FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,option)
+endef
+
+define KernelPackage/usb-serial-option/description
+ Kernel support for Option HSDPA modems
+endef
+
+$(eval $(call KernelPackage,usb-serial-option))
+
+

 define KernelPackage/usb-storage
 define KernelPackage/usb-storage

-  $(call usbdep,)
+$(call KernelPackage/usb/Depends,+!TARGET_x86:kmod-scsi-core)

   TITLE:=USB Storage support
   TITLE:=USB Storage support

-  DESCRIPTION:=Kernel support for USB Mass Storage devices
-  KCONFIG:=$(CONFIG_USB_STORAGE)
-  FILES:= \
-       $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
+  KCONFIG:=CONFIG_USB_STORAGE
+  FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,usb-storage,1)

 endef
 endef

+
+define KernelPackage/usb-storage/description
+ Kernel support for USB Mass Storage devices
+endef
+

 $(eval $(call KernelPackage,usb-storage))
 
 $(eval $(call KernelPackage,usb-storage))
 

+define KernelPackage/usb-storage-extras
+  SUBMENU:=$(USB_MENU)
+  TITLE:=Extra drivers for usb-storage
+  DEPENDS:=@LINUX_2_6 +kmod-usb-storage
+  KCONFIG:= \
+       CONFIG_USB_STORAGE_ALAUDA \
+       CONFIG_USB_STORAGE_CYPRESS_ATACB \
+       CONFIG_USB_STORAGE_DATAFAB \
+       CONFIG_USB_STORAGE_FREECOM \
+       CONFIG_USB_STORAGE_ISD200 \
+       CONFIG_USB_STORAGE_JUMPSHOT \
+       CONFIG_USB_STORAGE_KARMA \
+       CONFIG_USB_STORAGE_SDDR09 \
+       CONFIG_USB_STORAGE_SDDR55 \
+       CONFIG_USB_STORAGE_USBAT
+  FILES:= \
+       $(LINUX_DIR)/drivers/usb/storage/ums-alauda.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-cypress.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-datafab.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-freecom.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-isd200.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-jumpshot.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-karma.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-sddr09.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-sddr55.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/usb/storage/ums-usbat.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,ums-alauda ums-cypress ums-datafab \
+                               ums-freecom ums-isd200 ums-jumpshot \
+                               ums-karma ums-sddr09 ums-sddr55 ums-usbat)
+endef
+
+define KernelPackage/usb-storage-extras/description
+  Say Y here if you want to have some more drivers,
+  such as for SmartMedia card readers.
+endef
+
+$(eval $(call KernelPackage,usb-storage-extras))
+
+
+define KernelPackage/usb-video
+$(call KernelPackage/usb/Depends,@LINUX_2_6)
+  TITLE:=Support for USB video devices
+  KCONFIG:=CONFIG_VIDEO_USBVIDEO
+  FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,usbvideo)
+endef
+
+define KernelPackage/usb-video/description
+ Kernel support for USB video devices
+endef
+
+$(eval $(call KernelPackage,usb-video))
+
+
+define KernelPackage/usb-atm
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-atm)
+  TITLE:=Support for ATM on USB bus
+  KCONFIG:=CONFIG_USB_ATM
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,usbatm)
+endef
+
+define KernelPackage/usb-atm/description
+ Kernel support for USB DSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm))
+
+
+define KernelPackage/usb-atm/Depends
+  SUBMENU:=$(USB_MENU)
+  DEPENDS:=kmod-usb-atm $(1)
+endef
+
+
+define KernelPackage/usb-atm-speedtouch
+$(call KernelPackage/usb-atm/Depends,@LINUX_2_6)
+  TITLE:=SpeedTouch USB ADSL modems support
+  KCONFIG:=CONFIG_USB_SPEEDTOUCH
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,speedtch)
+endef
+
+define KernelPackage/usb-atm-speedtouch/description
+ Kernel support for SpeedTouch USB ADSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm-speedtouch))
+
+
+define KernelPackage/usb-atm-ueagle
+$(call KernelPackage/usb-atm/Depends,@LINUX_2_6)
+  TITLE:=Eagle 8051 based USB ADSL modems support
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_UEAGLEATM
+  AUTOLOAD:=$(call AutoLoad,70,ueagle-atm)
+endef
+
+define KernelPackage/usb-atm-ueagle/description
+ Kernel support for Eagle 8051 based USB ADSL modems
+endef
+
+$(eval $(call KernelPackage,usb-atm-ueagle))
+
+
+define KernelPackage/usb-atm-cxacru
+$(call KernelPackage/usb-atm/Depends,@LINUX_2_6)
+  TITLE:=cxacru
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_USB_CXACRU
+  AUTOLOAD:=$(call AutoLoad,70,cxacru)
+endef
+
+define KernelPackage/usb-atm-cxacru/description
+ Kernel support for cxacru based USB ADSL modems
+endef

 
 

+$(eval $(call KernelPackage,usb-atm-cxacru))

 
 

-define KernelPackage/usb-speedtouch
-  $(call usbdep,@LINUX_2_6 kmod-atm)
-  TITLE:=Support for SpeedTouch ADSL modems
-  DESCRIPTION:=Kernel support for SpeedTouch USB ADSL modems
-  KCONFIG:=$(CONFIG_USB_SPEEDTOUCH)
+
+define KernelPackage/usb-net
+$(call KernelPackage/usb/Depends,)
+  TITLE:=Kernel modules for USB-to-Ethernet convertors
+  KCONFIG:=CONFIG_USB_USBNET
+  AUTOLOAD:=$(call AutoLoad,60,usbnet)
+endef
+
+define KernelPackage/usb-net/2.4
+  FILES:=$(LINUX_DIR)/drivers/usb/usbnet.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/usb-net/2.6
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/usb-net/description
+ Kernel modules for USB-to-Ethernet convertors
+endef
+
+$(eval $(call KernelPackage,usb-net))
+
+
+define KernelPackage/usb-net/Depends
+  SUBMENU:=$(USB_MENU)
+  DEPENDS:=kmod-usb-net $(1)
+endef
+
+
+define KernelPackage/usb-net-asix
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
+  TITLE:=Kernel module for USB-to-Ethernet Asix convertors
+  KCONFIG:=CONFIG_USB_NET_AX8817X
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,asix)
+endef
+
+define KernelPackage/usb-net-asix/description
+ Kernel module for USB-to-Ethernet Asix convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-asix))
+
+
+define KernelPackage/usb-net-hso
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill)
+  TITLE:=Kernel module for Option USB High Speed Mobile Devices
+  KCONFIG:=CONFIG_USB_HSO

   FILES:= \
   FILES:= \

-       $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch)
+       $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,hso)
+endef
+
+define KernelPackage/usb-net-hso/description
+ Kernel module for Option USB High Speed Mobile Devices
+endef
+
+$(eval $(call KernelPackage,usb-net-hso))
+
+
+define KernelPackage/usb-net-kaweth
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
+  TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
+  KCONFIG:=CONFIG_USB_KAWETH
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,kaweth)
+endef
+
+define KernelPackage/usb-net-kaweth/description
+ Kernel module for USB-to-Ethernet Kaweth convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-kaweth))
+
+
+define KernelPackage/usb-net-pegasus
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
+  TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
+  KCONFIG:=CONFIG_USB_PEGASUS
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,pegasus)
+endef
+
+define KernelPackage/usb-net-pegasus/description
+ Kernel module for USB-to-Ethernet Pegasus convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-pegasus))
+
+
+define KernelPackage/usb-net-mcs7830
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
+  TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors
+  KCONFIG:=CONFIG_USB_NET_MCS7830
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,mcs7830)
+endef
+
+define KernelPackage/usb-net-mcs7830/description
+ Kernel module for USB-to-Ethernet MCS7830 convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-mcs7830))
+
+
+define KernelPackage/usb-net-dm9601-ether
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
+  TITLE:=Support for DM9601 ethernet connections
+  KCONFIG:=CONFIG_USB_NET_DM9601
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,dm9601)
+endef
+
+define KernelPackage/usb-net-dm9601-ether/description
+  Kernel support for USB DM9601 devices
+endef
+
+$(eval $(call KernelPackage,usb-net-dm9601-ether))
+
+define KernelPackage/usb-net-cdc-ether
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
+  TITLE:=Support for cdc ethernet connections
+  KCONFIG:=CONFIG_USB_NET_CDCETHER
+  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,cdc_ether)
+endef
+
+define KernelPackage/usb-net-cdc-ether/description
+ Kernel support for USB CDC Ethernet devices
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-ether))
+
+
+define KernelPackage/usb-net-rndis
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +kmod-usb-net-cdc-ether)
+  TITLE:=Support for RNDIS connections
+  KCONFIG:=CONFIG_USB_NET_RNDIS_HOST 
+  FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,62,rndis_host)
+endef
+
+define KernelPackage/usb-net-rndis/description
+ Kernel support for RNDIS connections

 endef
 endef

-$(eval $(call KernelPackage,usb-speedtouch))
-  
+
+$(eval $(call KernelPackage,usb-net-rndis))
+
+
+define KernelPackage/usb-hid
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev +!TARGET_x86:kmod-hid)
+  TITLE:=Support for USB Human Input Devices
+  KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID
+  FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
+  AUTOLOAD:=$(call AutoLoad,70,usbhid)
+endef
+
+
+define KernelPackage/usb-hid/description
+ Kernel support for USB HID devices such as keyboards and mice
+endef
+
+$(eval $(call KernelPackage,usb-hid))
+
+
+define KernelPackage/usb-yealink
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev)
+  TITLE:=USB Yealink VOIP phone
+  KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y
+  FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko
+  AUTOLOAD:=$(call AutoLoad,70,yealink)
+endef
+
+define KernelPackage/usb-yealink/description
+ Kernel support for Yealink VOIP phone
+endef
+
+$(eval $(call KernelPackage,usb-yealink))
+
+
+define KernelPackage/usb-cm109
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev)
+  TITLE:=Support for CM109 device
+  KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y
+  FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko
+  AUTOLOAD:=$(call AutoLoad,70,cm109)
+endef
+
+define KernelPackage/usb-cm109/description
+ Kernel support for CM109 VOIP phone
+endef
+
+$(eval $(call KernelPackage,usb-cm109))
+
+
+define KernelPackage/usb-test
+$(call KernelPackage/usb/Depends,@LINUX_2_6 @DEVEL)
+  TITLE:=USB Testing Driver
+  KCONFIG:=CONFIG_USB_TEST
+  FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko
+endef
+
+define KernelPackage/usb-test/description
+ Kernel support for testing USB Host Controller software.
+endef
+
+$(eval $(call KernelPackage,usb-test))
+
+
+define KernelPackage/usb-phidget
+$(call KernelPackage/usb/Depends,@LINUX_2_6)
+  TITLE:=USB Phidget Driver
+  KCONFIG:=CONFIG_USB_PHIDGET CONFIG_USB_PHIDGETKIT CONFIG_USB_PHIDGETMOTORCONTROL CONFIG_USB_PHIDGETSERVO
+  FILES:=$(LINUX_DIR)/drivers/usb/misc/phidget*.ko
+endef
+
+define KernelPackage/usb-phidget/description
+ Kernel support for USB Phidget devices.
+endef
+
+$(eval $(call KernelPackage,usb-phidget))
+