From ee129d98fa3c21ca5c264aa74066e1597c99f52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= <ptosi@google.com>
Date: Tue, 18 Apr 2023 11:31:23 +0100
Subject: [PATCH] zuma: Cover pvmfw.img in vbmeta_system.img

The pvmfw partition is expected to be kept in sync with the system
partition so, instead of having it as a standalone partition (covered by
vbmeta.img), add it to vbmeta_system.

Bug: 275497314
Test: TH
Change-Id: I02356aa43d83c95d3671937a6a764ba6765a3d5b
---
 BoardConfig-common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 864a3858..7f5f0c6b 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -152,6 +152,10 @@ BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
 
+ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false)
+BOARD_AVB_VBMETA_SYSTEM += pvmfw
+endif
+
 # Enable chained vbmeta for boot images
 BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048