summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-11-05 10:33:40 -0700
committerTom Rini <trini@konsulko.com>2020-12-04 16:09:26 -0500
commit4dcb81545ab09b6cb4ee1f3c870fb3131984cf6f (patch)
tree4388177afffd62d56b9d1c2a4a99313e7e216386
parent4ae42643d0d71dbb5af45d19fa05b7a6807150c0 (diff)
downloadu-boot-4dcb81545ab09b6cb4ee1f3c870fb3131984cf6f.tar.gz
bootm: Rename fixup_silent_linux()
We want to add more processing to this function. Before doing so, rename it to bootm_process_cmdline_env(), which is more generic. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/bootm.c4
-rw-r--r--include/bootm.h4
-rw-r--r--test/bootm.c10
3 files changed, 9 insertions, 9 deletions
diff --git a/common/bootm.c b/common/bootm.c
index 950ff7cff6..54f64128f8 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -468,7 +468,7 @@ ulong bootm_disable_interrupts(void)
#define CONSOLE_ARG "console="
#define CONSOLE_ARG_LEN (sizeof(CONSOLE_ARG) - 1)
-int fixup_silent_linux(void)
+int bootm_process_cmdline_env(void)
{
char *buf;
const char *env_val;
@@ -632,7 +632,7 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc,
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 = fixup_silent_linux();
+ ret = bootm_process_cmdline_env();
if (ret) {
printf("Cmdline setup failed (err=%d)\n", ret);
ret = CMD_RET_FAILURE;
diff --git a/include/bootm.h b/include/bootm.h
index 438829af0f..35c27ab960 100644
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -86,13 +86,13 @@ void arch_preboot_os(void);
void board_preboot_os(void);
/*
- * fixup_silent_linux() - Process fix-ups for the command line
+ * bootm_process_cmdline_env() - Process fix-ups for the command line
*
* Updates the 'bootargs' envvar as required. This handles making Linux boot
* silently if requested ('silent_linux' envvar)
*
* @return 0 if OK, -ENOMEM if out of memory
*/
-int fixup_silent_linux(void);
+int bootm_process_cmdline_env(void);
#endif
diff --git a/test/bootm.c b/test/bootm.c
index ab1711609b..b69bfad4f6 100644
--- a/test/bootm.c
+++ b/test/bootm.c
@@ -23,26 +23,26 @@ static int bootm_test_silent_var(struct unit_test_state *uts)
/* 'silent_linux' not set should do nothing */
env_set("silent_linux", NULL);
env_set("bootargs", CONSOLE_STR);
- ut_assertok(fixup_silent_linux());
+ ut_assertok(bootm_process_cmdline_env());
ut_asserteq_str(CONSOLE_STR, env_get("bootargs"));
env_set("bootargs", NULL);
- ut_assertok(fixup_silent_linux());
+ ut_assertok(bootm_process_cmdline_env());
ut_assertnull(env_get("bootargs"));
ut_assertok(env_set("silent_linux", "no"));
env_set("bootargs", CONSOLE_STR);
- ut_assertok(fixup_silent_linux());
+ ut_assertok(bootm_process_cmdline_env());
ut_asserteq_str(CONSOLE_STR, env_get("bootargs"));
ut_assertok(env_set("silent_linux", "yes"));
env_set("bootargs", CONSOLE_STR);
- ut_assertok(fixup_silent_linux());
+ ut_assertok(bootm_process_cmdline_env());
ut_asserteq_str("console=", env_get("bootargs"));
/* Empty buffer should still add the string */
env_set("bootargs", NULL);
- ut_assertok(fixup_silent_linux());
+ ut_assertok(bootm_process_cmdline_env());
ut_asserteq_str("console=", env_get("bootargs"));
return 0;