aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-02 09:03:29 -0700
committerKevin Hilman <khilman@linaro.org>2015-06-02 09:03:29 -0700
commit361e3f0276d666faa6a785f610ffc8b7c541d478 (patch)
tree3fa5b452d36f27ca048105e99289ed00b307c410
parent2a16dc89be013e50283ec1461e5c1cc8bc24c474 (diff)
parente0ddb0d39bf8e71cf36aa3a0e1b7e94c33a1f22b (diff)
downloadlinux-linaro-stable-361e3f0276d666faa6a785f610ffc8b7c541d478.tar.gz
Merge branch 'v3.14/topic/configs' into linux-linaro-lsk-v3.14
* v3.14/topic/configs: configs: linaro-base: enable ZRAM features configs: Enable coresight by default
-rw-r--r--linaro/configs/linaro-base.conf9
1 files changed, 9 insertions, 0 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index 15f6ea784f63..0a1d7bcd63ad 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -118,3 +118,12 @@ CONFIG_DEBUG_INFO=y
CONFIG_FANOTIFY=y
CONFIG_RCU_TORTURE_TEST=m
CONFIG_RCU_TORTURE_TEST_RUNNABLE=n
+CONFIG_CORESIGHT=y
+CONFIG_CORESIGHT_LINKS_AND_SINKS=y
+CONFIG_CORESIGHT_SOURCE_ETM=y
+
+# enable ZRAM features
+CONFIG_ZPOOL=y
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=y
+CONFIG_ZRAM_LZ4_COMPRESS=y