summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-16 18:32:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-16 18:32:59 +0000
commite70b4a6958748f4194d17ef23fc525ed4b5f28fd (patch)
tree88ce539f2b0a3540ee696bdf1a1315ff84b8d515
parent2319e95a8b32b2c298fc0bea83d6f944770faae7 (diff)
parent5744cc8359ef8c3cf62882d904d966784a394176 (diff)
downloadhikey-e70b4a6958748f4194d17ef23fc525ed4b5f28fd.tar.gz
HiKey: Add BOARD_VENDOR_RAMDISK_KERNEL_MODULES for HiKey am: cd76b134a5 am: 9a11156b98 am: 5744cc8359
Change-Id: I2f02e210cf1f0c9e6943ba5ead1b88296859b512
-rw-r--r--hikey.mk31
1 files changed, 30 insertions, 1 deletions
diff --git a/hikey.mk b/hikey.mk
index 9e292438..1c26335e 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -14,7 +14,36 @@ PRODUCT_NAME := hikey
PRODUCT_DEVICE := hikey
PRODUCT_BRAND := Android
-HIKEY_MODS := $(wildcard device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE)/*.ko)
+ifneq ($(HIKEY_USES_GKI),)
+HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey/5.4/
+HIKEY_MODS := $(wildcard $(HIKEY_MOD_DIR)/*.ko)
ifneq ($(HIKEY_MODS),)
BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS)
+ # XXX dwc2/phy-hi6220-usb have some timing
+ # issue that prevents gadget mode from working
+ # unless they are loaded from initrd. Need to fix.
+ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
+ $(HIKEY_MOD_DIR)/dwc2.ko \
+ $(HIKEY_MOD_DIR)/phy-hi6220-usb.ko
+
+ # make sure ion cma heap loads early
+ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
+ $(HIKEY_MOD_DIR)/ion_cma_heap.ko
+
+ # Not sure why, but powerkey has to be initrd
+ # or else we'll see stalls or issues at bootup
+ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
+ $(HIKEY_MOD_DIR)/hisi_powerkey.ko
+
+ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
+ $(HIKEY_MOD_DIR)/hi655x-regulator.ko \
+ $(HIKEY_MOD_DIR)/clk-hi655x.ko \
+ $(HIKEY_MOD_DIR)/hi655x-pmic.ko \
+ $(HIKEY_MOD_DIR)/mmc_core.ko \
+ $(HIKEY_MOD_DIR)/mmc_block.ko \
+ $(HIKEY_MOD_DIR)/dw_mmc-k3.ko \
+ $(HIKEY_MOD_DIR)/dw_mmc-pltfm.ko \
+ $(HIKEY_MOD_DIR)/dw_mmc.ko \
+
+endif
endif