aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass2022-10-20 18:22:43 -0600
committerTom Rini2022-10-31 11:01:31 -0400
commit6e55b114aa0b8feff4e7a15a98842f9eaa87407d (patch)
treeed105ea91812ad268203c17b93a8784402484930 /common
parentec7e8dad26cc0e3c9f4d1576997c0bbbc7e968e6 (diff)
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>
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig22
-rw-r--r--common/spl/spl.c2
2 files changed, 23 insertions, 1 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 62e7fb5d0e9..05c5e1cadb8 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));