diff options
| author | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-10-28 14:19:01 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 14:23:01 +0900 |
| commit | 63aae766d181171f388220b28040867a411db62a (patch) | |
| tree | c32a8990e632f3697bf093732307036973d5f067 | |
| parent | 80c9dfe070aef84983c0c7e2a782dac296b3d2db (diff) | |
ARM: defconfig: rinato: sync with v4.1.36 rebased tree
This patch is to sync rinato defconfig with v4.1.36 rebased tree.
Change-Id: Ia299861792631dcd0dbe3fb0a78cf96ec954593e
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
| -rw-r--r-- | arch/arm/configs/tizen_rinato_defconfig | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/arch/arm/configs/tizen_rinato_defconfig b/arch/arm/configs/tizen_rinato_defconfig index a73345c18a2d..a78429290158 100644 --- a/arch/arm/configs/tizen_rinato_defconfig +++ b/arch/arm/configs/tizen_rinato_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 @@ -1892,6 +1892,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 @@ -2382,8 +2383,36 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_DUMMY_HCD 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_CONFIGFS is not set +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_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 @@ -3023,21 +3052,20 @@ CONFIG_GATOR=m # CONFIG_SENSORS_CORE=y # CONFIG_SENSORS_MAX86902 is not set +CONFIG_SENSORS_SSP=y +CONFIG_SENSORS_SSP_SENSORHUB=y # CONFIG_SENSORS_MAX_NOTCHFILTER is not set CONFIG_SENSORS_SSP_STM_RINATO=y -CONFIG_SENSORS_SSP=y CONFIG_SENSORS_SSP_STM=y CONFIG_SENSORS_SSP_MPU6500=y # CONFIG_SENSORS_SSP_AK09911 is not set -# CONFIG_SENSORS_SSP_YAS532 is not set # CONFIG_SENSORS_SSP_CM3320 is not set # CONFIG_SENSORS_SSP_MAX88920 is not set # CONFIG_SENSORS_SSP_MAX88921 is not set # CONFIG_SENSORS_SSP_LPS25H is not set -# CONFIG_SENSORS_SSP_SHTC1 is not set CONFIG_SENSORS_SSP_ADPD142=y CONFIG_SENSORS_SSP_STM32F401=y -CONFIG_SENSORS_SSP_SENSORHUB=y +# CONFIG_SENSORS_SSP_BBD_BRCM is not set # CONFIG_EXYNOS_SNAPSHOT is not set # @@ -3393,7 +3421,6 @@ CONFIG_DEBUG_S3C_UART1=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 |