commit 8bfc66a34aecdf249849632eb91142b727c91233
author Monika Singh <monising@codeaurora.org> Fri Mar 08 12:18:17 2019 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 19 00:36:09 2019 -0700
tree 0be2de269111d75532b08176891190d5a096c363
parent 7fed9dbd71f6ff9670d1680037737b59973e1fcd

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: I7abffa9fc8f8fd36a31b1619b7d9149ba68b01f8

QcomModulePkg/Library/avb/VerifiedBoot.c

diff --git a/QcomModulePkg/Library/avb/VerifiedBoot.c b/QcomModulePkg/Library/avb/VerifiedBoot.c
index 2504fee..fdc5cef 100644
--- a/QcomModulePkg/Library/avb/VerifiedBoot.c
+++ b/QcomModulePkg/Library/avb/VerifiedBoot.c
@@ -853,7 +853,8 @@
   }
   RequestedPartition = RequestedPartitionAll;
 
-  if ((!Info->MultiSlotBoot) &&
+  if ( ( (!Info->MultiSlotBoot) ||
+           IsDynamicPartitionSupport ()) &&
            Info->BootIntoRecovery) {
     AddRequestedPartition (RequestedPartitionAll, IMG_RECOVERY);
     NumRequestedPartition += 1;
@@ -994,7 +995,8 @@
   Info->VBData = (VOID *)VBData;
 
   GUARD_OUT (GetImage (Info, &ImageBuffer, &ImageSize,
-                    ((!Info->MultiSlotBoot) &&
+                    ( (!Info->MultiSlotBoot ||
+                     IsDynamicPartitionSupport ()) &&
                      Info->BootIntoRecovery) ?
                      "recovery" : "boot"));