diff options
| author | Simon Glass <sjg@chromium.org> | 2020-11-05 10:33:44 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-04 16:09:26 -0500 |
| commit | b3c01678fdb15c63b231743481b9b77c7c4f8549 (patch) | |
| tree | fdd847df8fa0cc2a019dced609c214f68a21d015 /common | |
| parent | b6386f38410f669f706a748d7d292d24ea14fe29 (diff) | |
bootm: Update bootm_process_cmdline_env() to use flags
At present only one transformation is supported: making the Linux console
silent. To prepare for adding more, convert the boolean parameter into a
flag value.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common/bootm.c b/common/bootm.c index 4fa909f23b..912ed906ef 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -542,16 +542,17 @@ static int fixup_silent_linux(char *buf, int maxlen) return 0; } -int bootm_process_cmdline_env(bool do_silent) +int bootm_process_cmdline_env(int flags) { const int maxlen = MAX_CMDLINE_SIZE; + bool do_silent; const char *env; char *buf; int ret; /* First check if any action is needed */ do_silent = IS_ENABLED(CONFIG_SILENT_CONSOLE) && - !IS_ENABLED(CONFIG_SILENT_U_BOOT_ONLY) && do_silent; + !IS_ENABLED(CONFIG_SILENT_U_BOOT_ONLY) && (flags & BOOTM_CL_SILENT); if (!do_silent) return 0; @@ -685,7 +686,8 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc, if (!ret && (states & BOOTM_STATE_OS_BD_T)) ret = boot_fn(BOOTM_STATE_OS_BD_T, argc, argv, images); if (!ret && (states & BOOTM_STATE_OS_PREP)) { - ret = bootm_process_cmdline_env(images->os.os == IH_OS_LINUX); + ret = bootm_process_cmdline_env(images->os.os == IH_OS_LINUX ? + BOOTM_CL_SILENT : 0); if (ret) { printf("Cmdline setup failed (err=%d)\n", ret); ret = CMD_RET_FAILURE; |