commit 335b54a0e8ac9a28a98e867f23fa0456bd138c8e
author John Stultz <john.stultz@linaro.org> Fri Jan 08 21:11:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 08 21:11:17 2021 +0000
tree c14b6e52e7f27232a0ebfe5e239a3731f78844ab
parent 535f863d3ac4598500171b59fc746d6e01d21d99
parent 4f896b5354e98e40b07ca74402635c7ccedf2413

hikey960: Make sure we load the system_heap.ko early am: 4ab665ef89 am: af485637e2 am: 4f896b5354

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1543710

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I297c6671460f961528a1d0aa198c0fda18b17295

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index 76a5672..09c5a7f 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -50,11 +50,13 @@
   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)
+  SYSTEM_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/system_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 += \
         $(CMA_HEAP_KO) \
+        $(SYSTEM_HEAP_KO) \
         $(ION_CMA_HEAP_KO) \
         $(SDCARDFS_KO)
   endif