diff options
author | Xinyu Chen <b03824@freescale.com> | 2012-03-05 16:25:40 +0800 |
---|---|---|
committer | Xinyu Chen <b03824@freescale.com> | 2012-03-05 16:48:43 +0800 |
commit | 8bed2bce0a21ae7a8243df896deb376dd3b7f4f4 (patch) | |
tree | b09375ca35019630d319b637e5ed935c02d6292c | |
parent | 9faffcb71cbc8b160e18cd7ae75b456e5e13c8d8 (diff) |
ENGR00176068-3 defconfig: enable localtimer for android
Enable local timer by default. If wait mode is on,
local timer will be shutdown automatically on boot.
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
-rw-r--r-- | arch/arm/configs/imx6_android_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig index 5c695ac01cc4..08d196b2b089 100644 --- a/arch/arm/configs/imx6_android_defconfig +++ b/arch/arm/configs/imx6_android_defconfig @@ -408,13 +408,14 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_HAVE_ARM_SCU=y +CONFIG_HAVE_ARM_TWD=y CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_NR_CPUS=4 CONFIG_HOTPLUG_CPU=y -# CONFIG_LOCAL_TIMERS is not set +CONFIG_LOCAL_TIMERS=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -1600,6 +1601,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y # Watchdog Device Drivers # # CONFIG_SOFT_WATCHDOG is not set +# CONFIG_MPCORE_WATCHDOG is not set # CONFIG_MAX63XX_WATCHDOG is not set CONFIG_IMX2_WDT=y |