commit cf5594bf8a6978f35f7a7f81c1af4dbac52c1cc3
author John Stultz <john.stultz@linaro.org> Thu Jun 11 10:26:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 11 10:26:14 2020 +0000
tree 4f2d6a638d78516b6102b06e6fde019069091e38
parent 40be3fc2b6a8479e854d7fb7104e065f9dd0a4a5
parent 4abea79d5d5aa2e04330b256ad7e1a154e6d2c98

hikey960: Switch to using 5.4(gki) by default on hikey960 am: 5d031840c5 am: 508f314eee am: 4abea79d5d

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

Change-Id: If97618853cd8ac730a5ce0c2a6a80d4bdca5a8b5

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index 19d972e..035002e 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -1,5 +1,5 @@
 ifndef TARGET_KERNEL_USE
-TARGET_KERNEL_USE=4.19
+TARGET_KERNEL_USE=5.4
 endif
 TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)/Image.gz-dtb
 TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)/hi3660-hikey960.dtb
@@ -16,6 +16,12 @@
   HIKEY_USE_LEGACY_TI_BLUETOOTH := false
 endif
 
+ifndef HIKEY_USES_GKI
+  ifeq ($(TARGET_KERNEL_USE), 5.4)
+    HIKEY_USES_GKI := true
+  endif
+endif
+
 #
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)