diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2013-03-20 11:14:16 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-04-29 09:43:58 +0100 |
| commit | 4366fd7c9be44238b39705b03c644739a0eac1a2 (patch) | |
| tree | fd28cf59a6232b10fd1630c83229f966f911020f | |
| parent | 1e3241f4d8b9063f22c185bc36ea705018c1dc31 (diff) | |
arm64: add new options to android defconfig
Add several new config options to the vexpress-android_defconfig file.
These options are taken from the android.conf config fragment in
preparation for moving to config fragments on arm64 builds.
Also, CONFIG_ANDROID_INTF_ALARM_DEV and CONFIG_RTC_CLASS are added to
fix defect #1125177.
https://bugs.launchpad.net/linaro-android/+bug/1125177
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | arch/arm64/configs/vexpress-android_defconfig | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/arch/arm64/configs/vexpress-android_defconfig b/arch/arm64/configs/vexpress-android_defconfig index 0d1b7da0c44..9e395c588f6 100644 --- a/arch/arm64/configs/vexpress-android_defconfig +++ b/arch/arm64/configs/vexpress-android_defconfig @@ -316,7 +316,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -# CONFIG_IPV6 is not set +CONFIG_IPV6=y # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set # CONFIG_NETFILTER is not set @@ -822,6 +822,31 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y +CONFIG_PANIC_TIMEOUT=0 +CONFIG_HAS_WAKELOCK=y +CONFIG_WAKELOCK=y +CONFIG_USER_WAKELOCK=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_DM_CRYPT=y +CONFIG_ANDROID_PARANOID_NETWORK=y +CONFIG_NET_ACTIVITY_STATS=y +CONFIG_FB_EARLYSUSPEND=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_GPIO=y +CONFIG_USB_G_ANDROID=y +CONFIG_SWITCH=y +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_RAM=y +CONFIG_PSTORE_FTRACE=y +CONFIG_RTC_CLASS=y +CONFIG_ANDROID_TIMED_GPIO=y +CONFIG_ANDROID_INTF_ALARM_DEV=y +CONFIG_CRYPTO_TWOFISH=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 # # Common Clock Framework |