Merge "Factor elements common to all ART generic device BoardConfig.mk files."

am: e5c490a32f

Change-Id: I8118648f173632c1cdfbce04acbd64c532d4a562

9 files changed, 38 insertions, 24 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
new file mode 100644
index 0000000..61276d8
--- /dev/null
+++ b/BoardConfigCommon.mk
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2019 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Configuration elements common to all ART generic device BoardConfig.mk files.
+
+TARGET_NO_BOOTLOADER := true
+TARGET_NO_KERNEL := true
+
+TARGET_CPU_SMP := true
diff --git a/arm_krait/BoardConfig.mk b/arm_krait/BoardConfig.mk
index 545c2b8..9fed729 100644
--- a/arm_krait/BoardConfig.mk
+++ b/arm_krait/BoardConfig.mk
@@ -14,13 +14,12 @@
 # limitations under the License.
 #
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
+include device/generic/art/BoardConfigCommon.mk
+
 TARGET_ARCH := arm
 
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
-TARGET_CPU_SMP := true
 TARGET_CPU_VARIANT := krait
 TARGET_ARCH_VARIANT := armv7-a-neon
 
diff --git a/arm_v7_v8/BoardConfig.mk b/arm_v7_v8/BoardConfig.mk
index b4f7a10..b252033 100644
--- a/arm_v7_v8/BoardConfig.mk
+++ b/arm_v7_v8/BoardConfig.mk
@@ -14,12 +14,11 @@
 # limitations under the License.
 #
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
+include device/generic/art/BoardConfigCommon.mk
+
 TARGET_ARCH := arm64
 
 TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_SMP := true
 TARGET_CPU_VARIANT := generic
 TARGET_ARCH_VARIANT := armv8-a
 
diff --git a/armv8/BoardConfig.mk b/armv8/BoardConfig.mk
index d6ee7a6..1375c33 100644
--- a/armv8/BoardConfig.mk
+++ b/armv8/BoardConfig.mk
@@ -14,12 +14,11 @@
 # limitations under the License.
 #
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
+include device/generic/art/BoardConfigCommon.mk
+
 TARGET_ARCH := arm64
 
 TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_SMP := true
 TARGET_CPU_VARIANT := generic
 TARGET_ARCH_VARIANT := armv8-a
 
diff --git a/armv8_kryo385/BoardConfig.mk b/armv8_kryo385/BoardConfig.mk
index 428516c..967dc29 100644
--- a/armv8_kryo385/BoardConfig.mk
+++ b/armv8_kryo385/BoardConfig.mk
@@ -14,12 +14,11 @@
 # limitations under the License.
 #
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
+include device/generic/art/BoardConfigCommon.mk
+
 TARGET_ARCH := arm64
 
 TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_SMP := true
 TARGET_CPU_VARIANT := kryo385
 TARGET_ARCH_VARIANT := armv8-2a
 
diff --git a/mips32r2_fp/BoardConfig.mk b/mips32r2_fp/BoardConfig.mk
index 22f588e..a364cbf 100644
--- a/mips32r2_fp/BoardConfig.mk
+++ b/mips32r2_fp/BoardConfig.mk
@@ -14,12 +14,11 @@
 # limitations under the License.
 #
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
+include device/generic/art/BoardConfigCommon.mk
+
 TARGET_ARCH := mips
 
 TARGET_CPU_ABI := mips
-TARGET_CPU_SMP := true
 TARGET_CPU_VARIANT := generic
 TARGET_ARCH_VARIANT := mips32r2-fp
 
diff --git a/mips32r2_fp_xburst/BoardConfig.mk b/mips32r2_fp_xburst/BoardConfig.mk
index a616f05..3802ffa 100644
--- a/mips32r2_fp_xburst/BoardConfig.mk
+++ b/mips32r2_fp_xburst/BoardConfig.mk
@@ -14,12 +14,11 @@
 # limitations under the License.
 #
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
+include device/generic/art/BoardConfigCommon.mk
+
 TARGET_ARCH := mips
 
 TARGET_CPU_ABI := mips
-TARGET_CPU_SMP := true
 TARGET_CPU_VARIANT :=
 TARGET_ARCH_VARIANT := mips32r2-fp-xburst
 
diff --git a/mips64r6/BoardConfig.mk b/mips64r6/BoardConfig.mk
index 78c76a0..76ea5c8 100644
--- a/mips64r6/BoardConfig.mk
+++ b/mips64r6/BoardConfig.mk
@@ -14,12 +14,11 @@
 # limitations under the License.
 #
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
+include device/generic/art/BoardConfigCommon.mk
+
 TARGET_ARCH := mips64
 
 TARGET_CPU_ABI := mips64
-TARGET_CPU_SMP := true
 TARGET_CPU_VARIANT := generic
 TARGET_ARCH_VARIANT := mips64r6
 
diff --git a/silvermont/BoardConfig.mk b/silvermont/BoardConfig.mk
index 10c4450..1d70372 100644
--- a/silvermont/BoardConfig.mk
+++ b/silvermont/BoardConfig.mk
@@ -14,11 +14,10 @@
 # limitations under the License.
 #
 
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
+include device/generic/art/BoardConfigCommon.mk
+
 TARGET_ARCH := x86
 
 TARGET_CPU_ABI := x86
-TARGET_CPU_SMP := true
 TARGET_ARCH_VARIANT := silvermont