summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeung-Woo Kim <sw0312.kim@samsung.com>2018-09-14 09:09:57 +0900
committerJaehoon Chung <jh80.chung@samsung.com>2019-01-29 11:25:38 +0900
commitc23770cf1d22f7524c6ff7b9cdbd94466de8abb3 (patch)
treeb38013226185f554af1952d9c20de74fa9eb47b6
parent0d0b7a53c86c60da36b46285b55f2a108933fa46 (diff)
downloadlinux-artik7-c23770cf1d22f7524c6ff7b9cdbd94466de8abb3.tar.gz
linux-artik7-c23770cf1d22f7524c6ff7b9cdbd94466de8abb3.tar.bz2
linux-artik7-c23770cf1d22f7524c6ff7b9cdbd94466de8abb3.zip
ARM: artik710_raptor_defconfig: sync defconfig for usb options
After the commit 3922eabecf08 ("usb: gadget: Allow to build both USB functions and legacy gadgets"), usb options are changed and it is not clear legacy composite gadget is set or not. To clarify, sync defconfig for usb options. Change-Id: Ia2f2f7e121094adfb5745cffbcf3edab243f6810 Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
-rw-r--r--arch/arm64/configs/artik710_raptor_defconfig31
1 files changed, 30 insertions, 1 deletions
diff --git a/arch/arm64/configs/artik710_raptor_defconfig b/arch/arm64/configs/artik710_raptor_defconfig
index 89c2a99d0b34..3d4ce9ec9083 100644
--- a/arch/arm64/configs/artik710_raptor_defconfig
+++ b/arch/arm64/configs/artik710_raptor_defconfig
@@ -2572,6 +2572,7 @@ CONFIG_VIDEO_S5KRD4=y
# Camera sensor devices
#
# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV5640 is not set
# CONFIG_VIDEO_OV7640 is not set
# CONFIG_VIDEO_OV7670 is not set
# CONFIG_VIDEO_OV9650 is not set
@@ -3215,8 +3216,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