commit 2ba5fd548973f9b1701cbd5a24ed86eb0727e964
author qctecmdr <qctecmdr@localhost> Mon Aug 17 01:14:47 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 17 01:14:47 2020 -0700
tree 36bc995f78c0d7d52ad0282d0a37aacee2496067
parent 6e86ac551d07b5b57a5fcc32dc80729d25a61bbe
parent 5c75a02c545e2c2d6e177a6c94a69b474598841a

Merge "BootLib: Add command line support for Non A/B"

QcomModulePkg/Library/BootLib/UpdateCmdLine.c

diff --git a/QcomModulePkg/Library/BootLib/UpdateCmdLine.c b/QcomModulePkg/Library/BootLib/UpdateCmdLine.c
index dfb65a5..4a3f888 100644
--- a/QcomModulePkg/Library/BootLib/UpdateCmdLine.c
+++ b/QcomModulePkg/Library/BootLib/UpdateCmdLine.c
@@ -508,9 +508,11 @@
     AsciiStrCatS (Dst, MaxCmdLineLen, Src);
   }
 
-  if (IsBuildUseRecoveryAsBoot () &&
+  if ((IsBuildUseRecoveryAsBoot () &&
       IsDynamicPartitionSupport () &&
-      !Param->Recovery) {
+      !Param->Recovery) ||
+      (!Param->MultiSlotBoot &&
+       !IsBuildUseRecoveryAsBoot ())) {
     Src = AndroidBootForceNormalBoot;
     AsciiStrCatS (Dst, MaxCmdLineLen, Src);
   }
@@ -687,9 +689,11 @@
     }
   }
 
-  if (IsBuildUseRecoveryAsBoot () &&
+  if ((IsBuildUseRecoveryAsBoot () &&
       IsDynamicPartitionSupport () &&
-      !Recovery) {
+      !Recovery) ||
+      (!MultiSlotBoot &&
+       !IsBuildUseRecoveryAsBoot ())) {
     CmdLineLen += AsciiStrLen (AndroidBootForceNormalBoot);
   }