diff options
| author | Mayank Grover <groverm@codeaurora.org> | 2020-01-02 13:47:53 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2022-12-20 23:39:29 +0530 |
| commit | 5a9b0bc7cca48d3163643853c4440df37e28f0c5 (patch) | |
| tree | 92368966bc5709c4de5f4786d1f81afa417c4491 | |
| parent | cbb2791c22611bd1c59f7b0f4880f521f48b50b6 (diff) | |
QcomModulePkg: append force_normal_boot with dp and recovery as boot enabled
For devices where dyanamic partition(DP) is not enabled and system as root
and recovery as boot both flags are enabled, force_normal_boot=1 flag is
not required to boot into normal mode or recovery mode.
For normal bootup system is mounted at / in RO mode hence mkdir and
switch root to /first_stage_ramdisk will fail if force_normal_boot is
passed in commandline.
Change-Id: I79e9ebc18d0b020a3e7280098889a8e1ddf6fc56
| -rw-r--r-- | QcomModulePkg/Library/BootLib/UpdateCmdLine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/QcomModulePkg/Library/BootLib/UpdateCmdLine.c b/QcomModulePkg/Library/BootLib/UpdateCmdLine.c index 5311960154..5d0e2ffdb1 100644 --- a/QcomModulePkg/Library/BootLib/UpdateCmdLine.c +++ b/QcomModulePkg/Library/BootLib/UpdateCmdLine.c @@ -3,7 +3,7 @@ * Copyright (c) 2009, Google Inc. * All rights reserved. * - * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2009-2020, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -509,6 +509,7 @@ UpdateCmdLineParams (UpdateCmdLineParamList *Param, } if (IsBuildUseRecoveryAsBoot () && + IsDynamicPartitionSupport () && !Param->Recovery) { Src = AndroidBootForceNormalBoot; AsciiStrCatS (Dst, MaxCmdLineLen, Src); @@ -692,6 +693,7 @@ UpdateCmdLine (CONST CHAR8 *CmdLine, } if (IsBuildUseRecoveryAsBoot () && + IsDynamicPartitionSupport () && !Recovery) { CmdLineLen += AsciiStrLen (AndroidBootForceNormalBoot); } |