bootm: Add tests for fixup_silent_linux()

This function currently has no tests. Export it so that we can implement
a simple test on sandbox. Use IS_ENABLED() to remove the unused code,
instead #ifdef.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index 3aa99e08fce86c6c429d069fcbfd08cb66cbe69d..accd4df5b0c3de784c4a510b887a7007ad1fe224 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -146,6 +146,7 @@ config SANDBOX
        imply ACPI_PMC_SANDBOX
        imply CMD_PMC
        imply CMD_CLONE
+       imply SILENT_CONSOLE
 
 config SH
        bool "SuperH architecture"

diff --git a/common/bootm.c b/common/bootm.c
index 167eea4a1e9ff54ce00f86eee89777348792bc6e..0d36c572101a293bca40fe3a85ec022411887d25 100644 (file)
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -465,18 +465,21 @@ ulong bootm_disable_interrupts(void)
        return iflag;
 }
 
-#if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
-
 #define CONSOLE_ARG     "console="
 #define CONSOLE_ARG_LEN (sizeof(CONSOLE_ARG) - 1)
 
-static void fixup_silent_linux(void)
+void fixup_silent_linux(void)
 {
        char *buf;
        const char *env_val;
-       char *cmdline = env_get("bootargs");
+       char *cmdline;
        int want_silent;
 
+       if (!IS_ENABLED(CONFIG_SILENT_CONSOLE) &&
+           !IS_ENABLED(CONFIG_SILENT_U_BOOT_ONLY))
+               return;
+       cmdline = env_get("bootargs");
+
        /*
         * Only fix cmdline when requested. The environment variable can be:
         *
@@ -523,7 +526,6 @@ static void fixup_silent_linux(void)
        debug("after silent fix-up: %s\n", env_val);
        free(buf);
 }
-#endif /* CONFIG_SILENT_CONSOLE */
 
 /**
  * Execute selected states of the bootm command.
@@ -627,10 +629,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)) {
-#if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY)
                if (images->os.os == IH_OS_LINUX)
                        fixup_silent_linux();
-#endif
                ret = boot_fn(BOOTM_STATE_OS_PREP, argc, argv, images);
        }
 

diff --git a/include/bootm.h b/include/bootm.h
index a812a6bf24fc46e3baa151ed13b07044acf105c4..6d675e645596415a28255e0d8a7df25d3c001e3b 100644 (file)
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -85,4 +85,7 @@ void arch_preboot_os(void);
  */
 void board_preboot_os(void);
 
+/* Adjust the 'bootargs' to ensure that Linux boots silently, if required */
+void fixup_silent_linux(void);
+
 #endif

diff --git a/include/test/suites.h b/include/test/suites.h
index 5c97846e7f5ef69ad2936f7e30718594e764c788..52e8fc8155ab9ac2c822e812dda8840045819037 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -26,6 +26,7 @@ int cmd_ut_category(const char *name, const char *prefix,
                    struct unit_test *tests, int n_ents,
                    int argc, char *const argv[]);
 
+int do_ut_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc,
                   char *const argv[]);
 int do_ut_compression(struct cmd_tbl *cmdtp, int flag, int argc,

diff --git a/test/Makefile b/test/Makefile
index 8296734eb3cdf739637768aeee401ec751130e6d..d4323f99634fa182381eac8266a5f260565fb451 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,6 +5,7 @@
 ifneq ($(CONFIG_SANDBOX),)
 obj-$(CONFIG_$(SPL_)CMDLINE) += bloblist.o
 endif
+obj-$(CONFIG_$(SPL_)CMDLINE) += bootm.o
 obj-$(CONFIG_$(SPL_)CMDLINE) += cmd/
 obj-$(CONFIG_$(SPL_)CMDLINE) += cmd_ut.o
 obj-$(CONFIG_$(SPL_)CMDLINE) += command_ut.o

diff --git a/test/bootm.c b/test/bootm.c
new file mode 100644 (file)
index 0000000..59d16cb
--- /dev/null
+++ b/test/bootm.c
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Tests for bootm routines
+ *
+ * Copyright 2020 Google LLC
+ */
+
+#include <common.h>
+#include <bootm.h>
+#include <test/suites.h>
+#include <test/test.h>
+#include <test/ut.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define BOOTM_TEST(_name, _flags)      UNIT_TEST(_name, _flags, bootm_test)
+
+#define CONSOLE_STR    "console=/dev/ttyS0"
+
+/* Test silent processing in the bootargs variable */
+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);
+       fixup_silent_linux();
+       ut_asserteq_str(CONSOLE_STR, env_get("bootargs"));
+
+       env_set("bootargs", NULL);
+       fixup_silent_linux();
+       ut_assertnull(env_get("bootargs"));
+
+       ut_assertok(env_set("silent_linux", "no"));
+       env_set("bootargs", CONSOLE_STR);
+       fixup_silent_linux();
+       ut_asserteq_str(CONSOLE_STR, env_get("bootargs"));
+
+       ut_assertok(env_set("silent_linux", "yes"));
+       env_set("bootargs", CONSOLE_STR);
+       fixup_silent_linux();
+       ut_asserteq_str("console=", env_get("bootargs"));
+
+       /* Empty buffer should still add the string */
+       env_set("bootargs", NULL);
+       fixup_silent_linux();
+       ut_asserteq_str("console=", env_get("bootargs"));
+
+       return 0;
+}
+BOOTM_TEST(bootm_test_silent_var, 0);
+
+int do_ut_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+{
+       struct unit_test *tests = ll_entry_start(struct unit_test, bootm_test);
+       const int n_ents = ll_entry_count(struct unit_test, bootm_test);
+
+       return cmd_ut_category("bootm", "bootm_test_", tests, n_ents,
+                              argc, argv);
+}

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index f79109e6f8e54a3e87fbbeb03241c01525c902ef..fad1c899a4e77d4b8d3fa6e8088db0039103b647 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -88,6 +88,7 @@ static struct cmd_tbl cmd_ut_sub[] = {
                         "", ""),
        U_BOOT_CMD_MKENT(bloblist, CONFIG_SYS_MAXARGS, 1, do_ut_bloblist,
                         "", ""),
+       U_BOOT_CMD_MKENT(bootm, CONFIG_SYS_MAXARGS, 1, do_ut_bootm, "", ""),
        U_BOOT_CMD_MKENT(str, CONFIG_SYS_MAXARGS, 1, do_ut_str,
                         "", ""),
 #endif