diff options
Diffstat (limited to 'hikey960.mk')
| -rw-r--r-- | hikey960.mk | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/hikey960.mk b/hikey960.mk index 2e338e9a..3a58d251 100644 --- a/hikey960.mk +++ b/hikey960.mk @@ -1,34 +1,24 @@ ifndef TARGET_KERNEL_USE -TARGET_KERNEL_USE=4.19 +TARGET_KERNEL_USE=5.4 endif -TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image.gz-dtb-hikey960-$(TARGET_KERNEL_USE) -TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi3660-hikey960.dtb-$(TARGET_KERNEL_USE) - -ifeq ($(TARGET_KERNEL_USE), 4.4) - HIKEY_USE_DRM_HWCOMPOSER := false - HIKEY_USE_LEGACY_TI_BLUETOOTH := true -else - ifeq ($(TARGET_KERNEL_USE), 4.9) - HIKEY_USE_DRM_HWCOMPOSER := false - else - HIKEY_USE_DRM_HWCOMPOSER := true +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 + +ifndef HIKEY_USES_GKI + ifeq ($(TARGET_KERNEL_USE), 5.4) + HIKEY_USES_GKI := true endif - HIKEY_USE_LEGACY_TI_BLUETOOTH := false endif -# -# Inherit the full_base and device configurations + +include $(LOCAL_PATH)/vendor-package-ver.mk + +# Inherit the common device configuration $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, device/linaro/hikey/hikey960/device-hikey960.mk) $(call inherit-product, device/linaro/hikey/device-common.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) - -#setup dm-verity configs -PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/platform/soc/ff3b0000.ufs/by-name/system -PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/platform/soc/ff3b0000.ufs/by-name/vendor -$(call inherit-product, build/target/product/verity.mk) -PRODUCT_SUPPORTS_BOOT_SIGNER := false -PRODUCT_SUPPORTS_VERITY_FEC := false +$(call inherit-product-if-exists, vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/hikey960.mk) PRODUCT_PROPERTY_OVERRIDES += ro.opengles.version=196608 @@ -40,12 +30,25 @@ 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) + DEFERRED_FREE_KO := $(wildcard $(HIKEY_MOD_DIR)/deferred-free-helper.ko) + PAGE_POOL_KO := $(wildcard $(HIKEY_MOD_DIR)/page_pool.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 += \ - $(HIKEY_MOD_DIR)/ion_cma_heap.ko \ - $(HIKEY_MOD_DIR)/ufs-hisi.ko + $(CMA_HEAP_KO) \ + $(SYSTEM_HEAP_KO) \ + $(DEFERRED_FREE_KO) \ + $(PAGE_POOL_KO) \ + $(ION_CMA_HEAP_KO) \ + $(SDCARDFS_KO) endif endif + +PRODUCT_SOONG_NAMESPACES += \ + vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/mali/bifrost |