aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux/modules/usb.mk
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-19 08:21:24 -0800
committerDavid Bauer <mail@david-bauer.net>2021-02-23 20:13:22 +0100
commit30b482551d838f0a4a2d0d024a28ac6393f6ab9c (patch)
treeab7934a8247e00324214d06da71d63070072aba9 /package/kernel/linux/modules/usb.mk
parent57fdcf66f0c2ae4410a169dfbc1bd5a2c66771b0 (diff)
downloadupstream-30b482551d838f0a4a2d0d024a28ac6393f6ab9c.tar.gz
upstream-30b482551d838f0a4a2d0d024a28ac6393f6ab9c.tar.bz2
upstream-30b482551d838f0a4a2d0d024a28ac6393f6ab9c.zip
kernel: 5.10: fix kmod build failures
Modify existing modules to reflect their new location in Linux 5.10. Add missing dependenices. Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> [enable CRYPTO_USER_API_ENABLE_OBSOLETE; add kmod-crypto-hash dependency to usb-net-rtl8152] Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'package/kernel/linux/modules/usb.mk')
-rw-r--r--package/kernel/linux/modules/usb.mk26
1 files changed, 20 insertions, 6 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 3dd20a0696..e7498af31c 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -412,7 +412,7 @@ $(eval $(call KernelPackage,usb2-pci))
define KernelPackage/usb-dwc2
TITLE:=DWC2 USB controller driver
- DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget
+ DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget +kmod-usb-roles
KCONFIG:= \
CONFIG_USB_PCI=y \
CONFIG_USB_DWC2 \
@@ -1325,7 +1325,7 @@ define KernelPackage/usb-net-rtl8152
KCONFIG:=CONFIG_USB_RTL8152
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko
AUTOLOAD:=$(call AutoProbe,r8152)
- $(call AddDepends/usb-net)
+ $(call AddDepends/usb-net, +LINUX_5_10:kmod-crypto-hash)
endef
define KernelPackage/usb-net-rtl8152/description
@@ -1587,21 +1587,20 @@ endef
$(eval $(call KernelPackage,usbip-server))
-
define KernelPackage/usb-chipidea
TITLE:=Host and device support for Chipidea controllers
- DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget @TARGET_ath79 +kmod-usb-ehci +kmod-usb-phy-nop
+ DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget @TARGET_ath79 +kmod-usb-ehci +kmod-usb-phy-nop +kmod-usb-roles
KCONFIG:= \
CONFIG_EXTCON \
CONFIG_USB_CHIPIDEA \
+ CONFIG_USB_CHIPIDEA_GENERIC \
CONFIG_USB_CHIPIDEA_HOST=y \
CONFIG_USB_CHIPIDEA_UDC=y \
CONFIG_USB_CHIPIDEA_DEBUG=y
FILES:= \
$(LINUX_DIR)/drivers/extcon/extcon-core.ko \
$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
- $(LINUX_DIR)/drivers/usb/common/ulpi.ko \
- $(LINUX_DIR)/drivers/usb/roles/roles.ko
+ $(LINUX_DIR)/drivers/usb/common/ulpi.ko
AUTOLOAD:=$(call AutoLoad,39,ci_hdrc,1)
$(call AddDepends/usb)
endef
@@ -1699,6 +1698,21 @@ endef
$(eval $(call KernelPackage,usb-net2280))
+define KernelPackage/usb-roles
+ TITLE:=USB Role Switch Library Module
+ KCONFIG:=CONFIG_USB_ROLE_SWITCH
+ HIDDEN:=1
+ FILES:=$(LINUX_DIR)/drivers/usb/roles/roles.ko
+ $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-roles/description
+ Support for USB Role Switch
+endef
+
+$(eval $(call KernelPackage,usb-roles))
+
+
define KernelPackage/chaoskey
SUBMENU:=$(USB_MENU)
TITLE:=Chaoskey hardware RNG support