From patchwork Thu Sep 8 14:47:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 667653 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sVNXj19Ybz9ryQ for ; Fri, 9 Sep 2016 00:49:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gateworks-com.20150623.gappssmtp.com header.i=@gateworks-com.20150623.gappssmtp.com header.b=PWMTKFr2; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi0cJ-0006zb-Hv; Thu, 08 Sep 2016 14:47:51 +0000 Received: from mail-pf0-x229.google.com ([2607:f8b0:400e:c00::229]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi0cC-0006wI-03 for lede-dev@lists.infradead.org; Thu, 08 Sep 2016 14:47:47 +0000 Received: by mail-pf0-x229.google.com with SMTP id w87so18931389pfk.2 for ; Thu, 08 Sep 2016 07:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gateworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LkhRmTCZM5XWKir+1IPi6Blniy5R9lqxvg3Zp0vzFt8=; b=PWMTKFr2+ZGxKaFvsLXmsuv325oUMNEg4xe4HUEwjvjEHpMWBEGjQk0WPQy64+cQnE vmVBBAzNbsTgwDXUyWh0YDgpag2t4x/pYZhohYmkad8OUQBr3BzRT7D5kgDIR7zkqTZi JIsNu0eobWqvGvnhpLuHtqYkk4XyNRlzVq2wGGxIW1wSsad6sqMOl+BjYt37WtNK/0LG 6UbyOGHlvARC3QTVDIsUdrCBUTdigLQnYjbchaG148phaXqOLmzmCc5JXFk0bL5sz5TS QMq5bMzCeOU6FPgjYRxxMkGBKn2XbKPNTvfPlnAF+g7L1fiqPecChB61wugHaaRW5XmF WRAQ== 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:in-reply-to :references; bh=LkhRmTCZM5XWKir+1IPi6Blniy5R9lqxvg3Zp0vzFt8=; b=TBcekFGiPEhsB/MxYm3BoCZvcWt8MqM/x3281zaFxeyUckvCFTKKhA4a/m5Ov+bt6P 6h9RKXAkXvnequw7fhuSETJc6Bnb/lGrwE3+AlHrzWQw8mGcvseTfqRNYGO7O1KD2q5U gsmmMZEeo324Gsbe2hMUAcgyF+BW+Bc4MX+V3/vZOOiUAkX+YGgOEbHEjXGxjal7DLxU QTRC5PfE62qArkG+8zik4JS64up+LAXc74BfAvRHEzpeLWHD9dGvwYu0sBSz8egyeoex 3Cpb0AGzFOnCcID5VYqOT5cVsEcEW3wgCuaMErHdr+lTF2M7ZxBUWwARphrp1LHRkM6R hy6Q== X-Gm-Message-State: AE9vXwONXmLfWDNpr0Jzcj4BZl/TSq32NNiJF49YVQDbIM3PK1Tw+8/j1S1awipKWXxHiA== X-Received: by 10.98.58.19 with SMTP id h19mr21180011pfa.125.1473346042785; Thu, 08 Sep 2016 07:47:22 -0700 (PDT) Received: from tharvey.pdc.gateworks.com (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by smtp.gmail.com with ESMTPSA id p4sm56929861pfp.60.2016.09.08.07.47.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 07:47:22 -0700 (PDT) From: Tim Harvey To: lede-dev@lists.infradead.org Date: Thu, 8 Sep 2016 07:47:13 -0700 Message-Id: <1473346033-15172-1-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1472741552-16777-1-git-send-email-tharvey@gateworks.com> References: <1472741552-16777-1-git-send-email-tharvey@gateworks.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160908_074744_163919_A673049E X-CRM114-Status: UNSURE ( 9.98 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH v3] kernel: clean up usb gadget support X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felix Fietkau , John Crispin MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org clean up usb gadget support: - rename gadget modules so that they appear under the usb-gadget sub-menu - change deps to auto-select Signed-off-by: Tim Harvey --- v3: - update targets that use gadgets with new names v2: - leave libcomposite so opkg deps don't collide - do not rename modules to match kernel module names to avoid using _ char which is used to separate package name from version Signed-off-by: Tim Harvey --- package/kernel/linux/modules/usb.mk | 34 +++++++++++++++--------------- target/linux/at91/Makefile | 2 +- target/linux/omap24xx/profiles/100-n810.mk | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 52c28c9..3bea083 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -222,7 +222,7 @@ $(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 + DEPENDS:=kmod-usb-gadget +kmod-fs-configfs FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko AUTOLOAD:=$(call AutoLoad,50,libcomposite) $(call AddDepends/usb) @@ -234,31 +234,31 @@ endef $(eval $(call KernelPackage,usb-lib-composite)) -define KernelPackage/usb-ehci-debug-gadget +define KernelPackage/usb-gadget-ehci-debug TITLE:=USB EHCI debug port Gadget support KCONFIG:=\ CONFIG_USB_G_DBGP \ CONFIG_USB_G_DBGP_SERIAL=y \ CONFIG_USB_G_DBGP_PRINTK=n - DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite +kmod-usb-serial-gadget + DEPENDS:=kmod-usb-gadget +kmod-usb-lib-composite +kmod-usb-serial-gadget FILES:=$(LINUX_DIR)/drivers/usb/gadget/legacy/g_dbgp.ko AUTOLOAD:=$(call AutoLoad,52,g_dbgp) $(call AddDepends/usb) endef -define KernelPackage/usb-ehci-debug-gadget/description +define KernelPackage/usb-gadget-ehci-debug/description Kernel support for USB EHCI debug port Gadget. endef -$(eval $(call KernelPackage,usb-ehci-debug-gadget)) +$(eval $(call KernelPackage,usb-gadget-ehci-debug)) -define KernelPackage/usb-eth-gadget +define KernelPackage/usb-gadget-eth TITLE:=USB Ethernet Gadget support KCONFIG:= \ CONFIG_USB_ETH \ CONFIG_USB_ETH_RNDIS=y \ CONFIG_USB_ETH_EEM=n - DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite + DEPENDS:=kmod-usb-gadget +kmod-usb-lib-composite FILES:= \ $(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko \ @@ -269,17 +269,17 @@ define KernelPackage/usb-eth-gadget $(call AddDepends/usb) endef -define KernelPackage/usb-eth-gadget/description +define KernelPackage/usb-gadget-eth/description Kernel support for USB Ethernet Gadget endef -$(eval $(call KernelPackage,usb-eth-gadget)) +$(eval $(call KernelPackage,usb-gadget-eth)) -define KernelPackage/usb-serial-gadget +define KernelPackage/usb-gadget-serial TITLE:=USB Serial Gadget support KCONFIG:=CONFIG_USB_G_SERIAL - DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite + DEPENDS:=kmod-usb-gadget +kmod-usb-lib-composite FILES:= \ $(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko \ @@ -290,16 +290,16 @@ define KernelPackage/usb-serial-gadget $(call AddDepends/usb) endef -define KernelPackage/usb-serial-gadget/description +define KernelPackage/usb-gadget-serial/description Kernel support for USB Serial Gadget. endef -$(eval $(call KernelPackage,usb-serial-gadget)) +$(eval $(call KernelPackage,usb-gadget-serial)) -define KernelPackage/usb-mass-storage-gadget +define KernelPackage/usb-gadget-mass-storage TITLE:=USB Mass Storage support KCONFIG:=CONFIG_USB_MASS_STORAGE - DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite + DEPENDS:=kmod-usb-gadget +kmod-usb-lib-composite FILES:= \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_mass_storage.ko \ $(LINUX_DIR)/drivers/usb/gadget/legacy/g_mass_storage.ko @@ -307,11 +307,11 @@ define KernelPackage/usb-mass-storage-gadget $(call AddDepends/usb) endef -define KernelPackage/usb-mass-storage-gadget/description +define KernelPackage/usb-gadget-mass-storage/description Kernel support for USB Gadget Mass Storage endef -$(eval $(call KernelPackage,usb-mass-storage-gadget)) +$(eval $(call KernelPackage,usb-gadget-mass-storage)) define KernelPackage/usb-uhci diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 372bf17..bf62051 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -17,6 +17,6 @@ KERNEL_PATCHVER:=4.4 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += kmod-usb-ohci kmod-at91-udc kmod-usb-eth-gadget +DEFAULT_PACKAGES += kmod-usb-ohci kmod-at91-udc kmod-usb-gadget-eth $(eval $(call BuildTarget)) diff --git a/target/linux/omap24xx/profiles/100-n810.mk b/target/linux/omap24xx/profiles/100-n810.mk index 36f3086..bf2598c 100644 --- a/target/linux/omap24xx/profiles/100-n810.mk +++ b/target/linux/omap24xx/profiles/100-n810.mk @@ -16,7 +16,7 @@ define Profile/n810-base kmod-fs-vfat kmod-fs-msdos \ kmod-input-evdev \ kmod-leds-gpio \ - kmod-usb-tahvo kmod-usb-eth-gadget \ + kmod-usb-tahvo kmod-usb-gadget-eth \ kmod-usb-net kmod-usb-net-cdc-ether kmod-usb-net-pegasus kmod-usb-net-rndis \ kmod-usb-storage kmod-usb-hid \ kmod-bluetooth kmod-bluetooth-hci-h4p bluez-utils bluez-hcidump \