From: Simon Glass <sjg@chromium.org>
Date: Fri, 21 Oct 2022 00:22:42 +0000 (-0600)
Subject: spl: Refactor controls for console output
X-Git-Tag: v2025.01-rc5-pxa1908~1227^2~38
X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B%20.Permalink%20%7D%7D?a=commitdiff_plain;h=ec7e8dad26cc0e3c9f4d1576997c0bbbc7e968e6;p=u-boot.git

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 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));