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 ---
(no changes since v2)
Changes in v2: - Refactor based on a change to the earlier patch in spl.c
common/Kconfig | 22 ++++++++++++++++++++++ common/spl/spl.c | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/common/Kconfig b/common/Kconfig index 6608a4f0fc1..5926645b3c3 100644 --- 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 91b4adc4004..4635e77e979 100644 --- 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));