From: Greg Hackmann <ghackmann@google.com>
Date: Fri, 6 Feb 2015 00:54:00 +0000 (-0800)
Subject: android: base-cfg: enable ARMV8_DEPRECATED and subfeatures
X-Git-Tag: firefly_0821_release~2958^2~63
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f91716c6f2ae93c264b2acbd857a5809f4dc7e2d;p=firefly-linux-kernel-4.4.55.git

android: base-cfg: enable ARMV8_DEPRECATED and subfeatures

ARMV8_DEPRECATED replaces the now-reverted ARMV7_COMPAT in the upstream
kernel

Change-Id: I5d5cee4e11c01d717692198fa070826930847703
Signed-off-by: Greg Hackmann <ghackmann@google.com>
---

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index bdc4749a195f..d9857d2cd32a 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -6,6 +6,7 @@ CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_INTF_ALARM_DEV=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_ARMV8_DEPRECATED=y
 CONFIG_ASHMEM=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_INITRD=y
@@ -14,6 +15,7 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_DM_CRYPT=y
 CONFIG_DM_VERITY=y
 CONFIG_EMBEDDED=y
@@ -128,8 +130,10 @@ CONFIG_PREEMPT=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RT_GROUP_SCHED=y
+CONFIG_SETEND_EMULATION=y
 CONFIG_STAGING=y
 CONFIG_SWITCH=y
+CONFIG_SWP_EMULATION=y
 CONFIG_SYNC=y
 CONFIG_SYSVIPC=y
 CONFIG_TUN=y