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>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 10475cd3d1195e945f63fa85094815dcf8e7f12f..91b4adc4004217f7029fc39a54bd26d676a1b439 100644 (file)
--- 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));