[OpenWrt-Devel] [PATCH] kernel/modules: package xhci for kernel>=3.18

[Felix Fietkau]

On 2014-12-02 14:45, Daniel Golle wrote:
> xhci-hcd was split into xhci-pci and xhci-platform since 3.18
> 
> Signed-off-by: Daniel Golle <daniel at makrotopia.org>
> ---
>  package/kernel/linux/modules/usb.mk | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
> 
> diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
> index 4cd3bf0..5850b2f 100644
> --- a/package/kernel/linux/modules/usb.mk
> +++ b/package/kernel/linux/modules/usb.mk
> @@ -1469,10 +1469,25 @@ define KernelPackage/usb3
>    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
> +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.18)),1)
>    AUTOLOAD:=$(call AutoLoad,54,xhci-hcd,1)
> +else
> +  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/xhci-pci.ko),)
> +  FILES+= \
> +	$(LINUX_DIR)/drivers/usb/host/xhci-pci.ko
> +  AUTOLOAD:=$(call AutoLoad,54,xhci-pci,1)
> +  endif
> +  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/xhci-plat.ko),)
> +    FILES+= \
> +	$(LINUX_DIR)/drivers/usb/host/xhci-plat.ko
> +    AUTOLOAD+=$(call AutoLoad,54,xhci-plat,1)
> +  endif
> +endif
>    $(call AddDepends/usb)
>  endef
I think something like this would be cleaner and simpler:
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))

and then use those for FILES and AUTOLOAD in the KernelPackage
definition. The package should probably also use AutoProbe instead of
AutoLoad

- Felix
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel