X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fusb.mk;h=68f22cc05b2be4c4ddfaef0dc03cc16180af64ed;hb=c5229de7b96659ea12a6a22cdea9b5db40aa0992;hp=9dbf06264bb86fb87817850bcad0a016eb320783;hpb=a3626aca95c5ec865a53b8bce2f739c77c3247da;p=15.05%2Fopenwrt.git diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 9dbf06264b..68f22cc05b 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -18,8 +18,7 @@ define KernelPackage/usb-core KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n FILES:= \ $(LINUX_DIR)/drivers/usb/core/usbcore.ko \ - $(LINUX_DIR)/drivers/usb/usb-common.ko@lt3.16 \ - $(LINUX_DIR)/drivers/usb/common/usb-common.ko@ge3.16 + $(LINUX_DIR)/drivers/usb/common/usb-common.ko AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1) $(call AddDepends/nls) endef @@ -104,18 +103,8 @@ define KernelPackage/usb-phy-nop TITLE:=Support for USB NOP transceiver KCONFIG:=CONFIG_NOP_USB_XCEIV HIDDEN:=1 -ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/phy/phy-generic.ko),) FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-generic.ko AUTOLOAD:=$(call AutoLoad,43,phy-generic) -else -ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/phy/phy-nop.ko),) - FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-nop.ko - AUTOLOAD:=$(call AutoLoad,43,phy-nop) -else - FILES:=$(LINUX_DIR)/drivers/usb/otg/nop-usb-xceiv.ko - AUTOLOAD:=$(call AutoLoad,43,nop-usb-xceiv) -endif -endif $(call AddDepends/usb) endef @@ -150,11 +139,11 @@ define KernelPackage/usb-phy-omap-usb2 TITLE:=Support for OMAP2 USB PHY KCONFIG:= \ CONFIG_OMAP_USB2 \ - CONFIG_OMAP_CONTROL_USB + CONFIG_OMAP_CONTROL_PHY DEPENDS:=@TARGET_omap FILES:= \ $(LINUX_DIR)/drivers/phy/phy-omap-usb2.ko \ - $(LINUX_DIR)/drivers/usb/phy/phy-omap-control.ko + $(LINUX_DIR)/drivers/phy/phy-omap-control.ko AUTOLOAD:=$(call AutoLoad,45,phy-omap-control phy-omap-usb2) $(call AddDepends/usb) endef @@ -217,7 +206,8 @@ $(eval $(call KernelPackage,usb-phy-twl6030)) define KernelPackage/usb-gadget TITLE:=USB Gadget support KCONFIG:=CONFIG_USB_GADGET - FILES:=$(LINUX_DIR)/drivers/usb/gadget/udc-core.ko + FILES:=\ + $(LINUX_DIR)/drivers/usb/gadget/udc/udc-core.ko AUTOLOAD:=$(call AutoLoad,45,udc-core) DEPENDS:=@USB_GADGET_SUPPORT $(call AddDepends/usb) @@ -252,21 +242,13 @@ define KernelPackage/usb-eth-gadget CONFIG_USB_ETH_RNDIS=y \ CONFIG_USB_ETH_EEM=n DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite -ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),) FILES:= \ - $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko \ - $(LINUX_DIR)/drivers/usb/gadget/g_ether.ko - ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko),) - FILES+=$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko - endif + $(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko \ + $(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether) -else - FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko - AUTOLOAD:=$(call AutoLoad,52,g_ether) -endif $(call AddDepends/usb) endef @@ -281,18 +263,13 @@ define KernelPackage/usb-serial-gadget TITLE:=USB Serial Gadget support KCONFIG:=CONFIG_USB_G_SERIAL DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite -ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko),) FILES:= \ - $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko \ - $(LINUX_DIR)/drivers/usb/gadget/g_serial.ko + $(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_obex.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_serial.ko \ + $(LINUX_DIR)/drivers/usb/gadget/legacy/g_serial.ko AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial) -else - FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko - AUTOLOAD:=$(call AutoLoad,52,g_serial) -endif $(call AddDepends/usb) endef @@ -322,7 +299,9 @@ $(eval $(call KernelPackage,usb-uhci,1)) define KernelPackage/usb-ohci TITLE:=Support for OHCI controllers - DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx + DEPENDS:= \ + +TARGET_brcm47xx:kmod-usb-bcma \ + +TARGET_brcm47xx:kmod-usb-ssb KCONFIG:= \ CONFIG_USB_OHCI \ CONFIG_USB_OHCI_HCD \ @@ -332,10 +311,9 @@ define KernelPackage/usb-ohci CONFIG_USB_OCTEON_OHCI=y \ CONFIG_USB_OHCI_HCD_OMAP3=y \ CONFIG_USB_OHCI_HCD_PLATFORM=y - FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko -ifeq ($(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),) - FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko -endif + FILES:= \ + $(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko \ + $(LINUX_DIR)/drivers/usb/host/ohci-platform.ko AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1) $(call AddDepends/usb) endef @@ -347,6 +325,22 @@ endef $(eval $(call KernelPackage,usb-ohci,1)) +define KernelPackage/usb-ohci-pci + TITLE:=Support for PCI OHCI controllers + DEPENDS:=@PCI_SUPPORT +kmod-usb-ohci + KCONFIG:=CONFIG_USB_OHCI_HCD_PCI + FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-pci.ko + AUTOLOAD:=$(call AutoLoad,51,ohci-pci,1) + $(call AddDepends/usb) +endef + +define KernelPackage/usb-ohci-pci/description + Kernel support for PCI OHCI controllers +endef + +$(eval $(call KernelPackage,usb-ohci-pci)) + + define KernelPackage/usb2-fsl TITLE:=Support for Freescale USB2 controllers DEPENDS:=@TARGET_mpc85xx @@ -368,7 +362,9 @@ $(eval $(call KernelPackage,usb2-fsl)) define KernelPackage/usb2-omap TITLE:=Support for USB2 for OMAP DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-phy-am335x +kmod-usb2 - KCONFIG:=CONFIG_USB_EHCI_HCD_OMAP + KCONFIG:=\ + CONFIG_MFD_OMAP_USB_HOST=y \ + CONFIG_USB_EHCI_HCD_OMAP FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-omap.ko AUTOLOAD:=$(call AutoLoad,39,ehci-omap) $(call AddDepends/usb) @@ -380,11 +376,36 @@ endef $(eval $(call KernelPackage,usb2-omap)) +define KernelPackage/usb-bcma + TITLE:=Support for BCMA USB controllers + DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx||TARGET_bcm53xx + HIDDEN:=1 + KCONFIG:=CONFIG_USB_HCD_BCMA + FILES:= \ + $(if $(CONFIG_USB_HCD_BCMA),$(LINUX_DIR)/drivers/usb/host/bcma-hcd.ko) + AUTOLOAD:=$(call AutoLoad,19,$(if $(CONFIG_USB_HCD_BCMA),bcma-hcd),1) + $(call AddDepends/usb) +endef +$(eval $(call KernelPackage,usb-bcma)) + +define KernelPackage/usb-ssb + TITLE:=Support for SSB USB controllers + DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx + HIDDEN:=1 + KCONFIG:=CONFIG_USB_HCD_SSB + FILES:= \ + $(if $(CONFIG_USB_HCD_SSB),$(LINUX_DIR)/drivers/usb/host/ssb-hcd.ko) + AUTOLOAD:=$(call AutoLoad,19,$(if $(CONFIG_USB_HCD_SSB),ssb-hcd),1) + $(call AddDepends/usb) +endef +$(eval $(call KernelPackage,usb-ssb)) define KernelPackage/usb2 TITLE:=Support for USB2 controllers DEPENDS:=\ - +TARGET_brcm47xx:kmod-usb-brcm47xx \ + +TARGET_brcm47xx:kmod-usb-bcma \ + +TARGET_brcm47xx:kmod-usb-ssb \ + +TARGET_bcm53xx:kmod-usb-bcma \ +TARGET_mpc85xx:kmod-usb2-fsl KCONFIG:=\ CONFIG_USB_EHCI_HCD \ @@ -430,7 +451,7 @@ $(eval $(call KernelPackage,usb2-pci)) define KernelPackage/usb-dwc2 TITLE:=DWC2 USB controller driver - DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 + DEPENDS:=+(TARGET_brcm2708||TARGET_at91||TARGET_brcm63xx||TARGET_mxs||TARGET_imx6):kmod-usb-gadget KCONFIG:= \ CONFIG_USB_DWC2 \ CONFIG_USB_DWC2_PCI \ @@ -470,6 +491,28 @@ endef $(eval $(call KernelPackage,usb2-oxnas)) +define KernelPackage/usb-dwc3 + TITLE:=DWC3 USB controller driver + KCONFIG:= \ + CONFIG_USB_DWC3 \ + CONFIG_USB_DWC3_HOST=y \ + CONFIG_USB_DWC3_GADGET=n \ + CONFIG_USB_DWC3_DUAL_ROLE=n \ + CONFIG_USB_DWC3_DEBUG=n \ + CONFIG_USB_DWC3_VERBOSE=n + FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3.ko + AUTOLOAD:=$(call AutoLoad,54,dwc3,1) + $(call AddDepends/usb) +endef + +define KernelPackage/usb-dwc3/description + This driver provides support for the Dual Role SuperSpeed + USB Controller based on the Synopsys DesignWare USB3 IP Core +endef + +$(eval $(call KernelPackage,usb-dwc3)) + + define KernelPackage/usb-acm TITLE:=Support for modems/isdn controllers KCONFIG:=CONFIG_USB_ACM @@ -508,18 +551,10 @@ define KernelPackage/usb-audio 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 AutoProbe,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 AutoProbe,snd-usb-lib snd-usb-audio) -endif endef define KernelPackage/usb-audio/description @@ -610,6 +645,49 @@ endef $(eval $(call KernelPackage,usb-serial-ftdi)) +define KernelPackage/usb-serial-garmin + TITLE:=Support for Garmin GPS devices + KCONFIG:=CONFIG_USB_SERIAL_GARMIN + FILES:=$(LINUX_DIR)/drivers/usb/serial/garmin_gps.ko + AUTOLOAD:=$(call AutoProbe,garmin_gps) + $(call AddDepends/usb-serial) +endef + +define KernelPackage/usb-serial-garmin/description + Should work with most Garmin GPS devices which have a native USB port. +endef + +$(eval $(call KernelPackage,usb-serial-garmin)) + + +define KernelPackage/usb-serial-simple + TITLE:=USB Serial Simple (Motorola phone) + KCONFIG:=CONFIG_USB_SERIAL_SIMPLE + FILES:=$(LINUX_DIR)/drivers/usb/serial/usb-serial-simple.ko + AUTOLOAD:=$(call AutoProbe,usb-serial-simple) + $(call AddDepends/usb-serial) +endef + +define KernelPackage/usb-serial-simple/description + Kernel support for "very simple devices". + +Specifically, it supports: + - Suunto ANT+ USB device. + - Medtronic CareLink USB device (3.18) + - Fundamental Software dongle. + - Google USB serial devices (3.19) + - HP4x calculators + - a number of Motorola phones + - Novatel Wireless GPS receivers (3.18) + - Siemens USB/MPI adapter. + - ViVOtech ViVOpay USB device. + - Infineon Modem Flashloader USB interface + - ZIO Motherboard USB serial interface +endef + +$(eval $(call KernelPackage,usb-serial-simple)) + + define KernelPackage/usb-serial-ti-usb TITLE:=Support for TI USB 3410/5052 KCONFIG:=CONFIG_USB_SERIAL_TI @@ -741,21 +819,6 @@ endef $(eval $(call KernelPackage,usb-serial-sierrawireless)) -define KernelPackage/usb-serial-motorola-phone - TITLE:=Support for Motorola usb phone - KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA - FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.ko - AUTOLOAD:=$(call AutoProbe,moto_modem) - $(call AddDepends/usb-serial) -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 TITLE:=Support for Handspring Visor devices KCONFIG:=CONFIG_USB_SERIAL_VISOR @@ -990,7 +1053,8 @@ $(eval $(call KernelPackage,usb-atm-cxacru)) define KernelPackage/usb-net TITLE:=Kernel modules for USB-to-Ethernet convertors DEPENDS:=+kmod-mii - KCONFIG:=CONFIG_USB_USBNET + KCONFIG:=CONFIG_USB_USBNET \ + CONFIG_USB_NET_DRIVERS AUTOLOAD:=$(call AutoProbe,usbnet) FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko $(call AddDepends/usb) @@ -1025,6 +1089,23 @@ endef $(eval $(call KernelPackage,usb-net-asix)) +define KernelPackage/usb-net-asix-ax88179 + TITLE:=Kernel module for USB-to-Gigabit-Ethernet Asix convertors + DEPENDS:=+kmod-libphy + KCONFIG:=CONFIG_USB_NET_AX88179_178A + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/ax88179_178a.ko + AUTOLOAD:=$(call AutoProbe,ax88179_178a) + $(call AddDepends/usb-net) +endef + +define KernelPackage/usb-net-asix-ax88179/description + Kernel module for USB-to-Ethernet ASIX AX88179 based USB 3.0/2.0 + to Gigabit Ethernet adapters. +endef + +$(eval $(call KernelPackage,usb-net-asix-ax88179)) + + define KernelPackage/usb-net-hso TITLE:=Kernel module for Option USB High Speed Mobile Devices KCONFIG:=CONFIG_USB_HSO @@ -1230,7 +1311,7 @@ define KernelPackage/usb-net-huawei-cdc-ncm KCONFIG:=CONFIG_USB_NET_HUAWEI_CDC_NCM FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/huawei_cdc_ncm.ko AUTOLOAD:=$(call AutoProbe,huawei_cdc_ncm) - $(call AddDepends/usb-net,+kmod-usb-net-cdc-ncm +kmod-usb-wdm @!LINUX_3_8 @!LINUX_3_10) + $(call AddDepends/usb-net,+kmod-usb-net-cdc-ncm +kmod-usb-wdm) endef define KernelPackage/usb-net-huawei-cdc-ncm/description @@ -1288,11 +1369,10 @@ $(eval $(call KernelPackage,usb-net-kalmia)) define KernelPackage/usb-hid TITLE:=Support for USB Human Input Devices KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID CONFIG_USB_HIDDEV=y + DEPENDS:=+kmod-hid +kmod-hid-generic +kmod-input-evdev FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko AUTOLOAD:=$(call AutoProbe,usbhid) $(call AddDepends/usb) - $(call AddDepends/hid,+kmod-hid-generic) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-hid/description @@ -1304,11 +1384,11 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink TITLE:=USB Yealink VOIP phone + DEPENDS:=+kmod-input-evdev KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko AUTOLOAD:=$(call AutoProbe,yealink) $(call AddDepends/usb) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-yealink/description @@ -1320,11 +1400,11 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 TITLE:=Support for CM109 device + DEPENDS:=+kmod-input-evdev KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko AUTOLOAD:=$(call AutoProbe,cm109) $(call AddDepends/usb) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-cm109/description @@ -1354,9 +1434,7 @@ define KernelPackage/usbip KCONFIG:= \ CONFIG_USBIP_CORE \ CONFIG_USBIP_DEBUG=n - FILES:= \ - $(LINUX_DIR)/drivers/staging/usbip/usbip-core.ko@lt3.17 \ - $(LINUX_DIR)/drivers/usb/usbip/usbip-core.ko@ge3.17 + FILES:=$(LINUX_DIR)/drivers/usb/usbip/usbip-core.ko AUTOLOAD:=$(call AutoProbe,usbip-core) $(call AddDepends/usb) endef @@ -1368,9 +1446,7 @@ define KernelPackage/usbip-client TITLE := USB-over-IP client driver DEPENDS := +kmod-usbip KCONFIG := CONFIG_USBIP_VHCI_HCD - FILES := \ - $(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.ko@lt3.17 \ - $(LINUX_DIR)/drivers/usb/usbip/vhci-hcd.ko@ge3.17 + FILES :=$(LINUX_DIR)/drivers/usb/usbip/vhci-hcd.ko AUTOLOAD := $(call AutoProbe,vhci-hcd) $(call AddDepends/usb) endef @@ -1383,9 +1459,7 @@ $(call KernelPackage/usbip/Default) TITLE := USB-over-IP host driver DEPENDS := +kmod-usbip KCONFIG := CONFIG_USBIP_HOST - FILES := \ - $(LINUX_DIR)/drivers/staging/usbip/usbip-host.ko@lt3.17 \ - $(LINUX_DIR)/drivers/usb/usbip/usbip-host.ko@ge3.17 + FILES :=$(LINUX_DIR)/drivers/usb/usbip/usbip-host.ko AUTOLOAD := $(call AutoProbe,usbip-host) $(call AddDepends/usb) endef @@ -1447,7 +1521,7 @@ endef $(eval $(call KernelPackage,usbmon)) -XHCI_FILES := $(wildcard $(patsubst %,$(LINUX_DIR)/drivers/usb/host/%.ko,xhci-hcd xhci-pci xhci-plat)) +XHCI_FILES := $(wildcard $(patsubst %,$(LINUX_DIR)/drivers/usb/host/%.ko,xhci-hcd xhci-pci xhci-plat-hcd)) XHCI_AUTOLOAD := $(patsubst $(LINUX_DIR)/drivers/usb/host/%.ko,%,$(XHCI_FILES)) define KernelPackage/usb3 @@ -1457,6 +1531,7 @@ define KernelPackage/usb3 CONFIG_USB_XHCI_HCD \ CONFIG_USB_XHCI_PCI \ CONFIG_USB_XHCI_PLATFORM \ + CONFIG_USB_XHCI_MVEBU=y \ CONFIG_USB_XHCI_HCD_DEBUGGING=n FILES:= \ $(XHCI_FILES)