avb: Support loading of recovery image
In fastbootd mode the device needs to boot in
recovery mode. To support the same VB2.0 need
to load and validate recovery in case if super
partition is supported and device is booting in
recovery mode.
Change-Id: I4cd8b848c94ab9adf2537fe22285a42d0a5f0d29
diff --git a/platform/msm_shared/avb/VerifiedBoot.c b/platform/msm_shared/avb/VerifiedBoot.c
index 19ebe4d..642747d 100644
--- a/platform/msm_shared/avb/VerifiedBoot.c
+++ b/platform/msm_shared/avb/VerifiedBoot.c
@@ -430,7 +430,8 @@
SlotSuffix = "\0";
}
- if(!Info->multi_slot_boot && Info->bootinto_recovery) {
+ if((!Info->multi_slot_boot || target_dynamic_partition_supported())
+ && Info->bootinto_recovery) {
AddRequestedPartition(RequestedPartitionAll, IMG_RECOVERY);
NumRequestedPartition += 1;
/* Add dtbo validation if target supports dtbo image generation and
@@ -538,7 +539,7 @@
Info->vb_data = (VOID *)VBData;
ImageHdrSize = get_page_size();
- GUARD_OUT(getimage(&image_buffer, &imgsize,(!Info->multi_slot_boot && Info->bootinto_recovery) ? "recovery" : "boot") );
+ GUARD_OUT(getimage(&image_buffer, &imgsize,((!Info->multi_slot_boot || target_dynamic_partition_supported()) && Info->bootinto_recovery) ? "recovery" : "boot") );
Status = check_img_header(image_buffer, ImageHdrSize, &imgsizeActual);
if (Status != EFI_SUCCESS) {