diff options
| author | Peter Collingbourne <pcc@google.com> | 2022-02-28 20:29:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-28 20:29:32 +0000 |
| commit | cabb2d1310e51af0f679e412653960ec6462c3cc (patch) | |
| tree | 2d1ac5633eecdb8b5e10968745c81f21eda4c280 /db845c | |
| parent | 07c74532dc82872e35ae120c439499e7211f18ce (diff) | |
| parent | 157c3964185da74683665259f88e0e573de09116 (diff) | |
Merge changes from topics "master-I2a659a980d32912bec5a1c0869c88e06a29cf9ce", "master-I6852683ad14a8fa6b0fc22f39e0c9c7823d1da2c", "master-I8f8b467a4dfad68f6e2e53954b5944c6155de782", "master-I9ef8e57207aa96ec1f8193e8d8cd5dfc47567d38", "master-Id17d162d142a2595e54e163f5faaf7dcf9b68e35"
* changes:
Add a sm8450_mini target.
Create a mini configuration for the dragonboards.
Factor out the full device configuration.
Move the architecture definitions into the device-specific BoardConfigs.
Remove pixel3_mainline target.
Diffstat (limited to 'db845c')
| -rw-r--r-- | db845c/BoardConfig.mk | 13 | ||||
| -rw-r--r-- | db845c/device.mk | 21 |
2 files changed, 18 insertions, 16 deletions
diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk index 2a23017..5d6ed24 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/db845c/device.mk b/db845c/device.mk index b8332a0..63e24a1 100644 --- a/db845c/device.mk +++ b/db845c/device.mk @@ -18,28 +18,12 @@ $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk) include $(LOCAL_PATH)/../vendor-package-ver.mk -# Enable Virtual A/B -AB_OTA_UPDATER := true -AB_OTA_PARTITIONS += \ - product \ - system \ - system_ext \ - vendor - ifeq ($(TARGET_USES_BOOT_HDR_V3), true) $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk) else $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) endif -PRODUCT_COPY_FILES := \ - $(DB845C_KERNEL_DIR)/Image.gz:kernel \ - device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.db845c \ - device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.db845c \ - device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db845c.rc \ - device/linaro/dragonboard/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db845c.usb.rc \ - device/linaro/dragonboard/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/db845c.kl - # Build generic Audio HAL PRODUCT_PACKAGES := audio.primary.db845c @@ -67,3 +51,8 @@ PRODUCT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160 # Copy firmware files $(call inherit-product-if-exists, vendor/linaro/db845c/$(EXPECTED_LINARO_VENDOR_VERSION)/device.mk) $(call inherit-product-if-exists, vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)/device.mk) + +TARGET_HARDWARE := db845c +TARGET_KERNEL_USE ?= 5.15 + +include device/linaro/dragonboard/device-common.mk |