[OpenWrt-Devel] [PATCH] kernel: Fix USB gadget modules for v3.18

[Owen Kirby]

The directory layout of the USB gadget subsystem changed between kernels 3.14 and
3.18, so the makefile for kmod-usb-eth-gadget and kmod-usb-serial-gadget need to
be adjusted to match.

Signed-off-by: Owen Kirby <osk at exegin.com>
---
  package/kernel/linux/modules/usb.mk | 28 ++++++++++++++--------------
  target/linux/generic/config-3.18    |  1 +
  2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 6faa437..ef58b9d 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -254,15 +254,15 @@ 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),)
+ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko),)
    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
+	$(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko
+  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/function/u_rndis.ko),)
+    FILES+=$(LINUX_DIR)/drivers/usb/gadget/function/u_rndis.ko
    endif
    AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
  else
@@ -283,13 +283,13 @@ 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),)
+ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko),)
    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 \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_obex.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_serial.ko \
+	$(LINUX_DIR)/drivers/usb/gadget/legacy/g_serial.ko
    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 e8ae342..7ad0efc 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
-- 
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel