diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-05 03:03:24 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-05 03:03:24 +0000 |
| commit | ab59ed88e2d109e051cce9203f6af7bbe6ad8c50 (patch) | |
| tree | a3f6324456b40b650aa7fd95a468324ba4796ffe | |
| parent | eda031bd0f9f86f1dd79bc56cc28a8a5ecf74bb3 (diff) | |
| parent | 4d14b2dcce6692bc865fe83a9eed775add81e034 (diff) | |
| download | hikey-ab59ed88e2d109e051cce9203f6af7bbe6ad8c50.tar.gz | |
Snap for 9691016 from 4d14b2dcce6692bc865fe83a9eed775add81e034 to udc-d1-release
Change-Id: I70735b9a03cb7397c72932ab943211e806f79648
| -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 |