diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-17 04:06:51 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-17 04:06:51 +0000 |
commit | 13d927e5efbbf483caf6e4dac42d5b474130940f (patch) | |
tree | 88ce539f2b0a3540ee696bdf1a1315ff84b8d515 | |
parent | d318e1c51338b39972664e39c006863cb4eb78bc (diff) | |
parent | e70b4a6958748f4194d17ef23fc525ed4b5f28fd (diff) | |
download | hikey-13d927e5efbbf483caf6e4dac42d5b474130940f.tar.gz |
Snap for 6077728 from e70b4a6958748f4194d17ef23fc525ed4b5f28fd to rvc-release
Change-Id: Ia4c151fd390a90c08563693f531aece68646277e
-rw-r--r-- | hikey.mk | 31 |
1 files changed, 30 insertions, 1 deletions
@@ -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 |