summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2019-12-09 09:31:25 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-09 09:31:25 -0800
commit991bbe2c224b83eaf74d39773b8ae5ae31a9a5ff (patch)
tree2d200000e7a9016794d6e71b339aedc25394833a
parent45bd2a133db6c74ee10396a488771e8835fbfdf1 (diff)
parent89041a2d6864c6f7572766e8558bbfdb5d2ba9b7 (diff)
downloadhikey-991bbe2c224b83eaf74d39773b8ae5ae31a9a5ff.tar.gz
HiKey960: Add BOARD_VENDOR_RAMDISK_KERNEL_MODULES for modules am: 849254646d
am: 89041a2d68 Change-Id: I3423ab5284d5064d1e05be5e1e9b035d89ef8d9d
-rw-r--r--hikey960.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/hikey960.mk b/hikey960.mk
index c7e4e6ae..2e338e9a 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -39,7 +39,13 @@ PRODUCT_DEVICE := hikey960
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