diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-11-13 22:24:12 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-11-13 22:24:12 +0000 |
| commit | 30781672da3b2e0e0a9a591294f6ebccf331274d (patch) | |
| tree | 34e913333f0b04b7f8f010a4ff19fa885265ead5 /config-armv7-generic | |
| parent | 04ee959ebf5f7336d47686bdffc4a0ab1717c18d (diff) | |
| download | kernel-30781672da3b2e0e0a9a591294f6ebccf331274d.tar.gz kernel-30781672da3b2e0e0a9a591294f6ebccf331274d.tar.xz kernel-30781672da3b2e0e0a9a591294f6ebccf331274d.zip | |
Update ARM configs:
- Move usb gadget from armv7 to armv70-generic
- Cleanup some old OMAP config changes
- Update a few config options based on a number of ARM defconfigs updated upstream
- Fix up some conflicting or differing options between arm config files
Diffstat (limited to 'config-armv7-generic')
| -rw-r--r-- | config-armv7-generic | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index 980e5ff10..f32e2f7f4 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -167,6 +167,39 @@ 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_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_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 + # Multifunction Devices CONFIG_MFD_TPS65090=y CONFIG_MFD_TPS65217=y @@ -189,7 +222,6 @@ CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_EXYNOS4 is not set # GPIO -CONFIG_GPIO_GENERIC_PLATFORM=m # CONFIG_GPIO_EM is not set CONFIG_GPIO_ADNP=m CONFIG_GPIO_MCP23S08=m @@ -236,6 +268,10 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_AES_ARM=m +# DMA +CONFIG_TI_PRIV_EDMA=y +CONFIG_TI_EDMA=y + # EDAC CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=m |