diff options
Diffstat (limited to 'hikey960.mk')
| -rw-r--r-- | hikey960.mk | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/hikey960.mk b/hikey960.mk index 673181c6..e0c63715 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -1,20 +1,48 @@ ifndef TARGET_KERNEL_USE -TARGET_KERNEL_USE=5.4 +TARGET_KERNEL_USE=5.10 endif LOCAL_KERNEL_HOME ?= device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE) TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL_HOME)/Image.gz-dtb TARGET_PREBUILT_DTB := $(LOCAL_KERNEL_HOME)/hi3660-hikey960.dtb ifndef HIKEY_USES_GKI - ifeq ($(TARGET_KERNEL_USE), 5.4) + ## Please check the following link for the android-mainline + ## kernel build instructions: + ## https://www.96boards.org/documentation/consumer/hikey/hikey960/build/android-mainline.md.html + ifeq ($(TARGET_KERNEL_USE), mainline) HIKEY_USES_GKI := true else - ifeq ($(TARGET_KERNEL_USE), mainline) + KERNEL_MAJ := $(word 1, $(subst ., ,$(TARGET_KERNEL_USE))) + # kernel since 5.X should support GKI + # only 4.X kernels do not support GKI + ifneq ($(KERNEL_MAJ), 4) HIKEY_USES_GKI := true endif endif endif +# only kernels after 5.10 support KVM +ifndef HIKEY960_ENABLE_AVF + ifeq ($(TARGET_KERNEL_USE), mainline) + HIKEY960_ENABLE_AVF := true + else + KERNEL_MAJ := $(word 1, $(subst ., ,$(TARGET_KERNEL_USE))) + KERNEL_MIN := $(word 2, $(subst ., ,$(TARGET_KERNEL_USE))) + KER_GT_5 := $(shell [ $(KERNEL_MAJ) -gt 5 ] && echo true) + KER_GE_5_10 := $(shell [ $(KERNEL_MIN) -ge 10 ] && echo true) + + ifeq ($(KER_GT_5), true) + HIKEY960_ENABLE_AVF := true + else + ifeq ($(KERNEL_MAJ), 5) + # for kernel after 5.10 + ifeq ($(KER_GE_5_10),true) + HIKEY960_ENABLE_AVF := true + endif + endif # end for 5.10 + endif # end for 5.X + endif # end for mainline +endif # end for HIKEY960_ENABLE_AVF include $(LOCAL_PATH)/vendor-package-ver.mk @@ -24,7 +52,16 @@ $(call inherit-product, device/linaro/hikey/hikey960/device-hikey960.mk) $(call inherit-product, device/linaro/hikey/device-common.mk) $(call inherit-product-if-exists, vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/hikey960.mk) -PRODUCT_PROPERTY_OVERRIDES += ro.opengles.version=196608 +PRODUCT_PROPERTY_OVERRIDES += \ + ro.opengles.version=196608 \ + ro.hardware.egl=mali + +## This is a workaround for the Bluetooth sanitize shadow call stack (SCS) +## crash reported here: https://issuetracker.google.com/issues/302408537, +## until the new version Mali binaries released. +## For details of the root cause and the cts vts tests comparison between +## the preloading and non-preloading builds, please check the above issue. +PRODUCT_PROPERTY_OVERRIDES += ro.zygote.disable_gl_preload=1 # # Overrides |