summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-07-20 20:51:18 -0600
committerTom Rini <trini@konsulko.com>2019-08-02 11:19:14 -0400
commit42b4d14e34322cba4f4c855fff43688a89c0fbeb (patch)
tree86385dfba64035d4e5f52ce797de4f4750760fc1
parent88fa4beb631c5329bf616554f7d2714ece7a5f0b (diff)
downloadu-boot-42b4d14e34322cba4f4c855fff43688a89c0fbeb.tar.gz
u-boot-42b4d14e34322cba4f4c855fff43688a89c0fbeb.tar.bz2
u-boot-42b4d14e34322cba4f4c855fff43688a89c0fbeb.zip
autoboot: Use if() for CONFIG_SILENT_CONSOLE
Avoid an #ifdef in this function, to improve readability. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/autoboot.c4
1 files changed, 1 insertions, 3 deletions
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;
}