aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhangfei Gao <zhangfei.gao@linaro.org>2013-11-19 13:53:42 +0800
committerZhangfei Gao <zhangfei.gao@linaro.org>2013-11-25 15:26:07 +0800
commit5e7e5df9ed42edda296e4e10628b766f513ca67b (patch)
tree228de51026a1af685e7373826023cee78f0ff77e
parented70855ebed79bb187f2dca8ecbf521e0fbfebb5 (diff)
hs_config: enable usbtracking-hilt-usb-1122
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
-rw-r--r--arch/arm/configs/hs_defconfig41
1 files changed, 37 insertions, 4 deletions
diff --git a/arch/arm/configs/hs_defconfig b/arch/arm/configs/hs_defconfig
index bb1e921fb9aa..b743de52b3a7 100644
--- a/arch/arm/configs/hs_defconfig
+++ b/arch/arm/configs/hs_defconfig
@@ -485,7 +485,26 @@ CONFIG_NET=y
CONFIG_UNIX=y
# CONFIG_UNIX_DIAG is not set
# CONFIG_NET_KEY is not set
-# CONFIG_INET is not set
+CONFIG_XFRM=y
+CONFIG_INET=y
+CONFIG_NET_IP_TUNNEL=y
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_IPV6=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_ANDROID_PARANOID_NETWORK=y
+CONFIG_NET_ACTIVITY_STATS=y
# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
# CONFIG_NETFILTER is not set
@@ -1350,7 +1369,6 @@ CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
# CONFIG_FB_SSD1307 is not set
-# CONFIG_SOUND is not set
#
# HID support
@@ -1428,6 +1446,7 @@ CONFIG_USB_HID=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_ARCH_HAS_XHCI is not set
+CONFIG_USB_PHY=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=y
CONFIG_USB_ARCH_HAS_HCD=y
@@ -1438,6 +1457,10 @@ CONFIG_USB=y
#
# Miscellaneous USB options
#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_SUSB_HDRC=y
+CONFIG_USB_SYNOPSYS_USB_ANDROID=y
+CONFIG_USB_SUSB_PERIPHERAL=y
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_MON is not set
# CONFIG_USB_WUSB_CBAF is not set
@@ -1525,14 +1548,24 @@ CONFIG_USB_STORAGE=y
#
# CONFIG_USB_ISP1301 is not set
# CONFIG_USB_RCAR_PHY is not set
-# CONFIG_USB_GADGET is not set
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_PCM=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VBUS_DRAW=500
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=y
+CONFIG_USB_G_ANDROID=y
#
# OTG and related infrastructure
#
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_ULPI is not set
-# CONFIG_NOP_USB_XCEIV is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set