Move the architecture definitions into the device-specific BoardConfigs.
Newer SOC generations may have different levels of CPU feature support
(e.g. SM8450 which is ARMv9), so let's allow the individual boards to
specify their own sets of features.
Bug: 217455793
Change-Id: I6852683ad14a8fa6b0fc22f39e0c9c7823d1da2c
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 9b19707..fa12df0 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -13,19 +13,6 @@
# limitations under the License.
#
-# Primary Arch
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-2a
-TARGET_CPU_VARIANT := kryo385
-TARGET_CPU_ABI := arm64-v8a
-
-# Secondary Arch
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv8-2a
-TARGET_2ND_CPU_VARIANT := kryo385
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-
TARGET_USES_64_BIT_BINDER := true
TARGET_NO_BOOTLOADER := true
diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk
index 7ef8549..2c1fb25 100644
--- a/db845c/BoardConfig.mk
+++ b/db845c/BoardConfig.mk
@@ -1,5 +1,18 @@
include device/linaro/dragonboard/BoardConfigCommon.mk
+# Primary Arch
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-2a
+TARGET_CPU_VARIANT := kryo385
+TARGET_CPU_ABI := arm64-v8a
+
+# Secondary Arch
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-2a
+TARGET_2ND_CPU_VARIANT := kryo385
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+
# Board Information
TARGET_BOOTLOADER_BOARD_NAME := db845c
TARGET_BOARD_PLATFORM := db845c
diff --git a/rb5/BoardConfig.mk b/rb5/BoardConfig.mk
index 272f697..a4f1d09 100644
--- a/rb5/BoardConfig.mk
+++ b/rb5/BoardConfig.mk
@@ -1,5 +1,18 @@
include device/linaro/dragonboard/BoardConfigCommon.mk
+# Primary Arch
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-2a
+TARGET_CPU_VARIANT := kryo385
+TARGET_CPU_ABI := arm64-v8a
+
+# Secondary Arch
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-2a
+TARGET_2ND_CPU_VARIANT := kryo385
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+
# Board Information
TARGET_BOOTLOADER_BOARD_NAME := rb5
TARGET_BOARD_PLATFORM := rb5