diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-02 08:47:21 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-02 08:47:21 -0700 |
| commit | 3c81a385064bd31a9628acee031cfe1ca637dc74 (patch) | |
| tree | 8fc344f9528acfcda62b3719416d2930af0cbc52 | |
| parent | 811b2126cde688e651d69287f82323c57a16cd30 (diff) | |
| parent | 0532c0990157877779fb61c8f5365af967913479 (diff) | |
Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10
* v3.10/topic/configs:
configs: linaro-base: enable ZRAM features
configs: Enable coresight by default
| -rw-r--r-- | linaro/configs/linaro-base.conf | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf index c2a5143518fb..c86f432f818a 100644 --- a/linaro/configs/linaro-base.conf +++ b/linaro/configs/linaro-base.conf @@ -117,3 +117,13 @@ 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 + |