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 <[email protected]> --- 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 --- package/kernel/linux/modules/usb.mk | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 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 -- 1.9.1 _______________________________________________ Lede-dev mailing list [email protected] http://lists.infradead.org/mailman/listinfo/lede-dev
