From patchwork Sat Feb 21 01:33:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Owen Kirby X-Patchwork-Id: 442170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DE514017F for ; Sat, 21 Feb 2015 12:33:31 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 11A5E28B437; Sat, 21 Feb 2015 02:33:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 87C2528AFC1 for ; Sat, 21 Feb 2015 02:33:15 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .exegin. - helo: .mail-pd0-f173.google. - helo-domain: .google.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=1; rate: -5.5 Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 21 Feb 2015 02:33:14 +0100 (CET) Received: by pdbfl12 with SMTP id fl12so11440108pdb.4 for ; Fri, 20 Feb 2015 17:33:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1uuOHeeaa5qEWjqlDIjRNq9hD/cqOR7ysqarxic9xq0=; b=VgXioehdTyBtWevufgFU7dkSFyapqXeJoiCbDOgmwFYYmOjeogVlChAu9u3E4Zd+pt GYNeu4CDwU21gk/wd6IBlrTaThg0IpbO+Io/QtdZW8YD+LnfUmdGLP/0qh2mQlH7OAmn ERpG0DCRYwqUqUq7L2aCmtDQ6nxO53ltaBvRi9UNpURQM4ErYuN3Q3GAgxVBTq42JOij 7oqjV9gCvRa6zRTDAiwKQ4yPsbjigMZ8sQmdt8v6UfQH2By0T0I2pmWe+sBys8pvyTFp s72FenK5yf4kneZ6U2HQ08At0uqm1kCfSj/x5aw+ioj7aU2Y7vJR4m+6uG+aQEuu1UeZ xzmg== X-Gm-Message-State: ALoCoQkpK7FMFShxvkySHd7mn3giwVykMbMGhfUzTqE4ndoygMOvkRJN0QeVQJNABUmpZPv7lNuT X-Received: by 10.68.190.5 with SMTP id gm5mr777667pbc.164.1424482398484; Fri, 20 Feb 2015 17:33:18 -0800 (PST) Received: from xenon.microplex.com ([184.71.143.130]) by mx.google.com with ESMTPSA id pm2sm28056324pbb.81.2015.02.20.17.33.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Feb 2015 17:33:17 -0800 (PST) From: Owen Kirby To: openwrt-devel@lists.openwrt.org Date: Fri, 20 Feb 2015 17:33:04 -0800 Message-Id: <1424482384-16587-1-git-send-email-osk@exegin.com> X-Mailer: git-send-email 1.9.1 Subject: [OpenWrt-Devel] [PATCH v3] kernel: Fix USB gadget modules for v3.18 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Updated patch that fixes whitespace and supports kernel v3.3 too. Signed-off-by: Owen Kirby --- package/kernel/linux/modules/usb.mk | 38 ++++++++++++++++++++++--------------- target/linux/generic/config-3.18 | 1 + 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 6faa437..acb9213 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 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