[PATCH v2 06/45] spl: Refactor controls for console output

[Simon Glass]

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 at chromium.org>
Suggested-by: Tom Rini <trini at konsulko.com>
---

(no changes since v1)

 common/spl/spl.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 10475cd3d11..91b4adc4004 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));
-- 
2.38.0.rc1.362.ged0d419d3c-goog