summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJaehoon Chung <jh80.chung@samsung.com>2016-08-17 15:01:39 +0900
committerSeung-Woo Kim <sw0312.kim@samsung.com>2016-12-14 13:52:29 +0900
commit111cd9f31465e53c3b03776375eae1b01dff66b5 (patch)
treeaf6259650b976d2d41bd192784d9ead341f08c5d /arch
parent6baf177a4751a9928c41fd7cb36d0e78e2b79b8e (diff)
ARM64: tizen_tm2_defconfig: update the configuration file
Update the tizen_tm2_defcofig file. Synchronized the defconfig file after updated some Kconfig files. Change-Id: I9924bfd1ef18130fd36b6120cec0cd6c9dcfc275 Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/configs/tizen_tm2_defconfig35
1 files changed, 33 insertions, 2 deletions
diff --git a/arch/arm64/configs/tizen_tm2_defconfig b/arch/arm64/configs/tizen_tm2_defconfig
index 6f92d30ad478..6433d275f160 100644
--- a/arch/arm64/configs/tizen_tm2_defconfig
+++ b/arch/arm64/configs/tizen_tm2_defconfig
@@ -2307,8 +2307,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
# CONFIG_THERMAL_GOV_BANG_BANG is not set
# CONFIG_THERMAL_GOV_USER_SPACE is not set
CONFIG_CPU_THERMAL=y
-CONFIG_DEVFREQ_THERMAL=y
# CONFIG_CLOCK_THERMAL is not set
+CONFIG_DEVFREQ_THERMAL=y
CONFIG_THERMAL_EMULATION=y
# CONFIG_IMX_THERMAL is not set
@@ -2557,6 +2557,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=y
# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_VIDEO_IR_I2C=y
#
# Audio decoders, processors and mixers
@@ -3320,8 +3321,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
@@ -4401,6 +4430,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_STRICT_DEVMEM is not set
# CONFIG_PID_IN_CONTEXTIDR is not set