X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fusb.mk;h=c70057037567ed4bc46135b7b0bd953adca8aaa4;hb=6d52fd203d11c715981d7aea817401ad234c2181;hp=ab7c5dd828f901690f4edc037cd6894c2467a356;hpb=0a6385e94274b869fe848e17df88d188730fae05;p=librecmc%2Flibrecmc.git diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index ab7c5dd828..c700570375 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,9 +16,15 @@ define KernelPackage/usb-core TITLE:=Support for USB DEPENDS:=@USB_SUPPORT KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1) + FILES:= \ + $(LINUX_DIR)/drivers/usb/core/usbcore.ko \ + $(LINUX_DIR)/drivers/usb/common/usb-common.ko +else FILES:= \ $(LINUX_DIR)/drivers/usb/core/usbcore.ko \ $(LINUX_DIR)/drivers/usb/usb-common.ko +endif AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1) $(call AddDepends/nls) endef @@ -49,8 +55,7 @@ define KernelPackage/usb-musb-hdrc CONFIG_USB_MUSB_DEBUG=y DEPENDS:= \ @(TARGET_omap||TARGET_omap24xx) +kmod-usb-gadget \ - +TARGET_omap24xx:kmod-usb-musb-tusb6010 \ - +TARGET_omap:kmod-usb-musb-platformglue + +TARGET_omap24xx:kmod-usb-musb-tusb6010 FILES:=$(LINUX_DIR)/drivers/usb/musb/musb_hdrc.ko AUTOLOAD:=$(call AutoLoad,46,musb_hdrc) $(call AddDepends/usb) @@ -67,11 +72,15 @@ define KernelPackage/usb-musb-platformglue TITLE:=MUSB platform glue layer KCONFIG:= \ CONFIG_USB_MUSB_TUSB6010=n \ - CONFIG_USB_MUSB_OMAP2PLUS \ - CONFIG_USB_MUSB_AM35X \ - CONFIG_USB_MUSB_DSPS=n\ + CONFIG_USB_MUSB_OMAP2PLUS=n \ + CONFIG_USB_MUSB_AM35X=n \ + CONFIG_USB_MUSB_DSPS \ CONFIG_USB_MUSB_UX500=n - DEPENDS:=@TARGET_omap + DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-musb-hdrc +kmod-usb-phy-am335x + FILES:= \ + $(LINUX_DIR)/drivers/usb/musb/musb_dsps.ko \ + $(LINUX_DIR)/drivers/usb/musb/musb_am335x.ko + AUTOLOAD:=$(call AutoLoad,45,phy-omap-control musb_dsps musb_am335x) $(call AddDepends/usb) endef @@ -99,8 +108,19 @@ $(eval $(call KernelPackage,usb-musb-tusb6010)) 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,45,phy-generic) + 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 @@ -113,10 +133,14 @@ $(eval $(call KernelPackage,usb-phy-nop)) define KernelPackage/usb-phy-am335x TITLE:=Support for AM335x USB PHY - KCONFIG:=CONFIG_AM335X_PHY_USB + KCONFIG:= \ + CONFIG_AM335X_PHY_USB \ + CONFIG_AM335X_CONTROL_USB DEPENDS:=@TARGET_omap +kmod-usb-phy-nop - FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-am335x.ko - AUTOLOAD:=$(call AutoLoad,45,phy-am335x) + FILES:= \ + $(LINUX_DIR)/drivers/usb/phy/phy-am335x.ko \ + $(LINUX_DIR)/drivers/usb/phy/phy-am335x-control.ko + AUTOLOAD:=$(call AutoLoad,44,phy-am335x) $(call AddDepends/usb) endef @@ -127,10 +151,30 @@ endef $(eval $(call KernelPackage,usb-phy-am335x)) +define KernelPackage/usb-phy-omap-usb2 + TITLE:=Support for OMAP2 USB PHY + KCONFIG:= \ + CONFIG_OMAP_USB2 \ + CONFIG_OMAP_CONTROL_USB + DEPENDS:=@TARGET_omap + FILES:= \ + $(LINUX_DIR)/drivers/phy/phy-omap-usb2.ko \ + $(LINUX_DIR)/drivers/usb/phy/phy-omap-control.ko + AUTOLOAD:=$(call AutoLoad,45,phy-omap-control phy-omap-usb2) + $(call AddDepends/usb) +endef + +define KernelPackage/usb-phy-omap-usb2/description + Support for AM335x USB PHY +endef + +$(eval $(call KernelPackage,usb-phy-omap-usb2)) + + define KernelPackage/usb-phy-omap-usb3 TITLE:=Support for OMAP USB3 PHY KCONFIG:=CONFIG_OMAP_USB3 - DEPENDS:=@TARGET_omap + DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2 FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-omap-usb3.ko AUTOLOAD:=$(call AutoLoad,45,phy-omap-usb3) $(call AddDepends/usb) @@ -144,9 +188,9 @@ $(eval $(call KernelPackage,usb-phy-omap-usb3)) define KernelPackage/usb-phy-twl4030 - TITLE:=Support for TWL6030 OTG PHY + TITLE:=Support for TWL4030 OTG PHY KCONFIG:=CONFIG_TWL4030_USB - DEPENDS:=@TARGET_omap + DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2 +kmod-usb-musb-hdrc FILES:=$(LINUX_DIR)/drivers/phy/phy-twl4030-usb.ko AUTOLOAD:=$(call AutoLoad,45,phy-twl4030-usb) $(call AddDepends/usb) @@ -162,7 +206,7 @@ $(eval $(call KernelPackage,usb-phy-twl4030)) define KernelPackage/usb-phy-twl6030 TITLE:=Support for TWL6030 OTG PHY KCONFIG:=CONFIG_TWL6030_USB - DEPENDS:=@TARGET_omap + DEPENDS:=@TARGET_omap +kmod-usb-phy-omap-usb2 +kmod-usb-musb-hdrc FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-twl6030-usb.ko AUTOLOAD:=$(call AutoLoad,45,phy-twl6030-usb) $(call AddDepends/usb) @@ -216,11 +260,13 @@ define KernelPackage/usb-eth-gadget ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),) FILES:= \ $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \ - $(LINUX_DIR)/drivers/usb/gadget/u_rndis.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 AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether) else FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko @@ -236,6 +282,32 @@ endef $(eval $(call KernelPackage,usb-eth-gadget)) +define KernelPackage/usb-serial-gadget + TITLE:=USB Serial Gadget support + KCONFIG:=CONFIG_USB_G_SERIAL + DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):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 + 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 + +define KernelPackage/usb-serial-gadget/description + Kernel support for USB Serial Gadget. +endef + +$(eval $(call KernelPackage,usb-serial-gadget)) + + define KernelPackage/usb-uhci TITLE:=Support for UHCI controllers KCONFIG:= \ @@ -260,12 +332,16 @@ define KernelPackage/usb-ohci CONFIG_USB_OHCI \ CONFIG_USB_OHCI_HCD \ CONFIG_USB_OHCI_ATH79=y \ + CONFIG_USB_OHCI_HCD_AT91=y \ CONFIG_USB_OHCI_BCM63XX=y \ 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 - AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1) +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.11.0)),1) + FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko +endif + AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1) $(call AddDepends/usb) endef @@ -296,14 +372,10 @@ $(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 - KCONFIG:=\ - CONFIG_USB_EHCI_HCD_OMAP \ - CONFIG_OMAP_USB2 - FILES:= \ - $(LINUX_DIR)/drivers/phy/phy-omap2-usb.ko \ - $(LINUX_DIR)/drivers/usb/host/ehci-omap.ko - AUTOLOAD:=$(call AutoLoad,39,phy-omap2-usb ehci-omap) + DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-phy-am335x +kmod-usb2 + KCONFIG:=CONFIG_USB_EHCI_HCD_OMAP + FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-omap.ko + AUTOLOAD:=$(call AutoLoad,39,ehci-omap) $(call AddDepends/usb) endef @@ -318,8 +390,7 @@ define KernelPackage/usb2 TITLE:=Support for USB2 controllers DEPENDS:=\ +TARGET_brcm47xx:kmod-usb-brcm47xx \ - +TARGET_mpc85xx:kmod-usb2-fsl \ - +TARGET_omap:kmod-usb2-omap + +TARGET_mpc85xx:kmod-usb2-fsl KCONFIG:=\ CONFIG_USB_EHCI_HCD \ CONFIG_USB_EHCI_ATH79=y \ @@ -333,7 +404,10 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.8.0)),1) FILES:= \ $(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko \ $(LINUX_DIR)/drivers/usb/host/ehci-platform.ko - AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform,1) + ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-orion.ko),) + FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-orion.ko + endif + AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion,1) else FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1) @@ -372,9 +446,15 @@ define KernelPackage/usb-dwc2 CONFIG_USB_DWC2_DEBUG=n \ CONFIG_USB_DWC2_VERBOSE=n \ CONFIG_USB_DWC2_TRACK_MISSED_SOFS=n +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1) + FILES:= \ + $(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko \ + $(LINUX_DIR)/drivers/usb/dwc2/dwc2_platform.ko +else FILES:= \ $(LINUX_DIR)/drivers/staging/dwc2/dwc2.ko \ $(LINUX_DIR)/drivers/staging/dwc2/dwc2_platform.ko +endif AUTOLOAD:=$(call AutoLoad,54,dwc2 dwc2_platform,1) $(call AddDepends/usb) endef @@ -387,6 +467,23 @@ endef $(eval $(call KernelPackage,usb-dwc2)) +define KernelPackage/usb2-oxnas + TITLE:=OXNAS USB controller driver + DEPENDS:=@TARGET_oxnas +kmod-usb2 + KCONFIG:=CONFIG_USB_EHCI_OXNAS + FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-oxnas.ko + AUTOLOAD:=$(call AutoLoad,55,ehci-oxnas,1) + $(call AddDepends/usb) +endef + +define KernelPackage/usb2-oxnas/description + This driver provides USB Device Controller support for the + EHCI USB host built-in to the PLXTECH NAS782x SoC +endef + +$(eval $(call KernelPackage,usb2-oxnas)) + + define KernelPackage/usb-acm TITLE:=Support for modems/isdn controllers KCONFIG:=CONFIG_USB_ACM @@ -906,15 +1003,10 @@ $(eval $(call KernelPackage,usb-atm-cxacru)) define KernelPackage/usb-net TITLE:=Kernel modules for USB-to-Ethernet convertors - KCONFIG:=CONFIG_USB_USBNET CONFIG_MII=y + DEPENDS:=+kmod-mii + KCONFIG:=CONFIG_USB_USBNET AUTOLOAD:=$(call AutoProbe,usbnet) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1) FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko -else - FILES:=\ - $(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko \ - $(LINUX_DIR)/drivers/net/mii.ko -endif $(call AddDepends/usb) endef @@ -1014,7 +1106,7 @@ define KernelPackage/usb-net-smsc95xx KCONFIG:=CONFIG_USB_NET_SMSC95XX FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko AUTOLOAD:=$(call AutoProbe,smsc95xx) - $(call AddDepends/usb-net) + $(call AddDepends/usb-net, +(!LINUX_3_3&&!LINUX_3_6):kmod-lib-crc16) endef define KernelPackage/usb-net-smsc95xx/description @@ -1053,6 +1145,38 @@ endef $(eval $(call KernelPackage,usb-net-cdc-ether)) +define KernelPackage/usb-net-cdc-eem + TITLE:=Support for CDC EEM connections + KCONFIG:=CONFIG_USB_NET_CDC_EEM + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_eem.ko + AUTOLOAD:=$(call AutoProbe,cdc_eem) + $(call AddDepends/usb-net) +endef + +define KernelPackage/usb-net-cdc-eem/description + Kernel support for USB CDC EEM +endef + +$(eval $(call KernelPackage,usb-net-cdc-eem)) + + +define KernelPackage/usb-net-cdc-subset + TITLE:=Support for CDC Ethernet subset connections + KCONFIG:= \ + CONFIG_USB_NET_CDC_SUBSET \ + CONFIG_USB_ARMLINUX + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_subset.ko + AUTOLOAD:=$(call AutoProbe,cdc_subset) + $(call AddDepends/usb-net) +endef + +define KernelPackage/usb-net-cdc-subset/description + Kernel support for Simple USB Network Links (CDC Ethernet subset) +endef + +$(eval $(call KernelPackage,usb-net-cdc-subset)) + + define KernelPackage/usb-net-qmi-wwan TITLE:=QMI WWAN driver KCONFIG:=CONFIG_USB_NET_QMI_WWAN @@ -1115,6 +1239,21 @@ endef $(eval $(call KernelPackage,usb-net-cdc-ncm)) +define KernelPackage/usb-net-huawei-cdc-ncm + TITLE:=Support for Huawei CDC NCM connections + 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-wdm @!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10) +endef + +define KernelPackage/usb-net-huawei-cdc-ncm/description + Kernel support for Huawei CDC NCM connections +endef + +$(eval $(call KernelPackage,usb-net-huawei-cdc-ncm)) + + define KernelPackage/usb-net-sierrawireless TITLE:=Support for Sierra Wireless devices KCONFIG:=CONFIG_USB_SIERRA_NET @@ -1166,7 +1305,7 @@ define KernelPackage/usb-hid FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko AUTOLOAD:=$(call AutoProbe,usbhid) $(call AddDepends/usb) - $(call AddDepends/hid) + $(call AddDepends/hid,+kmod-hid-generic) $(call AddDepends/input,+kmod-input-evdev) endef @@ -1262,13 +1401,13 @@ endef $(eval $(call KernelPackage,usbip-server)) -define KernelPackage/usb-chipidea +define KernelPackage/usb-chipidea-imx TITLE:=Support for ChipIdea controllers - DEPENDS:=+kmod-usb2 + DEPENDS:=@TARGET_imx6||TARGET_mxs +kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget KCONFIG:=\ CONFIG_USB_CHIPIDEA \ CONFIG_USB_CHIPIDEA_HOST=y \ - CONFIG_USB_CHIPIDEA_UDC=n \ + CONFIG_USB_CHIPIDEA_UDC=y \ CONFIG_USB_CHIPIDEA_DEBUG=y ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1) FILES:=\ @@ -1285,17 +1424,17 @@ else endif $(call AddDepends/usb) endef - -define KernelPackage/usb-chipidea/description + +define KernelPackage/usb-chipidea-imx/description Kernel support for USB ChipIdea controllers endef -$(eval $(call KernelPackage,usb-chipidea,1)) +$(eval $(call KernelPackage,usb-chipidea-imx,1)) define KernelPackage/usb-mxs-phy TITLE:=Support for Freescale MXS USB PHY - DEPENDS:=@TARGET_imx6 + DEPENDS:=@TARGET_imx6||TARGET_mxs +TARGET_mxs:kmod-usb-chipidea-imx KCONFIG:=CONFIG_USB_MXS_PHY FILES:=\ $(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko @@ -1324,16 +1463,20 @@ endef $(eval $(call KernelPackage,usbmon)) +XHCI_FILES := $(wildcard $(patsubst %,$(LINUX_DIR)/drivers/usb/host/%.ko,xhci-hcd xhci-pci xhci-plat)) +XHCI_AUTOLOAD := $(patsubst $(LINUX_DIR)/drivers/usb/host/%.ko,%,$(XHCI_FILES)) define KernelPackage/usb3 TITLE:=Support for USB3 controllers DEPENDS:=+TARGET_omap:kmod-usb-phy-omap-usb3 KCONFIG:= \ CONFIG_USB_XHCI_HCD \ + CONFIG_USB_XHCI_PCI \ + CONFIG_USB_XHCI_PLATFORM \ CONFIG_USB_XHCI_HCD_DEBUGGING=n FILES:= \ - $(LINUX_DIR)/drivers/usb/host/xhci-hcd.ko - AUTOLOAD:=$(call AutoLoad,54,xhci-hcd,1) + $(XHCI_FILES) + AUTOLOAD:=$(call AutoLoad,54,$(XHCI_AUTOLOAD),1) $(call AddDepends/usb) endef