summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2019-12-16 10:09:23 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-16 10:09:23 -0800
commit9a11156b98b89966cbb91cf6d2d0bcb9cdd5d2ab (patch)
tree4f576b4ae15f2a31182ba502b4027ac020942732
parent89041a2d6864c6f7572766e8558bbfdb5d2ba9b7 (diff)
parentcd76b134a51086ca11dcc5a8c9f894b3b78c9953 (diff)
downloadhikey-9a11156b98b89966cbb91cf6d2d0bcb9cdd5d2ab.tar.gz
HiKey: Add BOARD_VENDOR_RAMDISK_KERNEL_MODULES for HiKey
am: cd76b134a5 Change-Id: I6cf194cf0526228c070bdf5d86f267b5433b1baf
-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