Merge "fstab.hikey960: make it possible for vendor partition to be remounted"
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..6d8601b
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: RESTRICTED
+}
diff --git a/hikey-common.mk b/hikey-common.mk
index a2cb460..aba5797 100644
--- a/hikey-common.mk
+++ b/hikey-common.mk
@@ -4,9 +4,8 @@
HIKEY_USE_DRM_HWCOMPOSER := false
-TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image.gz-dtb-$(TARGET_KERNEL_USE)
-
-TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-$(TARGET_KERNEL_USE)
+TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE)/Image.gz-dtb
+TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE)/hi6220-hikey.dtb
PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
diff --git a/hikey.mk b/hikey.mk
index 1c26335..f8a8df9 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -15,7 +15,7 @@
PRODUCT_BRAND := Android
ifneq ($(HIKEY_USES_GKI),)
-HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey/5.4/
+HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE)/
HIKEY_MODS := $(wildcard $(HIKEY_MOD_DIR)/*.ko)
ifneq ($(HIKEY_MODS),)
BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS)
diff --git a/hikey960.mk b/hikey960.mk
index 7a31e09..035002e 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -1,8 +1,8 @@
ifndef TARGET_KERNEL_USE
-TARGET_KERNEL_USE=4.19
+TARGET_KERNEL_USE=5.4
endif
-TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image.gz-dtb-hikey960-$(TARGET_KERNEL_USE)
-TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi3660-hikey960.dtb-$(TARGET_KERNEL_USE)
+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
ifeq ($(TARGET_KERNEL_USE), 4.4)
HIKEY_USE_DRM_HWCOMPOSER := false
@@ -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)
