summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2019-07-12 07:04:13 +0000
committerJohn Stultz <john.stultz@linaro.org>2019-12-07 03:46:20 +0000
commit849254646d0e205908c8608c48e95f40a9e84c20 (patch)
tree2d200000e7a9016794d6e71b339aedc25394833a
parentf1a68d0c1b31d650b56d93b72c9bf0717a9493a3 (diff)
downloadhikey-849254646d0e205908c8608c48e95f40a9e84c20.tar.gz
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>
-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