commit af98614f098e92a07c803830cdfcc3476c2dd0cb
author Linux Build Service Account <lnxbuild@localhost> Fri May 31 04:24:58 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 31 04:24:58 2019 -0700
tree f0ddddddaf6e0ad381ad76c72066026c5327952a
parent 848e539d00bd3a34736c2d43297f5edfad8d80c9
parent ed04a2cf39068e075539a075ee1261240993b1e2

Merge "avb: Support loading of recovery image"

platform/msm_shared/avb/VerifiedBoot.c

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) {