commit ee5c1598db40f645cea3cfc0150f4781efc04c9d
author John Stultz <john.stultz@linaro.org> Mon Dec 09 09:33:25 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 09 09:33:25 2019 -0800
tree f93b91e6bad684fbb39940d10849deacb52af139
parent bcb3de1b65d0e66efa72982234a59534b886cc42
parent 991bbe2c224b83eaf74d39773b8ae5ae31a9a5ff

HiKey960: Add BOARD_VENDOR_RAMDISK_KERNEL_MODULES for modules am: 849254646d am: 89041a2d68
am: 991bbe2c22

Change-Id: Ie05a63d6b513db0029cec76d89a6dbc41e57a0ba

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