summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2019-12-09 09:33:25 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-09 09:33:25 -0800
commitee5c1598db40f645cea3cfc0150f4781efc04c9d (patch)
treef93b91e6bad684fbb39940d10849deacb52af139
parentbcb3de1b65d0e66efa72982234a59534b886cc42 (diff)
parent991bbe2c224b83eaf74d39773b8ae5ae31a9a5ff (diff)
downloadhikey-ee5c1598db40f645cea3cfc0150f4781efc04c9d.tar.gz
HiKey960: Add BOARD_VENDOR_RAMDISK_KERNEL_MODULES for modules am: 849254646d am: 89041a2d68
am: 991bbe2c22 Change-Id: Ie05a63d6b513db0029cec76d89a6dbc41e57a0ba
-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