aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-06-18 01:53:13 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-06-18 01:53:13 +0400
commitbd2c51f3fe71064497daffc7ac89793f3553eede (patch)
tree982a42fc533d6d5efe501821201596e48bd40838
parent561e8c167c795beb9c222ada110ab39173ee2bad (diff)
parent55af205628c05ae4b5f708e0d90fdf21927bd98d (diff)
Merge branch 'tracking-arndale-configs' into merge-linaro-preempt-rtlinaro-preempt-rt-20130618.0
-rw-r--r--linaro/configs/arndale.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/linaro/configs/arndale.conf b/linaro/configs/arndale.conf
index 077163989f49..5a108d953a28 100644
--- a/linaro/configs/arndale.conf
+++ b/linaro/configs/arndale.conf
@@ -10,6 +10,7 @@ CONFIG_S3C_LOWLEVEL_UART_PORT=2
CONFIG_ARCH_EXYNOS5=y
CONFIG_NR_CPUS=2
CONFIG_PREEMPT=y
+# CONFIG_THUMB2_KERNEL is not set
CONFIG_HIGHMEM=y
# CONFIG_COMPACTION is not set
CONFIG_ARM_APPENDED_DTB=y
@@ -47,11 +48,16 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_S5M8767=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_XHCI_HCD=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_S5P=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_EXYNOS=y
+CONFIG_USB_STORAGE=y
+CONFIG_SAMSUNG_USBPHY=y
+CONFIG_USB_GADGET=y
CONFIG_MMC=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_IDMAC=y