diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-06-11 15:55:18 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-06-11 16:53:01 +0100 |
| commit | 1286fb00e2f713bb528d93d3c4d36c0eff5f2eeb (patch) | |
| tree | c85e4e7592081362b3aa0b00d423dfe74a695192 | |
| parent | 4c9c1b005f9137103bf74aeb43e95d3d0682340e (diff) | |
Android: vexpress: Update defconfig for 3.5 and new vexpress config fragmenttracking-tracking-armlt-android-config-ll-20120627.0tracking-tracking-armlt-android-config-ll-20120625.0tracking-tracking-armlt-android-config-ll-20120622.0tracking-tracking-armlt-android-config-ll-20120621.0
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm/configs/android_vexpress_defconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/configs/android_vexpress_defconfig b/arch/arm/configs/android_vexpress_defconfig index c6a9f34df3f4..afc2c2051142 100644 --- a/arch/arm/configs/android_vexpress_defconfig +++ b/arch/arm/configs/android_vexpress_defconfig @@ -2,12 +2,13 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y CONFIG_EMBEDDED=y -CONFIG_PERF_COUNTERS=y CONFIG_SLAB=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -16,11 +17,10 @@ CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_DT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y +CONFIG_ARM_ARCH_TIMER=y CONFIG_AEABI=y CONFIG_CMDLINE="console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait mmci.fmax=4000000" CONFIG_CPU_IDLE=y @@ -42,6 +42,8 @@ CONFIG_IP_PNP_RARP=y # CONFIG_INET_LRO is not set CONFIG_IPV6=y # CONFIG_IPV6_SIT is not set +CONFIG_ANDROID_PARANOID_NETWORK=y +CONFIG_NET_ACTIVITY_STATS=y CONFIG_NETFILTER=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y @@ -111,7 +113,6 @@ CONFIG_JFFS2_LZO=y CONFIG_JFFS2_RUBIN=y CONFIG_CRAMFS=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y |