diff options
| author | Axel Fagerstedt <axel.fagerstedt@linaro.org> | 2013-04-16 14:42:56 +0000 |
|---|---|---|
| committer | Axel Fagerstedt <axel.fagerstedt@linaro.org> | 2013-04-18 09:58:26 +0000 |
| commit | e4af64c4c4f372124c99c986fea71a4261421b71 (patch) | |
| tree | 929be7246cb6ba5ab26ef572d1cbb72e07fa79e6 | |
| parent | 44469e36fc63e142b377680a014685c1ae83b712 (diff) | |
Juice configsllj-20130412.0
+CONFIG_FTRACE=y
+CONFIG_CRYPTO_TWOFISH
| -rw-r--r-- | arch/arm64/configs/vexpress-android_defconfig | 3 | ||||
| -rw-r--r-- | linaro/configs/android.conf | 5 | ||||
| -rw-r--r-- | linaro/configs/vexpress64.conf | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm64/configs/vexpress-android_defconfig b/arch/arm64/configs/vexpress-android_defconfig index bf122d041ba..d107ed83983 100644 --- a/arch/arm64/configs/vexpress-android_defconfig +++ b/arch/arm64/configs/vexpress-android_defconfig @@ -107,7 +107,7 @@ CONFIG_DEBUG_FS=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_INFO=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_FTRACE is not set +CONFIG_FTRACE=y CONFIG_ATOMIC64_SELFTEST=y CONFIG_DEBUG_ERRORS=y CONFIG_XZ_DEC=y @@ -117,3 +117,4 @@ CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_SPARC=y +CONFIG_CRYPTO_TWOFISH=y
\ No newline at end of file diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf index bb90ecd9e16..aab31901ca7 100644 --- a/linaro/configs/android.conf +++ b/linaro/configs/android.conf @@ -22,10 +22,15 @@ CONFIG_ANDROID_TIMED_OUTPUT=y CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ANDROID_INTF_ALARM_DEV=y +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_RAM=y +CONFIG_PSTORE_FTRACE=y CONFIG_CRYPTO_TWOFISH=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_FUSE_FS=y +CONFIG_SW_SYNC_USER=y CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index ebe65c5b36e..a7f1391b210 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -26,3 +26,4 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_MMIO=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_FTRACE=y |