diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-05 00:03:44 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-05 00:03:44 +0000 |
| commit | 3a34e6360133c520f8594ae076420f100e4f8e6a (patch) | |
| tree | a3f6324456b40b650aa7fd95a468324ba4796ffe /hikey960.mk | |
| parent | a7114d832eab0e4748c780444c1b156de0fe6013 (diff) | |
| parent | 4ac2ad44331fe828bc2b9d9e4ca46f16db1abc12 (diff) | |
| download | hikey-3a34e6360133c520f8594ae076420f100e4f8e6a.tar.gz | |
Snap for 9690662 from 4ac2ad44331fe828bc2b9d9e4ca46f16db1abc12 to udc-release
Change-Id: I5e5bb426b842c2af55a806c068195868b103933b
Diffstat (limited to 'hikey960.mk')
| -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 |