commit e688182ea85397d38f0e338523aebd1493ffba6d
author Yongqin Liu <yongqin.liu@linaro.org> Sat Mar 04 07:10:03 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 04 07:10:03 2023 +0000
tree a3f6324456b40b650aa7fd95a468324ba4796ffe
parent 0780948d8ffc852a8c42d8c5668bb43103fccf11
parent a356ea0c8369b36dc635da162576a12ad09646c9

hikey960: set default kernel to 5.10 am: 7788ffd9eb am: a356ea0c83

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2469591

Change-Id: I05a0342ed18251094b6f026f5d1bf780a0aca111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index 673181c..7a35a22 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