aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-03-05 17:49:09 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-03-05 17:49:09 +0000
commitdaf367240aed689ccc8f063eef4566b1cef8ee18 (patch)
tree3ea24edc436fd6320e2aeab8d61f5fb4ff2eba38 /package/kernel
parent21cf64b4ad001ac0ff1cc0d1e8a0fb61476a501a (diff)
downloadupstream-daf367240aed689ccc8f063eef4566b1cef8ee18.tar.gz
upstream-daf367240aed689ccc8f063eef4566b1cef8ee18.tar.bz2
upstream-daf367240aed689ccc8f063eef4566b1cef8ee18.zip
kernel: mpc85xx: fix build of kmod-usb2-fsl
Fix buildbot error for mpc85xx. ehci-fsl.ko should be packaged inside the usb2 package, because it depends on the ehci kernel module. The fsl-mph-dr-of.ko module can stay in an own package because the ehci driver depends on it. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48932
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/linux/modules/usb.mk19
1 files changed, 10 insertions, 9 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index d3abe18c4f..63d94bff4c 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -365,13 +365,10 @@ $(eval $(call KernelPackage,usb-ohci-pci))
define KernelPackage/usb2-fsl
TITLE:=Support for Freescale USB2 controllers
DEPENDS:=@TARGET_mpc85xx
- KCONFIG:=\
- CONFIG_USB_FSL_MPH_DR_OF \
- CONFIG_USB_EHCI_FSL
- FILES:= \
- $(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko \
- $(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko
- AUTOLOAD:=$(call AutoLoad,39,ehci-fsl fsl-mph-dr-of,1)
+ HIDDEN:=1
+ KCONFIG:=CONFIG_USB_FSL_MPH_DR_OF
+ FILES:=$(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko
+ AUTOLOAD:=$(call AutoLoad,39,fsl-mph-dr-of,1)
$(call AddDepends/usb)
endef
@@ -439,7 +436,8 @@ define KernelPackage/usb2
CONFIG_USB_OCTEON_EHCI=y \
CONFIG_USB_EHCI_HCD_ORION=y \
CONFIG_USB_EHCI_HCD_PLATFORM=y \
- CONFIG_USB_EHCI_HCD_AT91=y
+ CONFIG_USB_EHCI_HCD_AT91=y \
+ CONFIG_USB_EHCI_FSL
FILES:= \
$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko \
$(LINUX_DIR)/drivers/usb/host/ehci-platform.ko
@@ -449,7 +447,10 @@ define KernelPackage/usb2
ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko),)
FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko
endif
- AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel,1)
+ ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko),)
+ FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko
+ endif
+ AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel ehci-fsl,1)
$(call AddDepends/usb)
endef