diff options
| author | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-10-28 14:17:27 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 14:22:48 +0900 |
| commit | 80c9dfe070aef84983c0c7e2a782dac296b3d2db (patch) | |
| tree | 1f1112ac3f9cb713dc3e2fd4cc6352c404b1ddcb | |
| parent | c65bda312509c575df322f29f380309064397822 (diff) | |
ARM: defconfig: trats2: sync with v4.1.36 rebased tree
This patch is to sync trats2 defconfig with v4.1.36 rebased tree.
Change-Id: Ib0a5eaf7fbed9ddeb1e8fed1941f8185b1001c86
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
| -rw-r--r-- | arch/arm/configs/tizen_trats2_defconfig | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/arch/arm/configs/tizen_trats2_defconfig b/arch/arm/configs/tizen_trats2_defconfig index 082f423b7c9a..431136338a81 100644 --- a/arch/arm/configs/tizen_trats2_defconfig +++ b/arch/arm/configs/tizen_trats2_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.1.0 Kernel Configuration +# Linux/arm 4.1.36 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -2461,6 +2461,7 @@ CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_KMS_FB_HELPER=y # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +# CONFIG_DRM_DMA_SYNC is not set # # I2C encoder or helper chips @@ -2931,7 +2932,39 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_NET2272 is not set # CONFIG_USB_GADGET_XILINX is not set # CONFIG_USB_DUMMY_HCD is not set -# CONFIG_USB_CONFIGFS is not set +CONFIG_USB_LIBCOMPOSITE=y +CONFIG_USB_F_ACM=y +CONFIG_USB_G_SLP_REQ_F_ACM=y +CONFIG_USB_F_ACM_SELECTOR=y +CONFIG_USB_U_SERIAL=y +CONFIG_USB_F_ACM_REQ_U_SERIAL=y +CONFIG_USB_U_SERIAL_SELECTOR=y + +# +# USB Functions +# +# CONFIG_USB_CONFIGFS_F_SERIAL is not set +# CONFIG_USB_CONFIGFS_F_ACM is not set +# CONFIG_USB_CONFIGFS_F_OBEX is not set +# CONFIG_USB_CONFIGFS_F_NCM is not set +# CONFIG_USB_CONFIGFS_F_ECM is not set +# CONFIG_USB_CONFIGFS_F_SUBSET is not set +# CONFIG_USB_CONFIGFS_F_RNDIS is not set +# CONFIG_USB_CONFIGFS_F_EEM is not set +# CONFIG_USB_CONFIGFS_F_PHONET is not set +# CONFIG_USB_CONFIGFS_F_MASS_STORAGE is not set +# CONFIG_USB_CONFIGFS_F_SS_LB is not set +# CONFIG_USB_CONFIGFS_F_FS is not set +# CONFIG_USB_CONFIGFS_F_UAC1 is not set +# CONFIG_USB_CONFIGFS_F_UAC2 is not set +# CONFIG_USB_CONFIGFS_F_MIDI is not set +# CONFIG_USB_CONFIGFS_F_HID is not set +# CONFIG_USB_CONFIGFS_F_UVC is not set +# CONFIG_USB_CONFIGFS_F_PRINTER is not set + +# +# Legacy USB Gadget Drivers +# # CONFIG_USB_ZERO is not set # CONFIG_USB_AUDIO is not set # CONFIG_USB_ETH is not set @@ -2942,6 +2975,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set +CONFIG_USB_G_SLP=y # CONFIG_USB_CDC_COMPOSITE is not set # CONFIG_USB_G_NOKIA is not set # CONFIG_USB_G_ACM_MS is not set @@ -3692,7 +3726,6 @@ CONFIG_DEBUG_S3C_UART2=y CONFIG_DEBUG_EXYNOS_UART=y CONFIG_DEBUG_LL_INCLUDE="debug/exynos.S" # CONFIG_DEBUG_UART_8250 is not set -# CONFIG_DEBUG_UART_BCM63XX is not set CONFIG_DEBUG_UNCOMPRESS=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_EARLY_PRINTK=y |