diff options
| -rw-r--r-- | BoardConfig-common.mk | 15 | ||||
| -rw-r--r-- | device.mk | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index f39a329..cf851dd 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -89,6 +89,9 @@ ifneq ($(PRODUCT_BUILD_VENDOR_BOOT_IMAGE),false) AB_OTA_PARTITIONS += vendor_boot AB_OTA_PARTITIONS += dtbo endif +ifeq ($(PRODUCT_BUILD_VENDOR_KERNEL_BOOT_IMAGE),true) +AB_OTA_PARTITIONS += vendor_kernel_boot +endif ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false) AB_OTA_PARTITIONS += vbmeta endif @@ -351,9 +354,6 @@ BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_INIT_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION) -BOARD_VENDOR_RAMDISK_FRAGMENTS := dlkm -BOARD_VENDOR_RAMDISK_FRAGMENT.dlkm.KERNEL_MODULE_DIRS := top - # Enable AVB2.0 BOARD_AVB_ENABLE := true BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000 @@ -361,6 +361,9 @@ BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE := 0x800000 BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x04000000 BOARD_DTBOIMG_PARTITION_SIZE := 0x01000000 +# Build vendor kernel boot image +BOARD_VENDOR_KERNEL_BOOTIMAGE_PARTITION_SIZE := 0x04000000 + # System As Root BOARD_BUILD_SYSTEM_ROOT_IMAGE := false @@ -372,11 +375,11 @@ KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) BOARD_VENDOR_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)) -ifndef BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load)) +ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD $(error vendor_boot.modules.load not found or empty) endif -BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD))) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD))) BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load)) ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD @@ -1074,6 +1074,9 @@ PRODUCT_PACKAGES += \ $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) PRODUCT_BUILD_PVMFW_IMAGE := true +# Enable to build standalone vendor_kernel_boot image. +PRODUCT_BUILD_VENDOR_KERNEL_BOOT_IMAGE := true + # Enable watchdog timeout loop breaker. PRODUCT_PROPERTY_OVERRIDES += \ framework_watchdog.fatal_window.second=600 \ |