X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fusb.mk;h=c9cd11b7da185d0c67cc85f59783e980b1a5a9c1;hp=a8b2739c0d32a7c7e77cf5cb02959b38191cc9a3;hb=d63a8ef788a2e1f01a7ae3ef4c16da5ecfce1c60;hpb=30085a898bb966f18a57dd044c344b8871315297 diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index a8b2739c0d..c9cd11b7da 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,28 +7,17 @@ USB_MENU:=USB Support -ifneq ($(CONFIG_LINUX_2_4),) - USBNET_DIR:=usb/net -endif - -USBNET_DIR?=net/usb +USBNET_DIR:=net/usb USBHID_DIR?=hid/usbhid USBINPUT_DIR?=input/misc define KernelPackage/usb-core SUBMENU:=$(USB_MENU) TITLE:=Support for USB - DEPENDS:=@USB_SUPPORT +LINUX_2_6_31||LINUX_2_6_32:kmod-nls-base - KCONFIG:=CONFIG_USB - AUTOLOAD:=$(call AutoLoad,20,usbcore) -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) + DEPENDS:=@USB_SUPPORT +kmod-nls-base + KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n + FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko + AUTOLOAD:=$(call AutoLoad,20,usbcore,1) endef define KernelPackage/usb-core/description @@ -38,133 +27,181 @@ endef $(eval $(call KernelPackage,usb-core)) -define KernelPackage/usb/Depends +define AddDepends/usb SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-core $(1) + DEPENDS+=+!TARGET_etrax:kmod-usb-core $(1) endef -define KernelPackage/usb-uhci -$(call KernelPackage/usb/Depends,) - TITLE:=Support for UHCI controllers - KCONFIG:= \ - CONFIG_USB_UHCI_ALT \ - CONFIG_USB_UHCI_HCD +define KernelPackage/usb-gadget + TITLE:=USB Gadget support + KCONFIG:=CONFIG_USB_GADGET + FILES:= + AUTOLOAD:= + DEPENDS:=@USB_GADGET_SUPPORT + $(call AddDepends/usb) 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) +define KernelPackage/usb-gadget/description + Kernel support for USB Gadget mode. 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) +$(eval $(call KernelPackage,usb-gadget)) + + +define KernelPackage/usb-eth-gadget + TITLE:=USB Ethernet Gadget support + KCONFIG:= \ + CONFIG_USB_ETH \ + CONFIG_USB_ETH_RNDIS=y \ + CONFIG_USB_ETH_EEM=y + DEPENDS:=+kmod-usb-gadget + FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko + AUTOLOAD:=$(call AutoLoad,52,usb-eth-gadget) + $(call AddDepends/usb) endef -define KernelPackage/usb-uhci/description - Kernel support for USB UHCI controllers +define KernelPackage/usb-eth-gadget/description + Kernel support for USB Ethernet Gadget. endef -$(eval $(call KernelPackage,usb-uhci)) +$(eval $(call KernelPackage,usb-eth-gadget)) -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) +define KernelPackage/usb-uhci + TITLE:=Support for UHCI controllers + KCONFIG:= \ + CONFIG_USB_UHCI_ALT \ + CONFIG_USB_UHCI_HCD + FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko + AUTOLOAD:=$(call AutoLoad,50,uhci-hcd,1) + $(call AddDepends/usb) endef -define KernelPackage/usb-uhci-iv/description - Kernel support for Intel/VIA USB UHCI controllers +define KernelPackage/usb-uhci/description + Kernel support for USB UHCI controllers endef -$(eval $(call KernelPackage,usb-uhci-iv)) +$(eval $(call KernelPackage,usb-uhci,1)) define KernelPackage/usb-ohci -$(call KernelPackage/usb/Depends,) TITLE:=Support for OHCI controllers KCONFIG:= \ CONFIG_USB_OHCI \ CONFIG_USB_OHCI_HCD \ CONFIG_USB_OHCI_AR71XX=y + FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko + AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1) + $(call AddDepends/usb) 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) +define KernelPackage/usb-ohci/description + Kernel support for USB OHCI controllers 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) +$(eval $(call KernelPackage,usb-ohci,1)) + + +define KernelPackage/musb-hdrc + TITLE:=Support for Mentor Graphics silicon dual role USB + KCONFIG:= \ + CONFIG_USB_MUSB_HDRC \ + CONFIG_MUSB_PIO_ONLY=n \ + CONFIG_USB_MUSB_OTG=y \ + CONFIG_USB_MUSB_DEBUG=y + DEPENDS:=@TARGET_omap24xx + FILES:=$(LINUX_DIR)/drivers/usb/musb/musb_hdrc.ko + AUTOLOAD:=$(call AutoLoad,55,musb_hdrc) + $(call AddDepends/usb) endef -define KernelPackage/usb-ohci/description - Kernel support for USB OHCI controllers +define KernelPackage/musb-hdrc/description + Kernel support for Mentor Graphics silicon dual role USB device. +endef + +$(eval $(call KernelPackage,musb-hdrc)) + + +define KernelPackage/nop-usb-xceiv + TITLE:=Support for USB OTG NOP transceiver + KCONFIG:= \ + CONFIG_NOP_USB_XCEIV + DEPENDS:=@TARGET_omap24xx + FILES:=$(LINUX_DIR)/drivers/usb/otg/nop-usb-xceiv.ko + AUTOLOAD:=$(call AutoLoad,53,nop-usb-xceiv) + $(call AddDepends/usb) +endef + +define KernelPackage/nop-usb-xceiv/description + Support for USB OTG NOP transceiver endef -$(eval $(call KernelPackage,usb-ohci)) +$(eval $(call KernelPackage,nop-usb-xceiv)) -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) +define KernelPackage/tusb6010 + TITLE:=Support for TUSB 6010 + KCONFIG:= \ + CONFIG_USB_TUSB6010=y + DEPENDS:=+kmod-musb-hdrc +kmod-nop-usb-xceiv + $(call AddDepends/usb) endef -define KernelPackage/usb-adm5120/description - Kernel support for the ADM5120 HCD USB controller +define KernelPackage/tusb6010/description + TUSB6010 support endef -$(eval $(call KernelPackage,usb-adm5120)) +$(eval $(call KernelPackage,tusb6010)) + -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) +define KernelPackage/usb-tahvo + TITLE:=Support for Tahvo (Nokia n810) USB + KCONFIG:= \ + CONFIG_CBUS_TAHVO_USB \ + CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT=n \ + CONFIG_USB_OHCI_HCD_OMAP1=y \ + CONFIG_USB_GADGET_DEBUG_FS=n + DEPENDS:=@TARGET_omap24xx +kmod-usb-ohci +kmod-tusb6010 +kmod-usb-gadget + FILES:=$(LINUX_DIR)/drivers/cbus/tahvo-usb.ko + AUTOLOAD:=$(call AutoLoad,54,tahvo-usb) + $(call AddDepends/usb) endef -define KernelPackage/usb-etrax/description - Kernel support for the ETRAX USB host controller +define KernelPackage/usb-tahvo/description + Kernel support for Nokia n810 USB OHCI controller. endef -$(eval $(call KernelPackage,usb-etrax)) +$(eval $(call KernelPackage,usb-tahvo)) + -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) +define KernelPackage/usb-isp116x-hcd + TITLE:=Support for the ISP116x USB Host Controller + DEPENDS:=@TARGET_ppc40x + KCONFIG:= \ + CONFIG_USB_ISP116X_HCD \ + CONFIG_USB_ISP116X_HCD_OF=y \ + CONFIG_USB_ISP116X_HCD_PLATFORM=n + FILES:=$(LINUX_DIR)/drivers/usb/host/isp116x-hcd.ko + AUTOLOAD:=$(call AutoLoad,50,isp116x-hcd) + $(call AddDepends/usb) endef -define KernelPackage/usb-octeon/description - Kernel support for the Octeon USB host controller +define KernelPackage/usb-isp116x-hcd/description + Kernel support for the ISP116X USB Host Controller endef -$(eval $(call KernelPackage,usb-octeon)) +$(eval $(call KernelPackage,usb-isp116x-hcd)) define KernelPackage/usb2 -$(call KernelPackage/usb/Depends,) TITLE:=Support for USB2 controllers 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) + CONFIG_USB_EHCI_AR71XX=y \ + CONFIG_USB_EHCI_FSL=n + FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko + AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1) + $(call AddDepends/usb) endef define KernelPackage/usb2/description @@ -175,19 +212,11 @@ $(eval $(call KernelPackage,usb2)) define KernelPackage/usb-acm -$(call KernelPackage/usb/Depends,) TITLE:=Support for modems/isdn controllers KCONFIG:=CONFIG_USB_ACM -endef - -define KernelPackage/usb-acm/2.4 - FILES:=$(LINUX_DIR)/drivers/usb/acm.o - AUTOLOAD:=$(call AutoLoad,60,acm) -endef - -define KernelPackage/usb-acm/2.6 FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko AUTOLOAD:=$(call AutoLoad,60,cdc-acm) +$(call AddDepends/usb) endef define KernelPackage/usb-acm/description @@ -198,25 +227,24 @@ $(eval $(call KernelPackage,usb-acm)) define KernelPackage/usb-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 -# KCONFIG:=CONFIG_USB_AUDIO - FILES:=$(LINUX_DIR)/drivers/usb/audio.o - AUTOLOAD:=$(call AutoLoad,60,audio) -endef - -define KernelPackage/usb-audio/2.6 -# KCONFIG:=CONFIG_SND_USB_AUDIO + $(call AddDepends/usb) + $(call AddDepends/sound) +# For Linux 2.6.35+ +ifneq ($(wildcard $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko),) + FILES:= \ + $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \ + $(LINUX_DIR)/sound/usb/snd-usb-audio.ko + AUTOLOAD:=$(call AutoLoad,60,snd-usbmidi-lib snd-usb-audio) +else 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) +endif endef define KernelPackage/usb-audio/description @@ -227,19 +255,11 @@ $(eval $(call KernelPackage,usb-audio)) define KernelPackage/usb-printer -$(call KernelPackage/usb/Depends,) TITLE:=Support for printers KCONFIG:=CONFIG_USB_PRINTER -endef - -define KernelPackage/usb-printer/2.4 - FILES:=$(LINUX_DIR)/drivers/usb/printer.o - AUTOLOAD:=$(call AutoLoad,60,printer) -endef - -define KernelPackage/usb-printer/2.6 FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko AUTOLOAD:=$(call AutoLoad,60,usblp) + $(call AddDepends/usb) endef define KernelPackage/usb-printer/description @@ -250,11 +270,11 @@ $(eval $(call KernelPackage,usb-printer)) define KernelPackage/usb-serial -$(call KernelPackage/usb/Depends,) TITLE:=Support for USB-to-Serial converters KCONFIG:=CONFIG_USB_SERIAL - FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.ko AUTOLOAD:=$(call AutoLoad,60,usbserial) + $(call AddDepends/usb) endef define KernelPackage/usb-serial/description @@ -264,18 +284,18 @@ endef $(eval $(call KernelPackage,usb-serial)) -define KernelPackage/usb-serial/Depends +define AddDepends/usb-serial SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-serial $(1) + 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) + FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.ko AUTOLOAD:=$(call AutoLoad,65,airprime) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-airprime/description @@ -286,11 +306,11 @@ $(eval $(call KernelPackage,usb-serial-airprime)) define KernelPackage/usb-serial-belkin -$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Belkin devices KCONFIG:=CONFIG_USB_SERIAL_BELKIN - FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.ko AUTOLOAD:=$(call AutoLoad,65,belkin_sa) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-belkin/description @@ -301,14 +321,14 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.ko AUTOLOAD:=$(call AutoLoad,65,ch341) + $(call AddDepends/usb-serial) endef -define KernelPackage/usb-serial-belkin/description +define KernelPackage/usb-serial-ch341/description Kernel support for Winchiphead CH341 USB-to-Serial converters endef @@ -316,11 +336,11 @@ $(eval $(call KernelPackage,usb-serial-ch341)) define KernelPackage/usb-serial-ftdi -$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for FTDI devices KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO - FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.ko AUTOLOAD:=$(call AutoLoad,65,ftdi_sio) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-ftdi/description @@ -330,12 +350,23 @@ endef $(eval $(call KernelPackage,usb-serial-ftdi)) +define KernelPackage/usb-serial-ipw + TITLE:=Support for IPWireless 3G devices + KCONFIG:=CONFIG_USB_SERIAL_IPW + FILES:=$(LINUX_DIR)/drivers/usb/serial/ipw.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,65,ipw) + $(call AddDepends/usb-serial) +endef + +$(eval $(call KernelPackage,usb-serial-ipw)) + + define KernelPackage/usb-serial-mct -$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Magic Control Tech. devices KCONFIG:=CONFIG_USB_SERIAL_MCT_U232 - FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.ko AUTOLOAD:=$(call AutoLoad,65,mct_u232) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-mct/description @@ -345,12 +376,27 @@ endef $(eval $(call KernelPackage,usb-serial-mct)) +define KernelPackage/usb-serial-mos7720 + TITLE:=Support for Moschip MOS7720 devices + KCONFIG:=CONFIG_USB_SERIAL_MOS7720 + FILES:=$(LINUX_DIR)/drivers/usb/serial/mos7720.ko + AUTOLOAD:=$(call AutoLoad,65,mos7720) + $(call AddDepends/usb-serial) +endef + +define KernelPackage/usb-serial-mos7720/description + Kernel support for Moschip MOS7720 USB-to-Serial converters +endef + +$(eval $(call KernelPackage,usb-serial-mos7720)) + + define KernelPackage/usb-serial-pl2303 -$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Prolific PL2303 devices KCONFIG:=CONFIG_USB_SERIAL_PL2303 - FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.ko AUTOLOAD:=$(call AutoLoad,65,pl2303) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-pl2303/description @@ -361,11 +407,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.ko AUTOLOAD:=$(call AutoLoad,65,cp210x) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-cp210x/description @@ -376,11 +422,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.ko AUTOLOAD:=$(call AutoLoad,65,ark3116) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-ark3116/description @@ -391,11 +437,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.ko AUTOLOAD:=$(call AutoLoad,65,oti6858) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-oti6858/description @@ -406,11 +452,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.ko AUTOLOAD:=$(call AutoLoad,65,sierra) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-sierrawireless/description @@ -421,11 +467,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.ko AUTOLOAD:=$(call AutoLoad,65,moto_modem) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-motorola-phone/description @@ -435,13 +481,12 @@ endef $(eval $(call KernelPackage,usb-serial-motorola-phone)) - define KernelPackage/usb-serial-visor -$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Handspring Visor devices KCONFIG:=CONFIG_USB_SERIAL_VISOR - FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.ko AUTOLOAD:=$(call AutoLoad,65,visor) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-visor/description @@ -451,8 +496,25 @@ endef $(eval $(call KernelPackage,usb-serial-visor)) +define KernelPackage/usb-serial-cypress-m8 + TITLE:=Support for CypressM8 USB-Serial + KCONFIG:=CONFIG_USB_SERIAL_CYPRESS_M8 + FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.ko + AUTOLOAD:=$(call AutoLoad,65,cypress_m8) + $(call AddDepends/usb-serial) +endef + +define KernelPackage/usb-serial-cypress-m8/description + Kernel support for devices with Cypress M8 USB to Serial chip + (for example, the Delorme Earthmate LT-20 GPS) + Supported microcontrollers in the CY4601 family are: + CY7C63741 CY7C63742 CY7C63743 CY7C64013 +endef + +$(eval $(call KernelPackage,usb-serial-cypress-m8)) + + define KernelPackage/usb-serial-keyspan -$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Keyspan USB-to-Serial devices KCONFIG:= \ CONFIG_USB_SERIAL_KEYSPAN \ @@ -468,8 +530,9 @@ $(call KernelPackage/usb-serial/Depends,) 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) + FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.ko AUTOLOAD:=$(call AutoLoad,65,keyspan) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-keyspan/description @@ -479,12 +542,29 @@ endef $(eval $(call KernelPackage,usb-serial-keyspan)) +define KernelPackage/usb-serial-wwan + TITLE:=Support for GSM and CDMA modems + DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37 + KCONFIG:=CONFIG_USB_SERIAL_WWAN + FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko + AUTOLOAD:=$(call AutoLoad,61,usb_wwan) + $(call AddDepends/usb-serial) +endef + +define KernelPackage/usb-serial-wwan/description + Kernel support for USB GSM and CDMA modems +endef + +$(eval $(call KernelPackage,usb-serial-wwan)) + + define KernelPackage/usb-serial-option -$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) TITLE:=Support for Option HSDPA modems + DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37:kmod-usb-serial-wwan KCONFIG:=CONFIG_USB_SERIAL_OPTION - FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko AUTOLOAD:=$(call AutoLoad,65,option) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-option/description @@ -495,11 +575,12 @@ $(eval $(call KernelPackage,usb-serial-option)) define KernelPackage/usb-storage -$(call KernelPackage/usb/Depends,+kmod-scsi-core) TITLE:=USB Storage support + DEPENDS:= +!TARGET_x86:kmod-scsi-core 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) + FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.ko + AUTOLOAD:=$(call AutoLoad,60,usb-storage,1) + $(call AddDepends/usb) endef define KernelPackage/usb-storage/description @@ -509,12 +590,51 @@ endef $(eval $(call KernelPackage,usb-storage)) +define KernelPackage/usb-storage-extras + SUBMENU:=$(USB_MENU) + TITLE:=Extra drivers for usb-storage + DEPENDS:=+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.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-cypress.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-datafab.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-freecom.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-isd200.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-jumpshot.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-karma.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-sddr09.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-sddr55.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-usbat.ko + 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) + FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.ko AUTOLOAD:=$(call AutoLoad,61,usbvideo) + $(call AddDepends/usb) endef define KernelPackage/usb-video/description @@ -525,11 +645,12 @@ $(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 + DEPENDS:=+kmod-atm KCONFIG:=CONFIG_USB_ATM - FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.ko AUTOLOAD:=$(call AutoLoad,60,usbatm) + $(call AddDepends/usb) endef define KernelPackage/usb-atm/description @@ -539,18 +660,18 @@ endef $(eval $(call KernelPackage,usb-atm)) -define KernelPackage/usb-atm/Depends +define AddDepends/usb-atm SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-atm $(1) + 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) + FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.ko AUTOLOAD:=$(call AutoLoad,70,speedtch) + $(call AddDepends/usb-atm) endef define KernelPackage/usb-atm-speedtouch/description @@ -561,11 +682,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.ko KCONFIG:=CONFIG_USB_UEAGLEATM AUTOLOAD:=$(call AutoLoad,70,ueagle-atm) + $(call AddDepends/usb-atm) endef define KernelPackage/usb-atm-ueagle/description @@ -576,11 +697,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.ko KCONFIG:=CONFIG_USB_CXACRU AUTOLOAD:=$(call AutoLoad,70,cxacru) + $(call AddDepends/usb-atm) endef define KernelPackage/usb-atm-cxacru/description @@ -591,18 +712,11 @@ $(eval $(call KernelPackage,usb-atm-cxacru)) 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) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko + $(call AddDepends/usb) endef define KernelPackage/usb-net/description @@ -612,18 +726,18 @@ endef $(eval $(call KernelPackage,usb-net)) -define KernelPackage/usb-net/Depends +define AddDepends/usb-net SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-net $(1) + 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) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko AUTOLOAD:=$(call AutoLoad,61,asix) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-asix/description @@ -634,12 +748,13 @@ $(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:= \ - $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.ko AUTOLOAD:=$(call AutoLoad,61,hso) + $(call AddDepends/usb-net) + $(call AddDepends/rfkill) endef define KernelPackage/usb-net-hso/description @@ -650,11 +765,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.ko AUTOLOAD:=$(call AutoLoad,61,kaweth) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-kaweth/description @@ -665,11 +780,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.ko AUTOLOAD:=$(call AutoLoad,61,pegasus) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-pegasus/description @@ -680,11 +795,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.ko AUTOLOAD:=$(call AutoLoad,61,mcs7830) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-mcs7830/description @@ -695,11 +810,11 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.ko AUTOLOAD:=$(call AutoLoad,61,dm9601) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-dm9601-ether/description @@ -709,11 +824,11 @@ 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) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.ko AUTOLOAD:=$(call AutoLoad,61,cdc_ether) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-cdc-ether/description @@ -724,11 +839,11 @@ $(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) + KCONFIG:=CONFIG_USB_NET_RNDIS_HOST + FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.ko AUTOLOAD:=$(call AutoLoad,62,rndis_host) + $(call AddDepends/usb-net,+kmod-usb-net-cdc-ether) endef define KernelPackage/usb-net-rndis/description @@ -739,11 +854,13 @@ $(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) TITLE:=Support for USB Human Input Devices - KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID + KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID CONFIG_USB_HIDDEV=y FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko AUTOLOAD:=$(call AutoLoad,70,usbhid) + $(call AddDepends/usb) + $(call AddDepends/hid) + $(call AddDepends/input,+kmod-input-evdev) endef @@ -755,11 +872,12 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink -$(call KernelPackage/usb/Depends,@LINUX_2_6 +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) + $(call AddDepends/usb) + $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-yealink/description @@ -770,11 +888,12 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 -$(call KernelPackage/usb/Depends,@LINUX_2_6 +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) + $(call AddDepends/usb) + $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-cm109/description @@ -785,10 +904,11 @@ $(eval $(call KernelPackage,usb-cm109)) define KernelPackage/usb-test -$(call KernelPackage/usb/Depends,@LINUX_2_6 @DEVEL) TITLE:=USB Testing Driver + DEPENDS:=@DEVEL KCONFIG:=CONFIG_USB_TEST FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko + $(call AddDepends/usb) endef define KernelPackage/usb-test/description @@ -799,10 +919,10 @@ $(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 +$(call AddDepends/usb) endef define KernelPackage/usb-phidget/description