zenfone9: Use prebuilt kernel
Change-Id: I7a535e3ebeb8e20a51da2a9d1218730842e12c40
diff --git a/BoardConfig.mk b/BoardConfig.mk
index a25e4af..c5816b9 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -129,7 +129,14 @@
DEVICE_MATRIX_FILE += $(DEVICE_PATH)/manifest/compatibility_matrix.xml
# Kernel
-KERNEL_LD := LD=ld.lld AR=llvm-ar
+BOARD_USES_DT := true
+BOARD_USES_GENERIC_KERNEL_IMAGE := true
+BOARD_PREBUILT_DTBIMAGE_DIR := $(TARGET_KERNEL_DIR)/dtb
+BOARD_PREBUILT_DTBOIMAGE := $(TARGET_KERNEL_DIR)/dtbo.img
+BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+TARGET_NO_KERNEL := false
+TARGET_NO_KERNEL_OVERRIDE := true
+
BOARD_BOOT_HEADER_VERSION := 4
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
BOARD_KERNEL_CMDLINE := \
@@ -143,24 +150,16 @@
BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
BOARD_KERNEL_PAGESIZE := 4096
-BOARD_KERNEL_BASE := 0x00000000
-TARGET_KERNEL_ARCH := arm64
-TARGET_KERNEL_HEADER_ARCH := arm64
-BOARD_KERNEL_IMAGE_NAME := Image
-TARGET_COMPILE_WITH_MSM_KERNEL := true
-TARGET_KERNEL_CONFIG := vendor/zf8_defconfig
-TARGET_KERNEL_SOURCE := kernel/asus/sm8350
-BOARD_INCLUDE_DTB_IN_BOOTIMG := true
-BOARD_KERNEL_SEPARATED_DTBO := true
BOARD_RAMDISK_USE_LZ4 := true
-TARGET_KERNEL_CLANG_COMPILE := true
-TARGET_KERNEL_ADDITIONAL_FLAGS := \
- DTC_EXT=$(shell pwd)/prebuilts/misc/linux-x86/dtc/dtc \
- HOSTCFLAGS="-fuse-ld=lld -Wno-unused-command-line-argument"
-TARGET_KERNEL_ADDITIONAL_FLAGS += LLVM=1 LLVM_IAS=1
-
BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
+# Kernel Modules
+KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR)/modules
+KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)
+BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist
+BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load))
+BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES)
+
# NFC
TARGET_USES_NQ_NFC := true
@@ -223,6 +222,12 @@
TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/ramdisk/fstab.qcom
TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
TARGET_RECOVERY_UI_MARGIN_HEIGHT := 150
+BOARD_USES_FULL_RECOVERY_IMAGE := true
+
+BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/modules.load.recovery))
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD)))
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
# Security patch level
VENDOR_SECURITY_PATCH := 2022-10-01