diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-03 05:26:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-03 05:26:23 +0000 |
| commit | 4dca84db288b533db795e3dba9ede8e5b661efde (patch) | |
| tree | 1b50b340b0efe74792188833e825254eacd83183 | |
| parent | d90872832e79f9aba417a3d0ecfa0ee3379da223 (diff) | |
| parent | aa064df07c345130596c0c64883f44bfda65129a (diff) | |
| download | hikey-4dca84db288b533db795e3dba9ede8e5b661efde.tar.gz | |
Merge "hikey/hikey960: support to specify the prebuilt kernel dir out of aosp tree"
| -rw-r--r-- | hikey-common.mk | 5 | ||||
| -rw-r--r-- | hikey.mk | 2 | ||||
| -rw-r--r-- | hikey960.mk | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/hikey-common.mk b/hikey-common.mk index b156cc37..3df9ba70 100644 --- a/hikey-common.mk +++ b/hikey-common.mk @@ -4,8 +4,9 @@ endif HIKEY_USE_DRM_HWCOMPOSER := false -TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE)/Image.gz-dtb -TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE)/hi6220-hikey.dtb +LOCAL_KERNEL_HOME ?= device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE) +TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL_HOME)/Image.gz-dtb +TARGET_PREBUILT_DTB := $(LOCAL_KERNEL_HOME)/hi6220-hikey.dtb PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true @@ -15,7 +15,7 @@ PRODUCT_DEVICE := hikey PRODUCT_BRAND := Android ifneq ($(HIKEY_USES_GKI),) -HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey/$(TARGET_KERNEL_USE)/ +HIKEY_MOD_DIR := $(LOCAL_KERNEL_HOME) HIKEY_MODS := $(wildcard $(HIKEY_MOD_DIR)/*.ko) ifneq ($(HIKEY_MODS),) BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS) diff --git a/hikey960.mk b/hikey960.mk index d4e721fc..76a56720 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -1,8 +1,9 @@ ifndef TARGET_KERNEL_USE TARGET_KERNEL_USE=5.4 endif -TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)/Image.gz-dtb -TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)/hi3660-hikey960.dtb +LOCAL_KERNEL_HOME ?= device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE) +TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL_HOME)/Image.gz-dtb +TARGET_PREBUILT_DTB := $(LOCAL_KERNEL_HOME)/hi3660-hikey960.dtb ifeq ($(TARGET_KERNEL_USE), 4.4) HIKEY_USE_DRM_HWCOMPOSER := false @@ -45,7 +46,7 @@ PRODUCT_BRAND := Android PRODUCT_MODEL := AOSP on hikey960 ifneq ($(HIKEY_USES_GKI),) - HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE) + HIKEY_MOD_DIR := $(LOCAL_KERNEL_HOME) 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) |