domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: clean up usb gadget support

Browse Source 
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 <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey
2016-09-08 08:40:03 -07:00
committed by Felix Fietkau
parent eb88a9cacb
commit dc17fde994
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
package/kernel/linux/modules/usb.mk
View File

@@ -206,6 +206,7 @@ $(eval $(call KernelPackage,usb-phy-twl6030))
define KernelPackage/usb-gadget define KernelPackage/usb-gadget
TITLE:=USB Gadget support TITLE:=USB Gadget support
KCONFIG:=CONFIG_USB_GADGET KCONFIG:=CONFIG_USB_GADGET
HIDDEN:=1
FILES:=\ FILES:=\
$(LINUX_DIR)/drivers/usb/gadget/udc/udc-core.ko $(LINUX_DIR)/drivers/usb/gadget/udc/udc-core.ko
AUTOLOAD:=$(call AutoLoad,45,udc-core) AUTOLOAD:=$(call AutoLoad,45,udc-core)
@@ -223,6 +224,7 @@ define KernelPackage/usb-lib-composite
TITLE:=USB lib composite TITLE:=USB lib composite
KCONFIG:=CONFIG_USB_LIBCOMPOSITE KCONFIG:=CONFIG_USB_LIBCOMPOSITE
DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs
HIDDEN:=1
FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko
AUTOLOAD:=$(call AutoLoad,50,libcomposite) AUTOLOAD:=$(call AutoLoad,50,libcomposite)
$(call AddDepends/usb) $(call AddDepends/usb)
@@ -234,7 +236,7 @@ endef
$(eval $(call KernelPackage,usb-lib-composite)) $(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 TITLE:=USB EHCI debug port Gadget support
KCONFIG:=\ KCONFIG:=\
CONFIG_USB_G_DBGP \ CONFIG_USB_G_DBGP \
@@ -246,13 +248,13 @@ define KernelPackage/usb-ehci-debug-gadget
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef
define KernelPackage/usb-ehci-debug-gadget/description define KernelPackage/usb-gadget-ehci-debug/description
Kernel support for USB EHCI debug port Gadget. Kernel support for USB EHCI debug port Gadget.
endef 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 TITLE:=USB Ethernet Gadget support
KCONFIG:= \ KCONFIG:= \
CONFIG_USB_ETH \ CONFIG_USB_ETH \
@@ -269,14 +271,14 @@ define KernelPackage/usb-eth-gadget
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef
define KernelPackage/usb-eth-gadget/description define KernelPackage/usb-gadget-eth/description
Kernel support for USB Ethernet Gadget Kernel support for USB Ethernet Gadget
endef 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 TITLE:=USB Serial Gadget support
KCONFIG:=CONFIG_USB_G_SERIAL KCONFIG:=CONFIG_USB_G_SERIAL
DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
@@ -290,13 +292,13 @@ define KernelPackage/usb-serial-gadget
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef
define KernelPackage/usb-serial-gadget/description define KernelPackage/usb-gadget-serial/description
Kernel support for USB Serial Gadget. Kernel support for USB Serial Gadget.
endef 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 TITLE:=USB Mass Storage support
KCONFIG:=CONFIG_USB_MASS_STORAGE KCONFIG:=CONFIG_USB_MASS_STORAGE
DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
@@ -307,11 +309,11 @@ define KernelPackage/usb-mass-storage-gadget
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef
define KernelPackage/usb-mass-storage-gadget/description define KernelPackage/usb-gadget-mass-storage/description
Kernel support for USB Gadget Mass Storage Kernel support for USB Gadget Mass Storage
endef endef
$(eval $(call KernelPackage,usb-mass-storage-gadget)) $(eval $(call KernelPackage,usb-gadget-mass-storage))
define KernelPackage/usb-uhci define KernelPackage/usb-uhci

2
target/linux/at91/Makefile
View File

@@ -17,6 +17,6 @@ KERNEL_PATCHVER:=4.4
include $(INCLUDE_DIR)/target.mk 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)) $(eval $(call BuildTarget))

2
target/linux/omap24xx/profiles/100-n810.mk
View File

@@ -16,7 +16,7 @@ define Profile/n810-base
kmod-fs-vfat kmod-fs-msdos \ kmod-fs-vfat kmod-fs-msdos \
kmod-input-evdev \ kmod-input-evdev \
kmod-leds-gpio \ 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-net kmod-usb-net-cdc-ether kmod-usb-net-pegasus kmod-usb-net-rndis \
kmod-usb-storage kmod-usb-hid \ kmod-usb-storage kmod-usb-hid \
kmod-bluetooth kmod-bluetooth-hci-h4p bluez-utils bluez-hcidump \ kmod-bluetooth kmod-bluetooth-hci-h4p bluez-utils bluez-hcidump \