spl: Add a separate silence option for SPL

Add an option to allow silent console to be controlled separately in SPL,
so that boot progress can be shown. Disable it by default for sandbox
since it is useful to see what is going on there.

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

diff --git a/common/Kconfig b/common/Kconfig
index 62e7fb5d0e95a7c1da1f7018feb27647049cec7f..05c5e1cadb86b0454e309c8fe165a70f5dda8b6f 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -113,6 +113,28 @@ config SILENT_CONSOLE
          GD_FLG_SILENT flag is set. Changing the environment variable later
          will update the flag.
 
+config SPL_SILENT_CONSOLE
+       bool "Use a silent console in SPL"
+       default y if SILENT_CONSOLE && !SANDBOX
+       help
+         This selects a silent console in SPL. When enabled it drops some
+         output messages. The GD_FLG_SILENT flag is not used in SPL so there
+         is no run-time control of console messages in SPL.
+
+         Future work may allow the SPL console to be silenced completely using
+         this option.
+
+config TPL_SILENT_CONSOLE
+       bool "Use a silent console in TPL"
+       default y if SILENT_CONSOLE && !SANDBOX
+       help
+         This selects a silent console in TPL. When enabled it drops some
+         output messages. The GD_FLG_SILENT flag is not used in TPL so there
+         is no run-time control of console messages in TPL.
+
+         Future work may allow the TPL console to be silenced completely using
+         this option.
+
 config SILENT_U_BOOT_ONLY
        bool "Only silence the U-Boot console"
        depends on SILENT_CONSOLE

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 91b4adc4004217f7029fc39a54bd26d676a1b439..4635e77e979a633cc3870d0819224281d21fe926 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -703,7 +703,7 @@ static int boot_from_devices(struct spl_image_info *spl_image,
                if (CONFIG_IS_ENABLED(SHOW_ERRORS))
                        ret = -ENXIO;
                loader = spl_ll_find_loader(bootdev);
-               if (!IS_ENABLED(CONFIG_SILENT_CONSOLE)) {
+               if (!CONFIG_IS_ENABLED(SILENT_CONSOLE)) {
                        if (loader)
                                printf("Trying to boot from %s\n",
                                       spl_loader_name(loader));