domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: fix kmod-usb3 on platforms without PCI

Browse Source 
Partially restore the wild-card matching for kmod-usb3 modules to fix
build on platforms without PCI which otherwise file, as seen on
buildbot:

ERROR: module '[...]/linux-5.4.102/drivers/usb/host/xhci-pci.ko' is missing.
modules/usb.mk:1675: recipe for target '[...]/kmod-usb3_5.4.102-1_mips_mips32.ipk' failed

Fixes: 7bda2e9aba ("kernel: fix kmod-usb3 dependencies")
Fixes: be23f9818a ("apm821xx: add support for kernel 5.10")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2021-03-06 04:18:10 +00:00
parent 2629d2d5b1
commit 20b6e014a6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/kernel/linux/modules/usb.mk
View File

@@ -1649,6 +1649,10 @@ endef
$(eval $(call KernelPackage,usbmon))
XHCI_MODULES := xhci-pci xhci-plat-hcd
XHCI_FILES := $(wildcard $(patsubst %,$(LINUX_DIR)/drivers/usb/host/%.ko,$(XHCI_MODULES)))
XHCI_AUTOLOAD := $(patsubst $(LINUX_DIR)/drivers/usb/host/%.ko,%,$(XHCI_FILES))
define KernelPackage/usb3
TITLE:=Support for USB3 controllers
DEPENDS:= \
@@ -1662,9 +1666,8 @@ define KernelPackage/usb3
CONFIG_USB_XHCI_PCI \
CONFIG_USB_XHCI_PLATFORM
FILES:= \
$(LINUX_DIR)/drivers/usb/host/xhci-pci.ko \
$(LINUX_DIR)/drivers/usb/host/xhci-plat-hcd.ko
AUTOLOAD:=$(call AutoLoad,54,xhci-pci xhci-plat-hcd,1)
$(XHCI_FILES)
AUTOLOAD:=$(call AutoLoad,54,$(XHCI_AUTOLOAD),1)
$(call AddDepends/usb)
endef