commit b905d6a7db1a9f3f981abf413a1832f7282c111d
author qctecmdr <qctecmdr@localhost> Sun May 03 16:13:02 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun May 03 16:13:02 2020 -0700
tree 9af0bbf56d256b6912c0bcb8d7f7fdedbc96ca36
parent c12421f3f4b2c421fa18401d370eebfc10d15ce0
parent 9e2a34e5ce5c291494ba1bb73d31a842e3c91007

Merge "avb: Read partition instead of label instead of GUID"

QcomModulePkg/Library/FastbootLib/FastbootCmds.c

diff --git a/QcomModulePkg/Library/FastbootLib/FastbootCmds.c b/QcomModulePkg/Library/FastbootLib/FastbootCmds.c
old mode 100644
new mode 100755
index e02cf35..b057b21
--- a/QcomModulePkg/Library/FastbootLib/FastbootCmds.c
+++ b/QcomModulePkg/Library/FastbootLib/FastbootCmds.c
@@ -1896,15 +1896,18 @@
 
       if (!EFI_ERROR (Status)) {
         FastbootOkay ("");
-        goto out;
       }
     }
 
-    FlashResult = HandleSparseImgFlash (PartitionName,
-                                      ARRAY_SIZE (PartitionName),
-                                      mFlashDataBuffer, mFlashNumDataBytes);
-    IsFlashComplete = TRUE;
-    StopUsbTimer ();
+    if (EFI_ERROR (Status) ||
+      !IsUseMThreadParallel () ||
+      (PartitionSize <= MaxDownLoadSize)) {
+      FlashResult = HandleSparseImgFlash (PartitionName,
+                                        ARRAY_SIZE (PartitionName),
+                                        mFlashDataBuffer, mFlashNumDataBytes);
+      IsFlashComplete = TRUE;
+      StopUsbTimer ();
+    }
   } else if (!AsciiStrnCmp (UbiHeader->HdrMagic, UBI_HEADER_MAGIC, 4)) {
     FlashResult = HandleUbiImgFlash (PartitionName,
                                      ARRAY_SIZE (PartitionName),