Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-03 01:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

autoboot: move CONFIG_SILENT_CONSOLE handling

Browse source 
Factor out the same code from the callees to the caller.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Masahiro Yamada 2016-06-27 16:23:03 +09:00 committed by Tom Rini
parent d8da8298ad
commit 09b9d9e55f
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/autoboot.c
View file

@ -202,11 +202,6 @@ static int __abortboot(int bootdelay)
if (!abort) if (!abort)
debug_bootkeys("key timeout\n"); debug_bootkeys("key timeout\n");
#ifdef CONFIG_SILENT_CONSOLE
if (abort)
gd->flags &= ~GD_FLG_SILENT;
#endif
return abort; return abort;
} }
@ -263,18 +258,22 @@ static int __abortboot(int bootdelay)
putc('\n'); putc('\n');
#ifdef CONFIG_SILENT_CONSOLE
if (abort)
gd->flags &= ~GD_FLG_SILENT;
#endif
return abort; return abort;
} }
# endif /* CONFIG_AUTOBOOT_KEYED */ # endif /* CONFIG_AUTOBOOT_KEYED */
static int abortboot(int bootdelay) static int abortboot(int bootdelay)
{ {
return __abortboot(bootdelay); int abort;
abort = __abortboot(bootdelay);
#ifdef CONFIG_SILENT_CONSOLE
if (abort)
gd->flags &= ~GD_FLG_SILENT;
#endif
return abort;
} }
static void process_fdt_options(const void *blob) static void process_fdt_options(const void *blob)