From 14c17f47af36ee03601fab07a948628f372b7707 Mon Sep 17 00:00:00 2001
From: Philip Cuadra <philipcuadra@google.com>
Date: Thu, 3 Jun 2021 10:25:34 -0700
Subject: [PATCH] sm6150-common: Target arm v8.2a and A55

This will let bionic use 8.2a atomics which helps scudo locking.

Bug 189248298
Test: Presubmit

Change-Id: Ifa7a6d8386c8adcadb81cb762758b06a8164f700
---
 BoardConfigCommon.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ea2c692..d9399df 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -25,18 +25,15 @@ include vendor/xiaomi/sm6150-common/BoardConfigVendor.mk
 
 # Architecture
 TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
+TARGET_ARCH_VARIANT := armv8-2a
 TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_VARIANT_RUNTIME := cortex-a76
+TARGET_CPU_VARIANT := cortex-a55
 
 TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_ARCH_VARIANT := armv8-2a
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := generic
-TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a76
+TARGET_2ND_CPU_VARIANT := cortex-a55
 
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"