commit b5f47dc24cba3a14a28058af7debc0a4a211c1d3
author qctecmdr <qctecmdr@localhost> Sat Sep 19 09:09:13 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Sep 19 09:09:13 2020 -0700
tree b59a704ab66d1e4c04d6125133e5758d92c1ec44
parent 630325d644b64952217dd1d597c4605764151fab
parent dff63088350d4d5d8311622990f1f5840713d180

Merge "QcomModulePkg: Write qmmi to kernel cmd line when read "ffbm-02" from misc partiton"

QcomModulePkg/Library/BootLib/Recovery.c

diff --git a/QcomModulePkg/Library/BootLib/Recovery.c b/QcomModulePkg/Library/BootLib/Recovery.c
index 59d3026..110ab67 100755
--- a/QcomModulePkg/Library/BootLib/Recovery.c
+++ b/QcomModulePkg/Library/BootLib/Recovery.c
@@ -363,6 +363,7 @@
 {
   CONST CHAR8 *FfbmCmd = "ffbm-";
   CONST CHAR8 *QmmiCmd = "qmmi";
+  CONST CHAR8 *Ffbm02Cmd = "ffbm-02";
   CHAR8 *FfbmData = NULL;
   EFI_STATUS Status;
   EFI_GUID Ptype = gEfiMiscPartitionGuid;
@@ -383,10 +384,13 @@
   }
 
   FfbmData[Sz - 1] = '\0';
-  if (!AsciiStrnCmp (FfbmData, FfbmCmd, AsciiStrLen (FfbmCmd))) {
+  if (!AsciiStrnCmp (FfbmData, QmmiCmd, AsciiStrLen (QmmiCmd))||
+    !AsciiStrnCmp (FfbmData, Ffbm02Cmd, AsciiStrLen (Ffbm02Cmd))) {
+    /* if ffbm-02 or qmmi string is in misc partition,
+       then write qmmi to kernel cmd line*/
+    AsciiStrnCpy (FfbmString, QmmiCmd, AsciiStrLen (QmmiCmd));
+  } else if (!AsciiStrnCmp (FfbmData, FfbmCmd, AsciiStrLen (FfbmCmd))) {
     AsciiStrnCpy (FfbmString, FfbmData, Sz);
-  } else if (!AsciiStrnCmp (FfbmData, QmmiCmd, AsciiStrLen (QmmiCmd))) {
-    AsciiStrnCpy (FfbmString, FfbmData, AsciiStrLen (QmmiCmd));
   } else {
     Status = EFI_NOT_FOUND;
   }