summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Fagerstedt <axel.fagerstedt@linaro.org>2013-04-16 14:42:56 +0000
committerAxel Fagerstedt <axel.fagerstedt@linaro.org>2013-05-02 15:55:30 +0200
commit289d591301a40487021cb61206bfa9b04eb3040c (patch)
treed0505a38d249e430b78537b7f650d4435867bdec
parent14ef146a2a8a0c5e1ab26c01325be0fdfc6442dc (diff)
Juice configsllj-20130422.0
+CONFIG_FTRACE=y +CONFIG_CRYPTO_TWOFISH
-rw-r--r--arch/arm64/configs/vexpress-android_defconfig3
-rw-r--r--linaro/configs/android.conf5
-rw-r--r--linaro/configs/vexpress64.conf1
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 9087e4e0a8b..dbc50bd8b1e 100644
--- a/linaro/configs/vexpress64.conf
+++ b/linaro/configs/vexpress64.conf
@@ -28,3 +28,4 @@ CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_MMIO=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_FTRACE=y