diff options
author | Anton Hansson | 2018-10-18 08:08:38 -0500 |
---|---|---|
committer | Anton Hansson | 2018-10-29 11:15:04 -0500 |
commit | 284b81c1aefc246e21623df5d0e25572bbba3a48 (patch) | |
tree | ac696331e5cf4244d569b09f7b16e9624651af04 /target/board | |
parent | df45f28a82770c6083aaa3f94776382c0ac3d858 (diff) | |
download | platform-build-284b81c1aefc246e21623df5d0e25572bbba3a48.tar.gz platform-build-284b81c1aefc246e21623df5d0e25572bbba3a48.tar.xz platform-build-284b81c1aefc246e21623df5d0e25572bbba3a48.zip |
Add a mainline arm64 device
The existing 'generic' targets are emulator devices, and targeting
it has the side-effect of including emulator-specific artifacts.
Create a mainline device instead, which is really generic. This also
allows specifying tweaks unsuitable for the emulator.
Include BoardConfigGsiCommon for now, even though it includes a few
things we likely won't want in the future.
Bug: 80410283
Bug: 111538404
Test: lunch mainline_arm64; m
Change-Id: I15e7cb41fcbd3c0592a091ba7a8575ddf10bda71
Diffstat (limited to 'target/board')
-rw-r--r-- | target/board/BoardConfigEmuCommon.mk | 4 | ||||
-rw-r--r-- | target/board/BoardConfigGsiCommon.mk | 4 | ||||
-rw-r--r-- | target/board/mainline_arm64/BoardConfig.mk | 27 |
3 files changed, 31 insertions, 4 deletions
diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index a1d5cde0d..69ae6f033 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk | |||
@@ -3,10 +3,6 @@ | |||
3 | # Common compile-time definitions for emulator | 3 | # Common compile-time definitions for emulator |
4 | # | 4 | # |
5 | 5 | ||
6 | # The generic product target doesn't have any hardware-specific pieces. | ||
7 | TARGET_NO_BOOTLOADER := true | ||
8 | TARGET_NO_KERNEL := true | ||
9 | |||
10 | HAVE_HTC_AUDIO_DRIVER := true | 6 | HAVE_HTC_AUDIO_DRIVER := true |
11 | BOARD_USES_GENERIC_AUDIO := true | 7 | BOARD_USES_GENERIC_AUDIO := true |
12 | TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH) | 8 | TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH) |
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index fe4762631..dfa103aee 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk | |||
@@ -3,6 +3,10 @@ | |||
3 | # Common compile-time definitions for GSI | 3 | # Common compile-time definitions for GSI |
4 | # | 4 | # |
5 | 5 | ||
6 | # The generic product target doesn't have any hardware-specific pieces. | ||
7 | TARGET_NO_BOOTLOADER := true | ||
8 | TARGET_NO_KERNEL := true | ||
9 | |||
6 | # GSIs always use ext4. | 10 | # GSIs always use ext4. |
7 | TARGET_USERIMAGES_USE_EXT4 := true | 11 | TARGET_USERIMAGES_USE_EXT4 := true |
8 | # GSIs are historically released in sparse format. | 12 | # GSIs are historically released in sparse format. |
diff --git a/target/board/mainline_arm64/BoardConfig.mk b/target/board/mainline_arm64/BoardConfig.mk new file mode 100644 index 000000000..906a5665d --- /dev/null +++ b/target/board/mainline_arm64/BoardConfig.mk | |||
@@ -0,0 +1,27 @@ | |||
1 | # Copyright (C) 2018 The Android Open Source Project | ||
2 | # | ||
3 | # Licensed under the Apache License, Version 2.0 (the "License"); | ||
4 | # you may not use this file except in compliance with the License. | ||
5 | # You may obtain a copy of the License at | ||
6 | # | ||
7 | # http://www.apache.org/licenses/LICENSE-2.0 | ||
8 | # | ||
9 | # Unless required by applicable law or agreed to in writing, software | ||
10 | # distributed under the License is distributed on an "AS IS" BASIS, | ||
11 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
12 | # See the License for the specific language governing permissions and | ||
13 | # limitations under the License. | ||
14 | # | ||
15 | |||
16 | TARGET_ARCH := arm64 | ||
17 | TARGET_ARCH_VARIANT := armv8-a | ||
18 | TARGET_CPU_VARIANT := generic | ||
19 | TARGET_CPU_ABI := arm64-v8a | ||
20 | |||
21 | TARGET_2ND_ARCH := arm | ||
22 | TARGET_2ND_ARCH_VARIANT := armv8-a | ||
23 | TARGET_2ND_CPU_ABI := armeabi-v7a | ||
24 | TARGET_2ND_CPU_ABI2 := armeabi | ||
25 | TARGET_2ND_CPU_VARIANT := generic | ||
26 | |||
27 | include build/make/target/board/BoardConfigGsiCommon.mk | ||