Skip to content

Commit

Permalink
imx8mq_var_dart: add support for Android 10.0.0 2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
m-p-s committed Oct 15, 2020
1 parent eb4b699 commit 341cbf8
Show file tree
Hide file tree
Showing 29 changed files with 424 additions and 118 deletions.
9 changes: 6 additions & 3 deletions imx8m/dart_mx8mq/AndroidUboot.mk
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
# uboot.imx in android combine scfw.bin and uboot.bin
MAKE += SHELL=/bin/bash

ifneq ($(AARCH64_GCC_CROSS_COMPILE),)
ATF_CROSS_COMPILE := $(strip $(AARCH64_GCC_CROSS_COMPILE))
IMX_DEVICE_PATH := device/variscite/imx8m/dart_mx8mq
else
ATF_TOOLCHAIN_ABS := $(realpath prebuilts/gcc/$(HOST_PREBUILT_TAG)/aarch64/aarch64-linux-android-4.9/bin)
ATF_CROSS_COMPILE := $(ATF_TOOLCHAIN_ABS)/aarch64-linux-androidkernel-
IMX_DEVICE_PATH := device/variscite/imx8m/dart_mx8mq
endif

define build_imx_uboot
$(hide) echo Building i.MX U-Boot with firmware; \
cp $(UBOOT_OUT)/u-boot-nodtb.$(strip $(1)) $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
cp $(UBOOT_OUT)/spl/u-boot-spl.bin $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
cp $(UBOOT_OUT)/tools/mkimage $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/mkimage_uboot; \
cp $(UBOOT_OUT)/arch/arm/dts/imx8mq-var-dart.dtb $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
cp $(FSL_PROPRIETARY_PATH)/linux-firmware-imx/firmware/hdmi/cadence/signed_hdmi_imx8m.bin $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
cp $(UBOOT_OUT)/arch/arm/dts/fsl-imx8mq-var-dart.dtb $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
cp $(FSL_PROPRIETARY_PATH)/fsl-proprietary/uboot-firmware/imx8m/signed_hdmi_imx8m.bin $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
cp $(FSL_PROPRIETARY_PATH)/linux-firmware-imx/firmware/ddr/synopsys/lpddr4_pmu_train* $(IMX_MKIMAGE_PATH)/imx-mkimage/iMX8M/.; \
$(MAKE) -C $(IMX_PATH)/arm-trusted-firmware/ PLAT=`echo $(2) | cut -d '-' -f1` clean; \
if [ `echo $(2) | cut -d '-' -f2` = "trusty" ] && [ `echo $(2) | rev | cut -d '-' -f1` != "uuu" ]; then \
Expand Down
88 changes: 58 additions & 30 deletions imx8m/dart_mx8mq/BoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ SOONG_CONFIG_IMXPLUGIN += \
SOONG_CONFIG_IMXPLUGIN_BOARD_SOC_TYPE = IMX8MQ
SOONG_CONFIG_IMXPLUGIN_BOARD_HAVE_VPU = true
SOONG_CONFIG_IMXPLUGIN_BOARD_VPU_TYPE = hantro
SOONG_CONFIG_IMXPLUGIN_BOARD_VPU_ONLY = false

#
# Product-specific compile-time definitions.
Expand All @@ -34,26 +35,30 @@ SOONG_CONFIG_IMXPLUGIN_BOARD_VPU_TYPE = hantro
IMX_DEVICE_PATH := device/variscite/imx8m/dart_mx8mq

include device/fsl/imx8m/BoardConfigCommon.mk
ifeq ($(PREBUILT_FSL_IMX_CODEC),true)
-include $(FSL_CODEC_PATH)/fsl-codec/fsl-codec.mk
endif

BUILD_TARGET_FS ?= ext4
TARGET_USERIMAGES_USE_EXT4 := true

TARGET_RECOVERY_FSTAB = $(IMX_DEVICE_PATH)/fstab.freescale

# Support gpt
ifeq ($(IMX_NO_PRODUCT_PARTITION),true)
BOARD_BPT_INPUT_FILES += device/fsl/common/partition/device-partitions-13GB-ab-no-product.bpt
ADDITION_BPT_PARTITION = partition-table-28GB:device/fsl/common/partition/device-partitions-28GB-ab-no-product.bpt \
partition-table-dual:device/fsl/common/partition/device-partitions-13GB-ab-dual-bootloader-no-product.bpt \
partition-table-28GB-dual:device/fsl/common/partition/device-partitions-28GB-ab-dual-bootloader-no-product.bpt
ifeq ($(TARGET_USE_DYNAMIC_PARTITIONS),true)
BOARD_BPT_INPUT_FILES += device/fsl/common/partition/device-partitions-13GB-ab_super.bpt
ADDITION_BPT_PARTITION = partition-table-28GB:device/fsl/common/partition/device-partitions-28GB-ab_super.bpt \
partition-table-dual:device/fsl/common/partition/device-partitions-13GB-ab-dual-bootloader_super.bpt \
partition-table-28GB-dual:device/fsl/common/partition/device-partitions-28GB-ab-dual-bootloader_super.bpt
else
BOARD_BPT_INPUT_FILES += device/fsl/common/partition/device-partitions-13GB-ab.bpt
ADDITION_BPT_PARTITION = partition-table-28GB:device/fsl/common/partition/device-partitions-28GB-ab.bpt \
partition-table-dual:device/fsl/common/partition/device-partitions-13GB-ab-dual-bootloader.bpt \
partition-table-28GB-dual:device/fsl/common/partition/device-partitions-28GB-ab-dual-bootloader.bpt
ifeq ($(IMX_NO_PRODUCT_PARTITION),true)
BOARD_BPT_INPUT_FILES += device/fsl/common/partition/device-partitions-13GB-ab-no-product.bpt
ADDITION_BPT_PARTITION = partition-table-28GB:device/fsl/common/partition/device-partitions-28GB-ab-no-product.bpt \
partition-table-dual:device/fsl/common/partition/device-partitions-13GB-ab-dual-bootloader-no-product.bpt \
partition-table-28GB-dual:device/fsl/common/partition/device-partitions-28GB-ab-dual-bootloader-no-product.bpt
else
BOARD_BPT_INPUT_FILES += device/fsl/common/partition/device-partitions-13GB-ab.bpt
ADDITION_BPT_PARTITION = partition-table-28GB:device/fsl/common/partition/device-partitions-28GB-ab.bpt \
partition-table-dual:device/fsl/common/partition/device-partitions-13GB-ab-dual-bootloader.bpt \
partition-table-28GB-dual:device/fsl/common/partition/device-partitions-28GB-ab-dual-bootloader.bpt
endif
endif

# Vendor Interface manifest and compatibility
Expand All @@ -77,6 +82,7 @@ BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false

BOARD_HAVE_USB_CAMERA := true
BOARD_HAVE_USB_MJPEG_CAMERA := false

USE_ION_ALLOCATOR := true
USE_GPU_ALLOCATOR := false
Expand Down Expand Up @@ -107,24 +113,46 @@ $(error "TARGET_USERIMAGES_USE_UBIFS and TARGET_USERIMAGES_USE_EXT4 config open
endif
endif

BOARD_PREBUILT_DTBOIMAGE := out/target/product/dart_mx8mq/dtbo-imx8mq-var-dart-sd-lvds.img
TARGET_BOARD_DTS_CONFIG := \
imx8mq-var-dart-wifi-lvds-cb12:fsl-imx8mq-var-dart-wifi-lvds-cb12.dtb \
imx8mq-var-dart-wifi-lvds-hdmi-cb12:fsl-imx8mq-var-dart-wifi-lvds-hdmi-cb12.dtb \
imx8mq-var-dart-wifi-hdmi-cb12:fsl-imx8mq-var-dart-wifi-hdmi-cb12.dtb \
imx8mq-var-dart-sd-lvds-cb12:fsl-imx8mq-var-dart-sd-lvds-cb12.dtb \
imx8mq-var-dart-sd-lvds-hdmi-cb12:fsl-imx8mq-var-dart-sd-lvds-hdmi-cb12.dtb \
imx8mq-var-dart-sd-hdmi-cb12:fsl-imx8mq-var-dart-sd-hdmi-cb12.dtb \
imx8mq-var-dart-wifi-lvds:fsl-imx8mq-var-dart-wifi-lvds.dtb \
imx8mq-var-dart-wifi-lvds-hdmi:fsl-imx8mq-var-dart-wifi-lvds-hdmi.dtb \
imx8mq-var-dart-wifi-lvds-dp:fsl-imx8mq-var-dart-wifi-lvds-dp.dtb \
imx8mq-var-dart-wifi-hdmi:fsl-imx8mq-var-dart-wifi-hdmi.dtb \
imx8mq-var-dart-wifi-dp:fsl-imx8mq-var-dart-wifi-dp.dtb \
imx8mq-var-dart-sd-lvds:fsl-imx8mq-var-dart-sd-lvds.dtb \
imx8mq-var-dart-sd-lvds-hdmi:fsl-imx8mq-var-dart-sd-lvds-hdmi.dtb \
imx8mq-var-dart-sd-lvds-dp:fsl-imx8mq-var-dart-sd-lvds-dp.dtb \
imx8mq-var-dart-sd-hdmi:fsl-imx8mq-var-dart-sd-hdmi.dtb \
imx8mq-var-dart-sd-dp:fsl-imx8mq-var-dart-sd-dp.dtb
#BOARD_PREBUILT_DTBOIMAGE := out/target/product/dart_mx8mq/dtbo-imx8mq-var-dart-sd-lvds.img
BOARD_PREBUILT_DTBOIMAGE := out/target/product/dart_mx8mq/dtbo-imx8mq-var-dart-wifi-lvds.img

ifeq ($(TARGET_USE_DYNAMIC_PARTITIONS),true)
TARGET_BOARD_DTS_CONFIG := \
imx8mq-var-dart-wifi-lvds:imx8mq-var-dart-wifi-lvds.dtb \
imx8mq-var-dart-wifi-hdmi:imx8mq-var-dart-wifi-hdmi.dtb \
imx8mq-var-dart-wifi-lvds-hdmi:imx8mq-var-dart-wifi-lvds-hdmi.dtb \
imx8mq-var-dart-wifi-dp:imx8mq-var-dart-wifi-dp.dtb \
imx8mq-var-dart-wifi-lvds-cb12:imx8mq-var-dart-wifi-lvds-cb12.dtb \
imx8mq-var-dart-wifi-lvds-hdmi-cb12:imx8mq-var-dart-wifi-lvds-hdmi-cb12.dtb \
imx8mq-var-dart-wifi-hdmi-cb12:imx8mq-var-dart-wifi-hdmi-cb12.dtb \
imx8mq-var-dart-sd-lvds-cb12:imx8mq-var-dart-sd-lvds-cb12.dtb \
imx8mq-var-dart-sd-lvds-hdmi-cb12:imx8mq-var-dart-sd-lvds-hdmi-cb12.dtb \
imx8mq-var-dart-sd-hdmi-cb12:imx8mq-var-dart-sd-hdmi-cb12.dtb \
imx8mq-var-dart-wifi-lvds-dp:imx8mq-var-dart-wifi-lvds-dp.dtb \
imx8mq-var-dart-sd-lvds:imx8mq-var-dart-sd-lvds.dtb \
imx8mq-var-dart-sd-lvds-hdmi:imx8mq-var-dart-sd-lvds-hdmi.dtb \
imx8mq-var-dart-sd-lvds-dp:imx8mq-var-dart-sd-lvds-dp.dtb \
imx8mq-var-dart-sd-hdmi:imx8mq-var-dart-sd-hdmi.dtb \
imx8mq-var-dart-sd-dp:imx8mq-var-dart-sd-dp.dtb
else # no dynamic parition feature
TARGET_BOARD_DTS_CONFIG := \
imx8mq-var-dart-wifi-lvds:imx8mq-var-dart-wifi-lvds-no-dynamic_partition.dtb \
imx8mq-var-dart-wifi-hdmi:imx8mq-var-dart-wifi-hdmi-no-dynamic_partition.dtb \
imx8mq-var-dart-wifi-lvds-hdmi:imx8mq-var-dart-wifi-lvds-hdmi-no-dynamic_partition.dtb \
imx8mq-var-dart-wifi-dp:imx8mq-var-dart-wifi-dp-no-dynamic_partition.dtb \
imx8mq-var-dart-wifi-lvds-cb12:imx8mq-var-dart-wifi-lvds-cb12-no-dynamic_partition.dtb \
imx8mq-var-dart-wifi-lvds-hdmi-cb12:imx8mq-var-dart-wifi-lvds-hdmi-cb12-no-dynamic_partition.dtb \
imx8mq-var-dart-wifi-hdmi-cb12:imx8mq-var-dart-wifi-hdmi-cb12-no-dynamic_partition.dtb \
imx8mq-var-dart-sd-lvds-cb12:imx8mq-var-dart-sd-lvds-cb12-no-dynamic_partition.dtb \
imx8mq-var-dart-sd-lvds-hdmi-cb12:imx8mq-var-dart-sd-lvds-hdmi-cb12-no-dynamic_partition.dtb \
imx8mq-var-dart-sd-hdmi-cb12:imx8mq-var-dart-sd-hdmi-cb12-no-dynamic_partition.dtb \
imx8mq-var-dart-wifi-lvds-dp:imx8mq-var-dart-wifi-lvds-dp-no-dynamic_partition.dtb \
imx8mq-var-dart-sd-lvds:imx8mq-var-dart-sd-lvds-no-dynamic_partition.dtb \
imx8mq-var-dart-sd-lvds-hdmi:imx8mq-var-dart-sd-lvds-hdmi-no-dynamic_partition.dtb \
imx8mq-var-dart-sd-lvds-dp:imx8mq-var-dart-sd-lvds-dp-no-dynamic_partition.dtb \
imx8mq-var-dart-sd-hdmi:imx8mq-var-dart-sd-hdmi-no-dynamic_partition.dtb \
imx8mq-var-dart-sd-dp:imx8mq-var-dart-sd-dp-no-dynamic_partition.dtb
endif

BOARD_SEPOLICY_DIRS := \
device/fsl/imx8m/sepolicy \
Expand Down
5 changes: 3 additions & 2 deletions imx8m/dart_mx8mq/SharedBoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ PRODUCT_IMX_TRUSTY := true

# BCM fmac wifi driver module
BOARD_VENDOR_KERNEL_MODULES += \
$(KERNEL_OUT)/drivers/net/ethernet/freescale/fec.ko \
$(KERNEL_OUT)/drivers/net/wireless/broadcom/brcm80211/brcmutil/brcmutil.ko \
$(KERNEL_OUT)/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
$(KERNEL_OUT)/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko \
$(KERNEL_OUT)/drivers/mxc/hantro/hantrodec.ko \
$(KERNEL_OUT)/drivers/mxc/hantro_845/hantrodec_845s.ko
3 changes: 1 addition & 2 deletions imx8m/dart_mx8mq/UbootKernelBoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ TARGET_BOOTLOADER_CONFIG := \

# imx8mq kernel defconfig
TARGET_KERNEL_DEFCONFIG := imx8_var_android_defconfig
# TARGET_KERNEL_ADDITION_DEFCONF ?= android_addition_defconfig

TARGET_KERNEL_ADDITION_DEFCONF ?= android_addition_defconfig

# absolute path is used, not the same as relative path used in AOSP make
TARGET_DEVICE_DIR := $(patsubst %/, %, $(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
Expand Down
4 changes: 4 additions & 0 deletions imx8m/dart_mx8mq/android_addition_defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CONFIG_MXC_HANTRO=m
CONFIG_MXC_HANTRO_845=m
CONFIG_MXC_HANTRO_845_H1=m
CONFIG_MXC_HANTRO_VC8000E=m
4 changes: 2 additions & 2 deletions imx8m/dart_mx8mq/audio_policy_configuration_drm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
<mixPorts>
<mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="hdmi output" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="32000,44100,48000,88200,96000,176400,192000" channelMasks="AUDIO_CHANNEL_NONE"/>
</mixPort>
<mixPort name="esai output" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
</mixPort>
<mixPort name="primary input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
Expand Down
1 change: 0 additions & 1 deletion imx8m/dart_mx8mq/bluetooth/bdroid_buildcfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,4 @@

//Enable A2DPSink AVRCPController
#define BTA_AV_SINK_INCLUDED TRUE

#endif
2 changes: 1 addition & 1 deletion imx8m/dart_mx8mq/camera_config_imx8mq.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

"hal_version": "3",
"cam_blit_copy": "GPU_3D",
"cam_blit_csc": "GPU_3D",
"cam_blit_csc": "CPU",

"camera_metadata": [
{
Expand Down
81 changes: 75 additions & 6 deletions imx8m/dart_mx8mq/dart_mx8mq.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BCM_FIRMWARE_PATH := vendor/variscite/bcm_4343w_fw
include $(IMX_DEVICE_PATH)/SharedBoardConfig.mk

-include device/fsl/common/imx_path/ImxPathConfig.mk
$(call inherit-product, device/fsl/imx8m/ProductConfigCommon.mk)
include device/fsl/imx8m/ProductConfigCommon.mk

ifneq ($(wildcard $(IMX_DEVICE_PATH)/fstab_nand.freescale),)
$(shell touch $(IMX_DEVICE_PATH)/fstab_nand.freescale)
Expand All @@ -28,6 +28,32 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true
#Enable this to choose 32 bit user space build
#IMX8_BUILD_32BIT_ROOTFS := true

#Enable this to use dynamic partitions for the readonly partitions not touched by bootloader
TARGET_USE_DYNAMIC_PARTITIONS ?= true
#If the device is retrofit to have dynamic partition feature, set this variable to true to build
#the images and OTA package. Here is a demo to update 10.0.0_1.0.0 to 10.0.0_2.0.0 or higher
TARGET_USE_RETROFIT_DYNAMIC_PARTITION ?= false

ifeq ($(TARGET_USE_DYNAMIC_PARTITIONS),true)
PRODUCT_USE_DYNAMIC_PARTITIONS := true
BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE := true
ifeq ($(TARGET_USE_RETROFIT_DYNAMIC_PARTITION),true)
PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := true
BOARD_SUPER_PARTITION_METADATA_DEVICE := system
ifeq ($(IMX_NO_PRODUCT_PARTITION),true)
BOARD_SUPER_PARTITION_BLOCK_DEVICES := system vendor
BOARD_SUPER_PARTITION_SYSTEM_DEVICE_SIZE := 2952790016
BOARD_SUPER_PARTITION_VENDOR_DEVICE_SIZE := 536870912
else
BOARD_SUPER_PARTITION_BLOCK_DEVICES := system vendor product
BOARD_SUPER_PARTITION_SYSTEM_DEVICE_SIZE := 1610612736
BOARD_SUPER_PARTITION_VENDOR_DEVICE_SIZE := 536870912
BOARD_SUPER_PARTITION_PRODUCT_DEVICE_SIZE := 1879048192
endif
endif
endif

# Include keystore attestation keys and certificates.
ifeq ($(PRODUCT_IMX_TRUSTY),true)
-include $(IMX_SECURITY_PATH)/attestation/imx_attestation.mk
Expand All @@ -51,6 +77,18 @@ PRODUCT_COPY_FILES += \
device/fsl/common/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
device/fsl/common/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf

ifeq ($(TARGET_USE_DYNAMIC_PARTITIONS),true)
PRODUCT_COPY_FILES += \
$(FSL_PROPRIETARY_PATH)/fsl-proprietary/dynamic_partiton_tools/lpmake:lpmake \
$(FSL_PROPRIETARY_PATH)/fsl-proprietary/dynamic_partiton_tools/lpmake.exe:lpmake.exe
endif

# Audio card json
PRODUCT_COPY_FILES += \
$(IMX_DEVICE_PATH)/wm8904_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/configs/audio/wm8904_config.json \
device/fsl/common/audio-json/cdnhdmi_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/configs/audio/cdnhdmi_config.json \
device/fsl/common/audio-json/readme.txt:$(TARGET_COPY_OUT_VENDOR)/etc/configs/audio/readme.txt

ifeq ($(PRODUCT_IMX_TRUSTY),true)
PRODUCT_COPY_FILES += \
device/fsl/common/security/rpmb_key_test.bin:rpmb_key_test.bin \
Expand All @@ -75,6 +113,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version-1_1.xml \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \
frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \
frameworks/native/data/etc/android.software.backup.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.backup.xml \
frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml \
Expand Down Expand Up @@ -108,7 +147,7 @@ DEVICE_PACKAGE_OVERLAYS := $(IMX_DEVICE_PATH)/overlay

PRODUCT_CHARACTERISTICS := tablet

PRODUCT_AAPT_CONFIG += xlarge large tvdpi hdpi xhdpi
PRODUCT_AAPT_CONFIG += xlarge large tvdpi hdpi xhdpi xxhdpi

PRODUCT_COPY_FILES += \
$(IMX_DEVICE_PATH)/init.brcm.wifibt.sh:vendor/bin/init.brcm.wifibt.sh
Expand Down Expand Up @@ -144,14 +183,14 @@ PRODUCT_PACKAGES += \
libEGL_VIVANTE \
libGLESv1_CM_VIVANTE \
libGLESv2_VIVANTE \
gralloc_viv.imx8 \
gralloc_viv.imx \
libGAL \
libGLSLC \
libVSC \
libgpuhelper \
libSPIRV_viv \
libvulkan_VIVANTE \
vulkan.imx8 \
vulkan.imx \
libCLC \
libLLVM_viv \
libOpenCL \
Expand All @@ -160,12 +199,16 @@ PRODUCT_PACKAGES += \
libOpenVX \
libOpenVXU \
libNNVXCBinary-evis \
libNNVXCBinary-evis2 \
libNNVXCBinary-lite \
libOvx12VXCBinary-evis \
libOvx12VXCBinary-evis2 \
libOvx12VXCBinary-lite \
libNNGPUBinary-evis \
libNNGPUBinary-evis2 \
libNNGPUBinary-lite \
gatekeeper.imx8
libNNGPUBinary-ulite \
gatekeeper.imx

PRODUCT_PACKAGES += \
[email protected]:32 \
Expand Down Expand Up @@ -208,6 +251,11 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
$(IMX_DEVICE_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf

# Wifi regulatory
PRODUCT_COPY_FILES += \
external/wireless-regdb/regulatory.db:vendor/firmware/regulatory.db \
external/wireless-regdb/regulatory.db.p7s:vendor/firmware/regulatory.db.p7s

PRODUCT_COPY_FILES += \
$(BCM_FIRMWARE_PATH)/bcm4339.hcd:vendor/firmware/bcm/bcm4339.hcd \
$(BCM_FIRMWARE_PATH)/bcm43430a1.hcd:vendor/firmware/bcm/bcm43430a1.hcd \
Expand Down Expand Up @@ -265,7 +313,6 @@ endif

ifneq ($(BUILD_TARGET_FS),ubifs)
PRODUCT_PROPERTY_OVERRIDES += \
ro.internel.storage_size=/sys/block/mmcblk0/size \
ro.frp.pst=/dev/block/by-name/presistdata
endif

Expand All @@ -279,6 +326,20 @@ PRODUCT_PACKAGES += \
libhantro \
libcodec

# imx c2 codec binary
PRODUCT_PACKAGES += \
lib_vpu_wrapper \
lib_imx_c2_videodec_common \
lib_imx_c2_videodec \
lib_imx_c2_vpuwrapper_dec \
lib_imx_c2_process \
lib_imx_c2_process_dummy_post \
c2_component_register \
c2_component_register_ms \
c2_component_register_wmv9 \
c2_component_register_ra \
c2_component_register_rv

# CANbus tools
PRODUCT_PACKAGES += \
candump \
Expand All @@ -302,6 +363,7 @@ PRODUCT_PACKAGES += \

# Multi-Display launcher
PRODUCT_PACKAGES += \
MultiClientInputMethod \
MultiDisplay

# Specify rollback index for bootloader and for AVB
Expand All @@ -328,3 +390,10 @@ PRODUCT_PACKAGES += \
endif

IMX-DEFAULT-G2D-LIB := libg2d-viv

ifeq ($(PREBUILT_FSL_IMX_CODEC),true)
ifneq ($(IMX8_BUILD_32BIT_ROOTFS),true)
INSTALL_64BIT_LIBRARY := true
endif
-include $(FSL_CODEC_PATH)/fsl-codec/fsl-codec.mk
endif
Loading

0 comments on commit 341cbf8

Please sign in to comment.