X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fusb.mk;h=c70057037567ed4bc46135b7b0bd953adca8aaa4;hb=6d52fd203d11c715981d7aea817401ad234c2181;hp=37b3eb102a62af5f98cf66ba23c12a2e3ebcdf82;hpb=c4ecc47f411b58b7c84aa8a15ba95f000ec6a6df;p=librecmc%2Flibrecmc.git diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 37b3eb102a..c700570375 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -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 @@ -168,7 +174,7 @@ $(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) @@ -276,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:= \ @@ -300,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 @@ -336,7 +372,7 @@ $(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 + 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) @@ -354,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 \ @@ -369,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) @@ -429,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 @@ -1184,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 @@ -1235,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 @@ -1331,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:=\ @@ -1354,12 +1424,12 @@ 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 @@ -1393,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