summaryrefslogtreecommitdiff
path: root/common/spl/spl.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2022-10-21 03:22:42 +0300
committerTom Rini <trini@konsulko.com>2022-10-31 18:01:31 +0300
commitec7e8dad26cc0e3c9f4d1576997c0bbbc7e968e6 (patch)
treec96b31a531fd3da72a96b51b66cee3199b8de62e /common/spl/spl.c
parent2b8d2ccdc91318a47963069373e5244d5abea3c7 (diff)
downloadu-boot-ec7e8dad26cc0e3c9f4d1576997c0bbbc7e968e6.tar.xz
spl: Refactor controls for console output
The expression in boot_from_devices() is fairly long and appears to be an artefact from before we could easily call printf(...) and have the call be nop'd out. So update it to just check CONFIG_SILENT_CONSOLE. Signed-off-by: Simon Glass <sjg@chromium.org> Suggested-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/spl/spl.c')
-rw-r--r--common/spl/spl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 10475cd3d1..91b4adc400 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -703,9 +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 (CONFIG_IS_ENABLED(SERIAL) &&
- CONFIG_IS_ENABLED(LIBCOMMON_SUPPORT) &&
- !IS_ENABLED(CONFIG_SILENT_CONSOLE)) {
+ if (!IS_ENABLED(CONFIG_SILENT_CONSOLE)) {
if (loader)
printf("Trying to boot from %s\n",
spl_loader_name(loader));