diff options
| author | Simon Glass <sjg@chromium.org> | 2020-11-05 10:33:41 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-04 16:09:26 -0500 |
| commit | d9477a0a4d4c4561941007a8b3db588385aaad07 (patch) | |
| tree | 7d1b7455747038d1728c152cf9c689bc74d7ea8f /common/bootm.c | |
| parent | 4dcb81545ab09b6cb4ee1f3c870fb3131984cf6f (diff) | |
bootm: Add a bool parameter to bootm_process_cmdline_env()
This function will soon do more than just handle the 'silent linux'
feature. As a first step, update it to take a boolean parameter,
indicating whether or not the processing is required.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/bootm.c')
| -rw-r--r-- | common/bootm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/common/bootm.c b/common/bootm.c index 54f64128f8..9b0c81d653 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -468,15 +468,17 @@ ulong bootm_disable_interrupts(void) #define CONSOLE_ARG "console=" #define CONSOLE_ARG_LEN (sizeof(CONSOLE_ARG) - 1) -int bootm_process_cmdline_env(void) +int bootm_process_cmdline_env(bool do_silent) { char *buf; const char *env_val; char *cmdline; int want_silent; - if (!IS_ENABLED(CONFIG_SILENT_CONSOLE) && - !IS_ENABLED(CONFIG_SILENT_U_BOOT_ONLY)) + /* First check if any action is needed */ + do_silent = IS_ENABLED(CONFIG_SILENT_CONSOLE) && + !IS_ENABLED(CONFIG_SILENT_U_BOOT_ONLY) && do_silent; + if (!do_silent) return 0; cmdline = env_get("bootargs"); @@ -631,13 +633,11 @@ 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)) { - if (images->os.os == IH_OS_LINUX) { - ret = bootm_process_cmdline_env(); - if (ret) { - printf("Cmdline setup failed (err=%d)\n", ret); - ret = CMD_RET_FAILURE; - goto err; - } + ret = bootm_process_cmdline_env(images->os.os == IH_OS_LINUX); + if (ret) { + printf("Cmdline setup failed (err=%d)\n", ret); + ret = CMD_RET_FAILURE; + goto err; } ret = boot_fn(BOOTM_STATE_OS_PREP, argc, argv, images); } |