gs101: 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: I03f10699859ec8079ef2e2e4177f6cfa7f83d6d6
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index fa3d102..9be8d92 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -133,6 +133,10 @@
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