From patchwork Thu Feb 19 01:54:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Owen Kirby X-Patchwork-Id: 441519 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 0496F1400DE for ; Thu, 19 Feb 2015 12:54:20 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 11CB228C17E; Thu, 19 Feb 2015 02:54:10 +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 C07FC28C179 for ; Thu, 19 Feb 2015 02:54:05 +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-pa0-f54.google. - helo-domain: .google.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=1; rate: -5.5 Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 19 Feb 2015 02:54:02 +0100 (CET) Received: by pabkx10 with SMTP id kx10so5586691pab.13 for ; Wed, 18 Feb 2015 17:54:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:content-type:content-transfer-encoding; bh=a1yBZpDrsijEV0FU9+bwKvvHYXfXKzJWTUgQWT4nc7k=; b=hbcz+NTEV7uqJ4dikMuBlZZWOwzq5xNWwXJB+mzVXiTrnLC2/G3DwINw7p8AZm1duw JML3MZE+FKVyN7S1N++leBlYVYcf6z0Rmym4z5K1bESAQjvgg0mJsZxPiLi1K5KFfepH u4cvb9d6mcPPPNmlOY8BdCVI7SBSuSmM/0q6wxAHBZEPYTTixYSv97bvrOfUDvoDWGS7 hKLPXRSQ8D9khox5H0UQ8hrS7ZBh3lWXuoB979jXAXL92rRtKAwuKNShrHnEhAKa8ddW 53j0xBDy2D19+egY081oD3Y4rHAWz1mujUPz7gullsQTISlmkgEVVIgh484wm96xTitu 4hZw== X-Gm-Message-State: ALoCoQncezG9e7MSLx8Z/xyH+mlI6w77M5L6CTF+lxlJDS5VyLzNenq4r6Y8IT26zL8+gBS+hJ1g X-Received: by 10.66.233.74 with SMTP id tu10mr3254126pac.135.1424310842606; Wed, 18 Feb 2015 17:54:02 -0800 (PST) Received: from [172.16.16.163] ([184.71.143.130]) by mx.google.com with ESMTPSA id ku12sm22168738pab.39.2015.02.18.17.54.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2015 17:54:01 -0800 (PST) Message-ID: <54E54238.2050901@exegin.com> Date: Wed, 18 Feb 2015 17:54:00 -0800 From: Owen Kirby User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: "openwrt-devel@lists.openwrt.org" Subject: [OpenWrt-Devel] [PATCH] 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: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- 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