aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-11-03 20:17:52 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-11-03 20:17:52 +0000
commit1f3c0f9c54fc421c8c772da49eee79f58b9abc25 (patch)
tree7c66318ef8e2eca19adfad31be10ed1f5bc18785
parent24d73fbd338ac8cedc6ec92f8db1738fff1b483b (diff)
downloadupstream-1f3c0f9c54fc421c8c772da49eee79f58b9abc25.tar.gz
upstream-1f3c0f9c54fc421c8c772da49eee79f58b9abc25.tar.bz2
upstream-1f3c0f9c54fc421c8c772da49eee79f58b9abc25.zip
kernel: fix dependencies of usb-eth-gadget
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38638
-rw-r--r--package/kernel/linux/modules/usb.mk21
1 files changed, 18 insertions, 3 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 1614419273..bec9f6bd8f 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -39,8 +39,8 @@ endef
define KernelPackage/usb-gadget
TITLE:=USB Gadget support
KCONFIG:=CONFIG_USB_GADGET
- FILES:=
- AUTOLOAD:=
+ FILES:=$(LINUX_DIR)/drivers/usb/gadget/udc-core.ko
+ AUTOLOAD:=$(call AutoLoad,45,udc-core)
DEPENDS:=@USB_GADGET_SUPPORT
$(call AddDepends/usb)
endef
@@ -51,6 +51,21 @@ endef
$(eval $(call KernelPackage,usb-gadget))
+define KernelPackage/usb-lib-composite
+ TITLE:=USB lib composite
+ KCONFIG:=CONFIG_USB_LIBCOMPOSITE
+ DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs @!LINUX_3_3 @!LINUX_3_6
+ FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko
+ AUTOLOAD:=$(call AutoLoad,50,libcomposite)
+ $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-lib-composite/description
+ Lib Composite
+endef
+
+$(eval $(call KernelPackage,usb-lib-composite))
+
define KernelPackage/usb-eth-gadget
TITLE:=USB Ethernet Gadget support
@@ -58,7 +73,7 @@ define KernelPackage/usb-eth-gadget
CONFIG_USB_ETH \
CONFIG_USB_ETH_RNDIS=y \
CONFIG_USB_ETH_EEM=y
- DEPENDS:=+kmod-usb-gadget
+ DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite
FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
AUTOLOAD:=$(call AutoLoad,52,g_ether)
$(call AddDepends/usb)