[PATCH] Consolidate gadget config

[riku.voipio@linaro.org]

From: Riku Voipio <riku.voipio@linaro.org>

If CONFIG_USB_GADGET is selected, enable all configfs functions as
modules and most popular legacy modules (ethernet and serial).
g_nokia left as armhf specific (Nokia N900 tradition)

---
 debian/config/armhf/config |  3 ---
 debian/config/config       | 31 +++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 5fe1fd751..9092a250e 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -1114,9 +1114,6 @@ CONFIG_USB_GADGET=m
 ##
 ## file: drivers/usb/gadget/legacy/Kconfig
 ##
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
 CONFIG_USB_G_NOKIA=m
 
 ##
diff --git a/debian/config/config b/debian/config/config
index c744073f9..d6ec09462 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4609,6 +4609,37 @@ CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+
+##
+## file: drivers/usb/gadget/legacy/Kconfig
+##
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_G_SERIAL=m
 
 ##
 ## file: drivers/usb/gadget/udc/Kconfig
-- 
2.11.0