summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSheshu Shenoy <sshenoy@nvidia.com>2010-03-17 18:13:42 -0700
committerGary King <gking@nvidia.com>2010-04-23 17:32:04 -0700
commit852cc3bda6a1abd13c3ac3f40b30c10932f48897 (patch)
tree5f7bd2ff18e37917de66049611a51163ef572131
parent0785ea5fe3a61b0ef9011b81fa593d3553a21f9e (diff)
[ARM] tegra: defconfig additions
Whistler Android: enable PPP, OUTER_CACHE_SYNC, UINPUT Whistler LDK: enable OTG_UTILS, OUTER_CACHE_SYNC Harmony Android: enable OUTER_CACHE_SYNC, UINPUT Harmony LDK: enable OUTER_CACHE_SYNC, USB_ETH, USB_ETH_RNDIS bug 635519 (UINPUT) bug 636848 (USB OTG) bug 673802 (OUTER_CACHE_SYNC) Change-Id: I35531fc1fbb440fdf5173e580cca8b51ea3c6423 Reviewed-on: http://git-master/r/1206 Reviewed-by: Gary King <gking@nvidia.com> Tested-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_harmony_android_defconfig4
-rw-r--r--arch/arm/configs/tegra_harmony_gnu_linux_defconfig4
-rw-r--r--arch/arm/configs/tegra_whistler_android_defconfig8
-rw-r--r--arch/arm/configs/tegra_whistler_gnu_linux_defconfig4
4 files changed, 15 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig
index a928c6255006..992cbd5f5ff9 100644
--- a/arch/arm/configs/tegra_harmony_android_defconfig
+++ b/arch/arm/configs/tegra_harmony_android_defconfig
@@ -231,6 +231,7 @@ CONFIG_ARM_THUMB=y
# CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_HAS_TLS_REG=y
CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
CONFIG_CACHE_L2X0=y
CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_ARM_ERRATA_430973 is not set
@@ -903,7 +904,8 @@ CONFIG_TOUCHSCREEN_USB_PANJIT=y
# CONFIG_TOUCHSCREEN_USB_GOTOP is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
#
# Hardware I/O ports
diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
index cdada7880d55..b6990a05bd70 100644
--- a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
@@ -232,6 +232,7 @@ CONFIG_ARM_THUMBEE=y
# CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_HAS_TLS_REG=y
CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
CONFIG_CACHE_L2X0=y
CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_ARM_ERRATA_430973 is not set
@@ -1210,7 +1211,8 @@ CONFIG_USB_TEGRA=y
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
-# CONFIG_USB_ETH is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
CONFIG_USB_GADGETFS=m
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_G_SERIAL is not set
diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig
index 8c5dd4df9606..85fae82dcec2 100644
--- a/arch/arm/configs/tegra_whistler_android_defconfig
+++ b/arch/arm/configs/tegra_whistler_android_defconfig
@@ -227,6 +227,7 @@ CONFIG_ARM_THUMB=y
# CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_HAS_TLS_REG=y
CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
CONFIG_CACHE_L2X0=y
CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_ARM_ERRATA_430973 is not set
@@ -692,7 +693,10 @@ CONFIG_USB_ARMLINUX=y
# CONFIG_USB_NET_ZAURUS is not set
# CONFIG_USB_HSO is not set
# CONFIG_WAN is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=y
+CONFIG_PPP_ASYNC=y
+CONFIG_CRC_CCITT=y
+CONFIG_PPP_SYNC_TTY=y
# CONFIG_SLIP is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
@@ -758,7 +762,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_UINPUT is not set
+CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_GPIO is not set
# CONFIG_INPUT_KEYCHORD is not set
CONFIG_INPUT_TEGRA_ODM_ACCEL=y
diff --git a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
index 0e9707c75956..60bf9ec6dabb 100644
--- a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
@@ -231,6 +231,7 @@ CONFIG_ARM_THUMBEE=y
# CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_HAS_TLS_REG=y
CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
CONFIG_CACHE_L2X0=y
CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_ARM_ERRATA_430973 is not set
@@ -1226,7 +1227,8 @@ CONFIG_UDC_FSL_NR_ENDPOINTS=32
#
# OTG and related infrastructure
#
-# CONFIG_USB_TEGRA_OTG is not set
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_TEGRA_OTG=y
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_MMC=y
CONFIG_EMBEDDED_MMC_START_OFFSET=y