From 3b6d2366bd0680093a40c6ef9539b60a3aa6dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20B=C3=BCsch?= <mb@bu3sch.de>
Date: Tue, 24 Aug 2010 15:15:23 +0000
Subject: [PATCH] Add usb gadget packages

SVN-Revision: 22785
---
 package/kernel/modules/usb.mk       | 59 ++++++++++++++++++++++++++++-
 target/linux/omap24xx/config-2.6.35 | 19 ++++++----
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 4c9da9c08e..fa83d91c06 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -33,6 +33,40 @@ define AddDepends/usb
 endef
 
 
+define KernelPackage/usb-gadget
+  TITLE:=USB Gadget support
+  KCONFIG:=CONFIG_USB_GADGET
+  FILES:=
+  AUTOLOAD:=
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-gadget/description
+  Kernel support for USB Gadget mode.
+endef
+
+$(eval $(call KernelPackage,usb-gadget))
+
+
+define KernelPackage/usb-eth-gadget
+  TITLE:=USB Ethernet Gadget support
+  KCONFIG:= \
+	CONFIG_USB_ETH \
+	CONFIG_USB_ETH_RNDIS=y \
+	CONFIG_USB_ETH_EEM=y
+  DEPENDS:=+kmod-usb-gadget
+  FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
+  AUTOLOAD:=$(call AutoLoad,52,usb-eth-gadget)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb-eth-gadget/description
+  Kernel support for USB Ethernet Gadget.
+endef
+
+$(eval $(call KernelPackage,usb-eth-gadget))
+
+
 define KernelPackage/usb-uhci
   TITLE:=Support for UHCI controllers
   KCONFIG:= \
@@ -68,6 +102,27 @@ endef
 $(eval $(call KernelPackage,usb-ohci,1))
 
 
+define KernelPackage/musb-hdrc
+  TITLE:=Support for Mentor Graphics silicon dual role USB
+  KCONFIG:= \
+	CONFIG_USB_MUSB_HDRC \
+	CONFIG_USB_TUSB6010=y \
+	CONFIG_MUSB_PIO_ONLY=n \
+	CONFIG_USB_MUSB_OTG=y \
+	CONFIG_USB_MUSB_DEBUG=y
+  DEPENDS:=@TARGET_omap24xx
+  FILES:=$(LINUX_DIR)/drivers/usb/musb/musb_hdrc.ko
+  AUTOLOAD:=$(call AutoLoad,54,musb-hdrc)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/musb-hdrc/description
+  Kernel support for Mentor Graphics silicon dual role USB device.
+endef
+
+$(eval $(call KernelPackage,musb-hdrc))
+
+
 define KernelPackage/usb-tahvo
   TITLE:=Support for Tahvo (Nokia n810) USB
   KCONFIG:= \
@@ -75,9 +130,9 @@ define KernelPackage/usb-tahvo
 	CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT=n \
 	CONFIG_USB_OHCI_HCD_OMAP1=y \
 	CONFIG_USB_GADGET_DEBUG_FS=n
-  DEPENDS:=@TARGET_omap24xx +kmod-usb-ohci
+  DEPENDS:=@TARGET_omap24xx +kmod-usb-ohci +kmod-musb-hdrc +kmod-usb-gadget
   FILES:=$(LINUX_DIR)/drivers/cbus/tahvo-usb.ko
-  AUTOLOAD:=$(call AutoLoad,51,tahvo-usb)
+  AUTOLOAD:=$(call AutoLoad,55,tahvo-usb)
   $(call AddDepends/usb)
 endef
 
diff --git a/target/linux/omap24xx/config-2.6.35 b/target/linux/omap24xx/config-2.6.35
index 7c1e79bb6e..34b8360fbb 100644
--- a/target/linux/omap24xx/config-2.6.35
+++ b/target/linux/omap24xx/config-2.6.35
@@ -351,7 +351,7 @@ CONFIG_MTD_ONENAND_OTP=y
 # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set
-CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_N810BM=y
 CONFIG_NAMESPACES=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -360,7 +360,7 @@ CONFIG_NETFILTER_XTABLES=y
 # CONFIG_NET_NS is not set
 # CONFIG_NET_SCHED is not set
 CONFIG_NLS=y
-CONFIG_NOP_USB_XCEIV=y
+CONFIG_NOP_USB_XCEIV=m
 CONFIG_NO_HZ=y
 CONFIG_OABI_COMPAT=y
 # CONFIG_OMAP2_DSS is not set
@@ -473,16 +473,16 @@ CONFIG_TOUCHSCREEN_TSC2005=y
 CONFIG_TREE_RCU=y
 CONFIG_TUN=m
 CONFIG_UID16=y
-CONFIG_USB=y
+CONFIG_USB=m
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_RNDIS is not set
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_FUNCTIONFS is not set
-CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_GADGET_AMD5536UDC is not set
 # CONFIG_USB_GADGET_AT91 is not set
@@ -512,22 +512,25 @@ CONFIG_USB_GADGET_VBUS_DRAW=100
 # CONFIG_USB_G_PRINTER is not set
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_INVENTRA_DMA is not set
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MUSB_DEBUG=y
-CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_HDRC_HCD=y
 # CONFIG_USB_MUSB_HOST is not set
 CONFIG_USB_MUSB_OTG=y
 # CONFIG_USB_MUSB_PERIPHERAL is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_OMAP1=y
 CONFIG_USB_OTG=y
 CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_PWC is not set
 CONFIG_USB_SUPPORT=y
+# CONFIG_USB_TI_CPPI_DMA is not set
 CONFIG_USB_TUSB6010=y
+CONFIG_USB_TUSB_OMAP_DMA=y
 # CONFIG_USB_ZERO is not set
 # CONFIG_USER_NS is not set
 CONFIG_V4L_USB_DRIVERS=y