Merge "hikey.mk/hikey960.mk: add support for android-mainline kernel" am: d90872832e am: d1d0203a85
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509788
Change-Id: Ib80e15efa3dc9fd93154a10ba89f6184e0cd18b4
diff --git a/hikey.mk b/hikey.mk
index f8a8df9..0a15858 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -27,20 +27,27 @@
$(HIKEY_MOD_DIR)/phy-hi6220-usb.ko
# make sure ion cma heap loads early
+ CMA_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/cma_heap*.ko)
+ ION_CMA_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/ion_cma_heap*.ko)
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
- $(HIKEY_MOD_DIR)/ion_cma_heap.ko
+ $(CMA_HEAP_KO) \
+ $(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
+ MMC_CORE_KO := $(wildcard $(HIKEY_MOD_DIR)/mmc_core.ko)
+ MMC_BLOCK_KO := $(wildcard $(HIKEY_MOD_DIR)/mmc_block.ko)
+ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
+ $(MMC_CORE_KO) \
+ $(MMC_BLOCK_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 \
diff --git a/hikey960.mk b/hikey960.mk
index 3a979f8..d4e721f 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -48,10 +48,13 @@
HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)
HIKEY_MODS := $(wildcard $(HIKEY_MOD_DIR)/*.ko)
SDCARDFS_KO := $(wildcard $(HIKEY_MOD_DIR)/sdcardfs*.ko)
+ CMA_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/cma_heap.ko)
+ ION_CMA_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/ion_cma_heap*.ko)
ifneq ($(HIKEY_MODS),)
BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS)
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
- $(HIKEY_MOD_DIR)/ion_cma_heap.ko \
- $(SDCARDFS_KO)
+ $(CMA_HEAP_KO) \
+ $(ION_CMA_HEAP_KO) \
+ $(SDCARDFS_KO)
endif
endif