diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-28 00:12:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-28 00:12:37 +0000 |
| commit | b268d50ac9e23014f3c780102f674c90c35a4907 (patch) | |
| tree | 031d407040f386c45bd09d5b02fecc603417c282 | |
| parent | 98b6d23a0cb1452b7ebf8e03fbe880d8c794d3c6 (diff) | |
| parent | a5a55090425eabb5702ee9ad1efc5e0917425712 (diff) | |
| download | hikey-b268d50ac9e23014f3c780102f674c90c35a4907.tar.gz | |
Merge "hikey.mk/hikey960.mk: add support for android-mainline kernel" am: d90872832e am: d1d0203a85 am: a5a5509042
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509788
Change-Id: Ic83a37489ef50330b71d8c62cdca7847eae57dfb
| -rw-r--r-- | hikey.mk | 13 | ||||
| -rw-r--r-- | hikey960.mk | 7 |
2 files changed, 15 insertions, 5 deletions
@@ -27,20 +27,27 @@ ifneq ($(HIKEY_MODS),) $(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 3a979f88..d4e721fc 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -48,10 +48,13 @@ ifneq ($(HIKEY_USES_GKI),) 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 |