hikey: Optimize CPU Targets for each variant

hikey has A53 cores, while hikey960 has A73 and A53 cores.  Bionic
now has A73-specific configuration, so this CL uses the optimal
CPU configuration for both targets.

Change-Id: I5f15c8fdc43fcab5e4f01b3685f3e19b9916c0bf
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a9dc47d..dd90ce3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -2,14 +2,12 @@
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_VARIANT := cortex-a53
 
 # Secondary Arch
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a53
 
 TARGET_USES_64_BIT_BINDER := true
 TARGET_SUPPORTS_32_BIT_APPS := true
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index df97048..7844ecb 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -1,5 +1,8 @@
 include device/linaro/hikey/BoardConfigCommon.mk
 
+TARGET_CPU_VARIANT := cortex-a53
+TARGET_2ND_CPU_VARIANT := cortex-a53
+
 TARGET_BOARD_PLATFORM := hikey
 ifeq ($(TARGET_KERNEL_USE), 3.18)
 BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime
diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk
index aa88903..3b1bd50 100644
--- a/hikey960/BoardConfig.mk
+++ b/hikey960/BoardConfig.mk
@@ -1,5 +1,8 @@
 include device/linaro/hikey/BoardConfigCommon.mk
 
+TARGET_CPU_VARIANT := cortex-a73
+TARGET_2ND_CPU_VARIANT := cortex-a73
+
 TARGET_BOARD_PLATFORM := hikey960
 
 TARGET_NO_DTIMAGE := false