commit 849254646d0e205908c8608c48e95f40a9e84c20
author John Stultz <john.stultz@linaro.org> Fri Jul 12 07:04:13 2019 +0000
committer John Stultz <john.stultz@linaro.org> Sat Dec 07 03:46:20 2019 +0000
tree 2d200000e7a9016794d6e71b339aedc25394833a
parent f1a68d0c1b31d650b56d93b72c9bf0717a9493a3

HiKey960: Add BOARD_VENDOR_RAMDISK_KERNEL_MODULES for modules

Get UFS and ion_cma modules loading via the initrd.

This is hidden behind a HIKEY_USE_GKI for now, as we
have trouble switching between modular and non-modular
builds.

Change-Id: I074cd98752bed87ccb10991e4a3196a2f1c0e080
Signed-off-by: John Stultz <john.stultz@linaro.org>

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index c7e4e6a..2e338e9 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -39,7 +39,13 @@
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := AOSP on hikey960
 
-HIKEY_MODS := $(wildcard device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)/*.ko)
-ifneq ($(HIKEY_MODS),)
-  BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS)
+ifneq ($(HIKEY_USES_GKI),)
+  HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)
+  HIKEY_MODS := $(wildcard $(HIKEY_MOD_DIR)/*.ko)
+  ifneq ($(HIKEY_MODS),)
+    BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS)
+    BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
+	$(HIKEY_MOD_DIR)/ion_cma_heap.ko \
+	$(HIKEY_MOD_DIR)/ufs-hisi.ko
+  endif
 endif