kernel: mark kmod-usb-phy-nop as hidden to avoid building it where it is not needed

[openwrt.git] / package / kernel / linux / modules / usb.mk

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 6537f09294b15d36973e22afab578cfacfbd158f..882809fc09ce524714d148b93bbabb397ade6cc1 100644 (file)
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -102,6 +102,7 @@ $(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,43,phy-generic)
@@ -253,11 +254,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
@@ -405,9 +408,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