From: Simon Glass <sjg@chromium.org>
Date: Sun, 21 Jul 2019 02:51:18 +0000 (-0600)
Subject: autoboot: Use if() for CONFIG_SILENT_CONSOLE
X-Git-Tag: v2019.10-rc2~21^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=42b4d14e34322cba4f4c855fff43688a89c0fbeb;p=oweals%2Fu-boot.git

autoboot: Use if() for CONFIG_SILENT_CONSOLE

Avoid an #ifdef in this function, to improve readability.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/autoboot.c b/common/autoboot.c
index f832808b71..45df665676 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -286,10 +286,8 @@ static int abortboot(int bootdelay)
 	if (bootdelay >= 0)
 		abort = __abortboot(bootdelay);
 
-#ifdef CONFIG_SILENT_CONSOLE
-	if (abort)
+	if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && abort)
 		gd->flags &= ~GD_FLG_SILENT;
-#endif
 
 	return abort;
 }