diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2023-03-04 06:36:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-04 06:36:30 +0000 |
| commit | a356ea0c8369b36dc635da162576a12ad09646c9 (patch) | |
| tree | a3f6324456b40b650aa7fd95a468324ba4796ffe | |
| parent | c1c321438439efad9af46f84bbbd6fc6308fbef0 (diff) | |
| parent | 7788ffd9eb63ef451be2b928238df4529f86db46 (diff) | |
| download | hikey-a356ea0c8369b36dc635da162576a12ad09646c9.tar.gz | |
hikey960: set default kernel to 5.10 am: 7788ffd9eb
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2469591
Change-Id: I56e6afbcdeede61072569dc08eaa6750ecd4c992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | hikey960.mk | 10 |
1 files 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 |