From 7788ffd9eb63ef451be2b928238df4529f86db46 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Fri, 3 Mar 2023 22:11:00 +0800 Subject: hikey960: set default kernel to 5.10 which supports kvm by default, so that it would be a little convenient for users to play some AVF features which do not depend on the protected mode with prebuilt images Test: boot to homescreen, and boot microdroid Change-Id: I09b20ca01bba8fb696a7cafc4e63859e8848b13b Signed-off-by: Yongqin Liu --- hikey960.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hikey960.mk b/hikey960.mk index 673181c6..7a35a224 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -1,21 +1,23 @@ 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) + 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 - include $(LOCAL_PATH)/vendor-package-ver.mk # Inherit the common device configuration -- cgit v1.2.3