From be823d71bdf70f3636fce8cf7a3e205f9f5baca2 Mon Sep 17 00:00:00 2001 From: Andrew Scull Date: Fri, 15 Jan 2021 14:37:15 +0000 Subject: [PATCH] fastboot: Add pvmfw The pvmfw partition holds the protected VM firmware that is used by Protected KVM to bootstrap the trust in protected VMs. Teach fastboot about the partition so it gets flashed with flashall. pvmfw is an AVB chained partition so is marked as BootCritical to allow ABL's AVB verification to pass. Test: tab complete and flashall Bug: 171280178 Change-Id: Ie4cc478de25a945bc510488d87c2bee3aa5031f2 --- fastboot/fastboot.bash | 2 +- fastboot/fastboot.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fastboot/fastboot.bash b/fastboot/fastboot.bash index 406e8b8d7..f5a3384cf 100644 --- a/fastboot/fastboot.bash +++ b/fastboot/fastboot.bash @@ -109,7 +109,7 @@ _fastboot_cmd_flash() { cur="${COMP_WORDS[COMP_CWORD]}" if [[ $i -eq $COMP_CWORD ]]; then - partitions="boot bootloader dtbo modem odm odm_dlkm oem product radio recovery system vbmeta vendor vendor_dlkm" + partitions="boot bootloader dtbo modem odm odm_dlkm oem product pvmfw radio recovery system vbmeta vendor vendor_dlkm" COMPREPLY=( $(compgen -W "$partitions" -- $cur) ) else _fastboot_util_complete_local_file "${cur}" '!*.img' diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 62f6ac749..f7edf8e61 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -147,6 +147,7 @@ static Image images[] = { { "odm", "odm.img", "odm.sig", "odm", true, ImageType::Normal }, { "odm_dlkm", "odm_dlkm.img", "odm_dlkm.sig", "odm_dlkm", true, ImageType::Normal }, { "product", "product.img", "product.sig", "product", true, ImageType::Normal }, + { "pvmfw", "pvmfw.img", "pvmfw.sig", "pvmfw", true, ImageType::BootCritical }, { "recovery", "recovery.img", "recovery.sig", "recovery", true, ImageType::BootCritical }, { "super", "super.img", "super.sig", "super", true, ImageType::Extra }, { "system", "system.img", "system.sig", "system", false, ImageType::Normal },