X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9fb445fa5320420ac3fe1461d62493a59f2aa462..2f643ce9e67148f6a57c1e85567d0e393b8b38fd:/package/kernel/modules/usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 26ba652b6..c962e340e 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -18,9 +18,9 @@ USBINPUT_DIR?=input/misc
 define KernelPackage/usb-core
   SUBMENU:=$(USB_MENU)
   TITLE:=Support for USB
-  DEPENDS:=@USB_SUPPORT +LINUX_2_6_31:kmod-nls-base
+  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)
+  AUTOLOAD:=$(call AutoLoad,20,usbcore,1)
 endef
 
 define KernelPackage/usb-core/2.4
@@ -55,20 +55,20 @@ endef
 define KernelPackage/usb-uhci/2.4
 #  KCONFIG:=CONFIG_USB_UHCI_ALT
   FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o
-  AUTOLOAD:=$(call AutoLoad,50,uhci)
+  AUTOLOAD:=$(call AutoLoad,50,uhci,1)
 endef
 
 define KernelPackage/usb-uhci/2.6
 #  KCONFIG:=CONFIG_USB_UHCI_HCD
   FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
-  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
+  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))
+$(eval $(call KernelPackage,usb-uhci,1))
 
 
 define KernelPackage/usb-uhci-iv
@@ -76,14 +76,14 @@ $(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)
+  AUTOLOAD:=$(call AutoLoad,50,usb-uhci,1)
 endef
 
 define KernelPackage/usb-uhci-iv/description
  Kernel support for Intel/VIA USB UHCI controllers
 endef
 
-$(eval $(call KernelPackage,usb-uhci-iv))
+$(eval $(call KernelPackage,usb-uhci-iv,1))
 
 
 define KernelPackage/usb-ohci
@@ -98,20 +98,20 @@ endef
 define KernelPackage/usb-ohci/2.4
 #  KCONFIG:=CONFIG_USB_OHCI
   FILES:=$(LINUX_DIR)/drivers/usb/host/usb-ohci.o
-  AUTOLOAD:=$(call AutoLoad,50,usb-ohci)
+  AUTOLOAD:=$(call AutoLoad,50,usb-ohci,1)
 endef
 
 define KernelPackage/usb-ohci/2.6
 #  KCONFIG:=CONFIG_USB_OHCI_HCD
   FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
-  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
+  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1)
 endef
 
 define KernelPackage/usb-ohci/description
  Kernel support for USB OHCI controllers
 endef
 
-$(eval $(call KernelPackage,usb-ohci))
+$(eval $(call KernelPackage,usb-ohci,1))
 
 
 define KernelPackage/usb-adm5120
@@ -119,7 +119,7 @@ $(call KernelPackage/usb/Depends,@TARGET_adm5120_router_be||@TARGET_adm5120_rout
   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)
+  AUTOLOAD:=$(call AutoLoad,50,adm5120-hcd,1)
 endef
 
 define KernelPackage/usb-adm5120/description
@@ -134,7 +134,7 @@ $(call KernelPackage/usb/Depends,@TARGET_etrax)
   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)
+  AUTOLOAD:=$(call AutoLoad,50,hc-crisv10,1)
 endef
 
 define KernelPackage/usb-etrax/description
@@ -164,7 +164,7 @@ $(call KernelPackage/usb/Depends,)
   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)
+  AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1)
 endef
 
 define KernelPackage/usb2/description
@@ -360,19 +360,19 @@ endef
 $(eval $(call KernelPackage,usb-serial-pl2303))
 
 
-define KernelPackage/usb-serial-cp2101
+define KernelPackage/usb-serial-cp210x
 $(call KernelPackage/usb-serial/Depends,)
-  TITLE:=Support for Silicon Labs cp2101 devices
-  KCONFIG:=CONFIG_USB_SERIAL_CP2101
-  FILES:=$(LINUX_DIR)/drivers/usb/serial/cp2101.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,65,cp2101)
+  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-cp2101/description
- Kernel support for Silicon Labs cp2101 USB-to-Serial converters
+define KernelPackage/usb-serial-cp210x/description
+ Kernel support for Silicon Labs cp210x USB-to-Serial converters
 endef
 
-$(eval $(call KernelPackage,usb-serial-cp2101))
+$(eval $(call KernelPackage,usb-serial-cp210x))
 
 
 define KernelPackage/usb-serial-ark3116
@@ -495,11 +495,11 @@ $(eval $(call KernelPackage,usb-serial-option))
 
 
 define KernelPackage/usb-storage
-$(call KernelPackage/usb/Depends,+kmod-scsi-core)
+$(call KernelPackage/usb/Depends,+!TARGET_x86:kmod-scsi-core)
   TITLE:=USB Storage support
   KCONFIG:=CONFIG_USB_STORAGE
   FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
+  AUTOLOAD:=$(call AutoLoad,60,usb-storage,1)
 endef
 
 define KernelPackage/usb-storage/description
@@ -508,6 +508,44 @@ endef
 
 $(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)
@@ -724,9 +762,8 @@ $(eval $(call KernelPackage,usb-net-cdc-ether))
 
 
 define KernelPackage/usb-net-rndis
-$(call KernelPackage/usb-net/Depends,@LINUX_2_6)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +kmod-usb-net-cdc-ether)
   TITLE:=Support for RNDIS connections
-  DEPENDS:=+kmod-usb-net-cdc-ether
   KCONFIG:=CONFIG_USB_NET_RNDIS_HOST 
   FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,62,rndis_host)
@@ -740,7 +777,7 @@ $(eval $(call KernelPackage,usb-net-rndis))
 
 
 define KernelPackage/usb-hid
-$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev +kmod-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
@@ -756,7 +793,7 @@ $(eval $(call KernelPackage,usb-hid))
 
 
 define KernelPackage/usb-yealink
-$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
+$(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
@@ -771,7 +808,7 @@ $(eval $(call KernelPackage,usb-yealink))
 
 
 define KernelPackage/usb-cm109
-$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
+$(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