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

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

Bug 189248298
Test: Presubmit

Change-Id: Ifa7a6d8386c8adcadb81cb762758b06a8164f700
---
 BoardConfig-common.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 9255209e..def834d9 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -27,10 +27,10 @@ TARGET_SOC_NAME := google
 USES_DEVICE_GOOGLE_GS101 := true
 
 TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
+TARGET_ARCH_VARIANT := armv8-2a
 TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_VARIANT_RUNTIME := cortex-a53
+TARGET_CPU_VARIANT := cortex-a55
+TARGET_CPU_VARIANT_RUNTIME := cortex-a55
 
 ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
 TARGET_2ND_ARCH := arm