aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-09-16 12:45:24 +0100
committerJon Medhurst <tixy@linaro.org>2015-09-16 12:45:24 +0100
commit9638f5a6a58a38390b03dbe525635493fc097e0c (patch)
treecd1ac2c20fc51e30afbc4ffba7638ca66771b32c
parenta8a23973fcb8315577c296dc2916a1396f67583e (diff)
parent517251b599a90c73d1f80314426e0e056e5f7453 (diff)
Merge branch 'lsk-3.18-armlt-configs' into integration-lsk-3.18-armlt-androidlsk-3.18-armlt-20150916
-rw-r--r--linaro/configs/android.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index 06c0af0f85d1..951be0dc52b0 100644
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -192,3 +192,7 @@ CONFIG_DM_UEVENT=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_SCHED_TRACER=y
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+# CONFIG_CP15_BARRIER_EMULATION is not set
+# CONFIG_SETEND_EMULATION is not set