commit e05046e00fb22c94e1e2d2dcd8b16340ed919aea
author Yongqin Liu <yongqin.liu@linaro.org> Tue Nov 24 21:00:19 2020 +0800
committer YongQin Liu <yongqin.liu@linaro.org> Tue Nov 24 13:49:47 2020 +0000
tree 1ae05dca355a296f4f4e72d10ff8983c06399467
parent b0f660cdae53c460c26c517b080d81f657844bc1

hikey.mk/hikey960.mk: add support for android-mainline kernel

where cma_heap.ko is used instead of ion_cma_heap.ko,
and other ko files that not exist with the android-mainline kernel

Test: boot to home screen with mainline kernel

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: I8c737d3f1cdb037e301af9bef151a67e5e4f4e8f

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index 3a979f8..d4e721f 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -48,10 +48,13 @@
   HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)
   HIKEY_MODS := $(wildcard $(HIKEY_MOD_DIR)/*.ko)
   SDCARDFS_KO := $(wildcard $(HIKEY_MOD_DIR)/sdcardfs*.ko)
+  CMA_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/cma_heap.ko)
+  ION_CMA_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/ion_cma_heap*.ko)
   ifneq ($(HIKEY_MODS),)
     BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS)
     BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-	$(HIKEY_MOD_DIR)/ion_cma_heap.ko \
-	$(SDCARDFS_KO)
+        $(CMA_HEAP_KO) \
+        $(ION_CMA_HEAP_KO) \
+        $(SDCARDFS_KO)
   endif
 endif