From patchwork Thu Sep 8 15:40:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 667685 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 3sVPjT0bgDz9rxm for ; Fri, 9 Sep 2016 01:42:37 +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=c8UrSdpH; 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 1bi1RO-0002k6-Pf; Thu, 08 Sep 2016 15:40:38 +0000 Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi1RJ-0001yS-LY for lede-dev@lists.infradead.org; Thu, 08 Sep 2016 15:40:35 +0000 Received: by mail-pf0-x22f.google.com with SMTP id w87so19351320pfk.2 for ; Thu, 08 Sep 2016 08:40:13 -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=vO3mh5aIcFLK05ofzee36K1ZbMnPeMTVwwo1q3WGELo=; b=c8UrSdpHOmfy3ZFTBZUI446xZoNWewOYwaT1E6oDtOeszxs1y9LvDH1pa6U/EIxJvw 2ITykiYFDcrGB6eqM4wzMWS66MxUog+MCsCpR1R+KKK5t7TrzpToaTioM2PGdyYiUXuu c9tYHIRLD1xpHvFXi9XnNhECAGsF540JGWb3rsZEineJdrIrBX5Bc9+lm5devOro+wtJ o/gUMS4m46wIAFaZD5wAV7r9kR6OXCeKV1UxI1Xf/ncMe1ThiY5wYhBfzTuOR68VtHXR 35H2OzXwVckgf405/vrFiiLS1hhNCY7mmQN4iMTD+dnmp/8A/Cvl4cJeFea0aHrKqe4K mOdw== 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=vO3mh5aIcFLK05ofzee36K1ZbMnPeMTVwwo1q3WGELo=; b=e8THfYYJwrlU6qnPZEu8zjreZqzLiicrqc53cPfPISbXVKNTQIM9gghIAMwJPpR5A/ m14eulPHNWg3TpSpi7GFjGWFZvXOJ8wFar4d3sbariavvPdxikzn5WWc0hV64WRRFm98 YkDuTS9KHEFeA8RQm+1vSPXhx2H5ILQJP/KzusIfZsihBeVyj8R08IRfuyZt9gFRXoxu QushS+jlvm2HIz0ZEuard1N0pSQbMQQl+NQI6s/5RuVTqdgNEDQ24pgLMfzf6YMdyXrN d5fmBmtDgIA0mt7Q6ICLj9+az+76zjvVE+vZLvzXIrDt4B2+BuWphJxHxfb2b84ia59H 0rgw== X-Gm-Message-State: AE9vXwN/qz5HhDOB9aXoWlj5L0X0WbtYyW+mXLi7TaL6WfYqpAMkw+4O0UD0vFXwbdod1A== X-Received: by 10.98.9.150 with SMTP id 22mr526850pfj.56.1473349212629; Thu, 08 Sep 2016 08:40:12 -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 us6sm57352343pac.20.2016.09.08.08.40.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 08:40:11 -0700 (PDT) From: Tim Harvey To: lede-dev@lists.infradead.org Date: Thu, 8 Sep 2016 08:40:03 -0700 Message-Id: <1473349203-4729-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_084033_791333_2FDF11B3 X-CRM114-Status: GOOD ( 10.30 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400e:c00:0:0:0:22f listed in] [list.dnswl.org] -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 v4] 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 together and are easier to identify as gadget modules - make usb-lib-composite and usb-gadget hidden as there is no point in selecting those without gadget drivers that require them as deps Signed-off-by: Tim Harvey --- v4: - make kmod-usb-gadget and kmod-usb-lib-composite hidden and leave them as auto-selected dependencies 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 | 26 ++++++++++++++------------ target/linux/at91/Makefile | 2 +- target/linux/omap24xx/profiles/100-n810.mk | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 52c28c9..020f474 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -206,6 +206,7 @@ $(eval $(call KernelPackage,usb-phy-twl6030)) define KernelPackage/usb-gadget TITLE:=USB Gadget support KCONFIG:=CONFIG_USB_GADGET + HIDDEN:=1 FILES:=\ $(LINUX_DIR)/drivers/usb/gadget/udc/udc-core.ko AUTOLOAD:=$(call AutoLoad,45,udc-core) @@ -223,6 +224,7 @@ define KernelPackage/usb-lib-composite TITLE:=USB lib composite KCONFIG:=CONFIG_USB_LIBCOMPOSITE DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs + HIDDEN:=1 FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko AUTOLOAD:=$(call AutoLoad,50,libcomposite) $(call AddDepends/usb) @@ -234,7 +236,7 @@ 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 \ @@ -246,13 +248,13 @@ define KernelPackage/usb-ehci-debug-gadget $(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 \ @@ -269,14 +271,14 @@ 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 @@ -290,13 +292,13 @@ 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 @@ -307,11 +309,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 \