diff mbox

[LEDE-DEV,v3] kernel: clean up usb gadget support

Message ID 1473346033-15172-1-git-send-email-tharvey@gateworks.com
State Superseded
Headers show

Commit Message

Tim Harvey Sept. 8, 2016, 2:47 p.m. UTC 
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 <tharvey@gateworks.com>
---
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 <tharvey@gateworks.com>
---
 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(-)

Comments

Felix Fietkau Sept. 8, 2016, 3:14 p.m. UTC | #1 
On 2016-09-08 16:47, Tim Harvey wrote:
> 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 <tharvey@gateworks.com>
> ---
> 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 <tharvey@gateworks.com>
> ---
>  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(-)
> 
> --- 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 \
This is still broken, because kmod-usb-eth-gadget now depends on
kmod-usb-gadget instead of selecting it.
Maybe it would be a good idea to leave the dependencies alone and just
mark kmod-usb-gadget and kmod-usb-lib-composite as hidden.

- Felix
Tim Harvey Sept. 8, 2016, 3:39 p.m. UTC | #2 
On Thu, Sep 8, 2016 at 8:14 AM, Felix Fietkau <nbd@nbd.name> wrote:
> On 2016-09-08 16:47, Tim Harvey wrote:
>> 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 <tharvey@gateworks.com>
>> ---
>> 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 <tharvey@gateworks.com>
>> ---
>>  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(-)
>>
>> --- 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 \
> This is still broken, because kmod-usb-eth-gadget now depends on
> kmod-usb-gadget instead of selecting it.
> Maybe it would be a good idea to leave the dependencies alone and just
> mark kmod-usb-gadget and kmod-usb-lib-composite as hidden.
>

I could add kmod-usb-lib-composite and kmod-usb-gadget to the two
targets that default them, but yes I think a better option is to
forget about the submenu and make those as hidden as I see no value in
users selecting them without a gadget driver that uses them.

Tim
diff mbox

Patch

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 \