diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-11-17 20:41:05 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-11-17 20:41:05 +0000 |
| commit | 843bf7364eaa4b50a85e83c15b8c2f45a0670520 (patch) | |
| tree | 7799ea05bdd3c8005259f370b9ea62ac433c44be | |
| parent | 017cb84224efec734d2310170763decdb45bd43c (diff) | |
| download | kernel-843bf7364eaa4b50a85e83c15b8c2f45a0670520.tar.gz kernel-843bf7364eaa4b50a85e83c15b8c2f45a0670520.tar.xz kernel-843bf7364eaa4b50a85e83c15b8c2f45a0670520.zip | |
Fix up ARM usb gadget config to make it useful
| -rw-r--r-- | config-armv7 | 36 | ||||
| -rw-r--r-- | config-armv7-generic | 56 | ||||
| -rw-r--r-- | kernel.spec | 3 |
3 files changed, 60 insertions, 35 deletions
diff --git a/config-armv7 b/config-armv7 index dfdc7cfea..b2d9f4f5e 100644 --- a/config-armv7 +++ b/config-armv7 @@ -349,6 +349,7 @@ CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y # CONFIG_USB_CHIPIDEA_DEBUG is not set +CONFIG_USB_FSL_USB2=m CONFIG_NET_VENDOR_FREESCALE=y CONFIG_FEC=m CONFIG_KEYBOARD_IMX=m @@ -610,41 +611,6 @@ CONFIG_REGULATOR_MAX8907=m CONFIG_REGULATOR_MAX8952=m CONFIG_REGULATOR_MAX8973=m -# usb gadget -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_MUSB_HDRC=m -CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_MUSB_DUAL_ROLE=y -CONFIG_USB_MUSB_DSPS=m -CONFIG_USB_GPIO_VBUS=m -# CONFIG_MUSB_PIO_ONLY is not set -# CONFIG_USB_MUSB_DEBUG is not set -CONFIG_USB_GADGET_VBUS_DRAW=100 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -# CONFIG_USB_FSL_USB2 is not set -# CONFIG_USB_FUSB300 is not set -# CONFIG_USB_RENESAS_USBHS is not set -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -# CONFIG_USB_GADGET_VBUS_DRAW is not set -# CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS is not set -# CONFIG_USB_FOTG210_UDC is not set -# CONFIG_USB_R8A66597 is not set -# CONFIG_USB_PXA27X is not set -# CONFIG_USB_MV_UDC is not set -# CONFIG_USB_MV_U3D is not set -# CONFIG_USB_M66592 is not set -# CONFIG_USB_AMD5536UDC is not set -# CONFIG_USB_NET2272 is not set -# CONFIG_USB_NET2280 is not set -# CONFIG_USB_GOKU is not set -# CONFIG_USB_EG20T is not set -# CONFIG_USB_DUMMY_HCD is not set -# CONFIG_USB_ZERO_HNPTEST is not set -# CONFIG_USB_ETH_RNDIS is not set -# CONFIG_USB_ETH_EEM is not set - # Needs work/investigation # CONFIG_MTD_AFS_PARTS is not set # CONFIG_IP_PNP_RARP is not set diff --git a/config-armv7-generic b/config-armv7-generic index 980e5ff10..29c90e068 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -167,6 +167,62 @@ CONFIG_AX88796_93CX6=y CONFIG_USB_ISP1760_HCD=m # CONFIG_USB_EHCI_HCD_ORION is not set +# usb gadget +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_MUSB_HDRC=m +CONFIG_USB_GADGET_VBUS_DRAW=100 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_DUAL_ROLE=y +CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_GPIO_VBUS=m +CONFIG_USB_G_ACM_MS=m +CONFIG_USB_G_DBGP=m +CONFIG_USB_G_DBGP_PRINTK=y +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_CDC=y +# CONFIG_USB_G_MULTI_RNDIS is not set +CONFIG_USB_G_NCM=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_ETH_EEM=y +# CONFIG_USB_ETH_RNDIS is not set +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_GADGET_TARGET=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_OBEX=y +# CONFIG_USB_CONFIGFS_RNDIS is not set +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_STORAGE=y + +# CONFIG_MUSB_PIO_ONLY is not set +# CONFIG_USB_MUSB_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +# CONFIG_USB_FUSB300 is not set +# CONFIG_USB_RENESAS_USBHS is not set +# CONFIG_USB_FOTG210_UDC is not set +# CONFIG_USB_R8A66597 is not set +# CONFIG_USB_PXA27X is not set +# CONFIG_USB_MV_UDC is not set +# CONFIG_USB_MV_U3D is not set +# CONFIG_USB_M66592 is not set +# CONFIG_USB_AMD5536UDC is not set +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_NET2280 is not set +# CONFIG_USB_GOKU is not set +# CONFIG_USB_EG20T is not set +# CONFIG_USB_DUMMY_HCD is not set +# CONFIG_USB_ZERO_HNPTEST is not set + # Multifunction Devices CONFIG_MFD_TPS65090=y CONFIG_MFD_TPS65217=y diff --git a/kernel.spec b/kernel.spec index 4c8b3b433..1b8e03334 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2261,6 +2261,9 @@ fi # ||----w | # || || %changelog +* Sun Nov 17 2013 Peter Robinson <pbrobinson@fedoraproject.org> +- Fix up ARM usb gadget config to make it useful + * Thu Nov 14 2013 Josh Boyer <jwboyer@fedoraproject.org> - CVE-2013-4563: net: large udp packet over IPv6 over UFO-enabled device with TBF qdisc panic (rhbz 1030015 1030017) |