ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-25 08:21:14 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

kernel: Fix USB gadget modules for v3.18

Browse Source 
Updated patch that fixes whitespace and supports kernel v3.3 too.

Signed-off-by: Owen Kirby <osk@exegin.com>

SVN-Revision: 44502
This commit is contained in:
John Crispin 2015-02-22 08:29:01 +00:00
parent 2f544d56d0
commit 7938da42f5
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,16 +254,19 @@ define KernelPackage/usb-eth-gadget
CONFIG_USB_ETH_RNDIS=y \ CONFIG_USB_ETH_RNDIS=y \
CONFIG_USB_ETH_EEM=n CONFIG_USB_ETH_EEM=n
DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),) ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),)
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko $(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko@ge3.18 \
ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko),) $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko@lt3.18 \
FILES+=$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko@lt3.14 \
endif $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko@lt3.18
AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether) AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
else else
FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
@ -283,13 +286,18 @@ define KernelPackage/usb-serial-gadget
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
ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko),) ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8),)
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/usb/gadget/u_serial.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_obex.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_serial.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko $(LINUX_DIR)/drivers/usb/gadget/legacy/g_serial.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/u_serial.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko@lt3.18
AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial) AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial)
else else
FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko

1
target/linux/generic/config-3.18
View File

@ -4055,6 +4055,7 @@ CONFIG_USB_EZUSB=y
# CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_VBUS_DRAW=2
# CONFIG_USB_GADGET_XILINX is not set
# CONFIG_USB_GL860 is not set # CONFIG_USB_GL860 is not set
# CONFIG_USB_GOKU is not set # CONFIG_USB_GOKU is not set
# CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GPIO_VBUS is not set