From 03495e41e2ad87af62c40b0f91e03e850231bbf7 Mon Sep 17 00:00:00 2001
From: Lucas Wei <lucaswei@google.com>
Date: Tue, 1 Mar 2022 15:05:57 +0800
Subject: Enable vendor_kernel_boot partition for gs201

 - Disable dlkm ramdisk fragment from vendor_boot
 - Enable vendor_kernel_boot and OTA support
 - Set partition size to 64MB

Bug: 214409109
Change-Id: I4a6ee0b2f1c44a4d257cc51cf408f6f7cf295471
Signed-off-by: Lucas Wei <lucaswei@google.com>
---
 BoardConfig-common.mk | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'BoardConfig-common.mk')

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
-- 
cgit v1.2.3