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>

diff --git a/common/bootm.c b/common/bootm.c
index 950ff7c..54f6412 100644 (file)
--- 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 438829a..35c27ab 100644 (file)
--- 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 ab17116..b69bfad 100644 (file)
--- 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;