diff options
| author | Jeevan Shriram <jshriram@codeaurora.org> | 2020-07-27 07:00:03 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2022-05-30 14:46:00 +0530 |
| commit | 6d8fc8fbc6eaa5a99ce52b53503ab5954110e1c8 (patch) | |
| tree | e1bb492b9ec7738d0837ba81ed0a730e47e5c818 | |
| parent | cc4dab50af32ff87e3421949207f0e2df6040768 (diff) | |
BootLib: Add command line support for Non A/B
(cherry picked from commit 5c75a02c545e2c2d6e177a6c94a69b474598841a)
https://source.codeaurora.org/quic/la/abl/tianocore/edk2/tree/?h=LA.VENDOR.1.0.r1-11900-WAIPIO.0
Add command line support for non-A/B to boot into normal mode when
recovery image is available i.e., Boot image is not used as recovery
image.
Change-Id: Idd2dc94bb58b6119bda97af00084199b2d76952e
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rwxr-xr-x | QcomModulePkg/Library/BootLib/UpdateCmdLine.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/QcomModulePkg/Library/BootLib/UpdateCmdLine.c b/QcomModulePkg/Library/BootLib/UpdateCmdLine.c index 7ab97700e0..c8521124bb 100755 --- a/QcomModulePkg/Library/BootLib/UpdateCmdLine.c +++ b/QcomModulePkg/Library/BootLib/UpdateCmdLine.c @@ -541,9 +541,11 @@ UpdateCmdLineParams (UpdateCmdLineParamList *Param, AsciiStrCatS (Dst, MaxCmdLineLen, Src); } - if (IsBuildUseRecoveryAsBoot () && + if ((IsBuildUseRecoveryAsBoot () && IsDynamicPartitionSupport () && - !Param->Recovery) { + !Param->Recovery) || + (!Param->MultiSlotBoot && + !IsBuildUseRecoveryAsBoot ())) { Src = AndroidBootForceNormalBoot; AsciiStrCatS (Dst, MaxCmdLineLen, Src); } @@ -734,9 +736,11 @@ UpdateCmdLine (CONST CHAR8 *CmdLine, } } - if (IsBuildUseRecoveryAsBoot () && + if ((IsBuildUseRecoveryAsBoot () && IsDynamicPartitionSupport () && - !Recovery) { + !Recovery) || + (!MultiSlotBoot && + !IsBuildUseRecoveryAsBoot ())) { CmdLineLen += AsciiStrLen (AndroidBootForceNormalBoot); } |