aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-22 08:29:01 +0000
committerJohn Crispin <john@openwrt.org>2015-02-22 08:29:01 +0000
commit7938da42f53ae655c737aa06ddc437d4402bff51 (patch)
tree2a4a25d08e9a07cfd8820ff1d4507cfa1f986e25
parent2f544d56d0188cc89d7156ddfcf6932093fffda8 (diff)
downloadupstream-7938da42f53ae655c737aa06ddc437d4402bff51.tar.gz
upstream-7938da42f53ae655c737aa06ddc437d4402bff51.tar.bz2
upstream-7938da42f53ae655c737aa06ddc437d4402bff51.zip
kernel: Fix USB gadget modules for v3.18
Updated patch that fixes whitespace and supports kernel v3.3 too. Signed-off-by: Owen Kirby <osk@exegin.com> SVN-Revision: 44502
-rw-r--r--package/kernel/linux/modules/usb.mk38
-rw-r--r--target/linux/generic/config-3.181
2 files changed, 24 insertions, 15 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 6faa437bca..acb92133f0 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -254,16 +254,19 @@ define KernelPackage/usb-eth-gadget
CONFIG_USB_ETH_RNDIS=y \
CONFIG_USB_ETH_EEM=n
DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
-ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),)
+ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),)
FILES:= \
- $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \
- $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko \
- $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko \
- $(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko \
- $(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
- ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko),)
- FILES+=$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko
- endif
+ $(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko@lt3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko@lt3.14 \
+ $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko@lt3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko@lt3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko@lt3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/g_ether.ko@lt3.18
AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
else
FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
@@ -283,13 +286,18 @@ define KernelPackage/usb-serial-gadget
TITLE:=USB Serial Gadget support
KCONFIG:=CONFIG_USB_G_SERIAL
DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
-ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko),)
+ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8),)
FILES:= \
- $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko \
- $(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko \
- $(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko \
- $(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko \
- $(LINUX_DIR)/drivers/usb/gadget/g_serial.ko
+ $(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_obex.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_serial.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/legacy/g_serial.ko@ge3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko@lt3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko@lt3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko@lt3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko@lt3.18 \
+ $(LINUX_DIR)/drivers/usb/gadget/g_serial.ko@lt3.18
AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial)
else
FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index e8ae342613..7ad0efcb0a 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -4055,6 +4055,7 @@ CONFIG_USB_EZUSB=y
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
CONFIG_USB_GADGET_VBUS_DRAW=2
+# CONFIG_USB_GADGET_XILINX is not set
# CONFIG_USB_GL860 is not set
# CONFIG_USB_GOKU is not set
# CONFIG_USB_GPIO_VBUS is not set