[U-Boot] [PATCH 5/6] autoboot: move CONFIG_SILENT_CONSOLE handling

Heiko Schocher
2016-06-22T05:51:59Z

Hello Masahiro,

Am 21.06.2016 um 07:32 schrieb Masahiro Yamada:
> Factor out the same code from the callees to the caller.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> common/autoboot.c | 21 ++++++++++-----------
> 1 file changed, 10 insertions(+), 11 deletions(-)

Thanks!

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>
> diff --git a/common/autoboot.c b/common/autoboot.c
> index eb31c88..2d19104 100644
> --- a/common/autoboot.c
> +++ b/common/autoboot.c
> @@ -202,11 +202,6 @@ static int __abortboot(int bootdelay)
> if (!abort)
> debug_bootkeys("key timeout\n");
>
> -#ifdef CONFIG_SILENT_CONSOLE
> - if (abort)
> - gd->flags &= ~GD_FLG_SILENT;
> -#endif
> -
> return abort;
> }
>
> @@ -263,18 +258,22 @@ static int __abortboot(int bootdelay)
>
> putc('\n');
>
> -#ifdef CONFIG_SILENT_CONSOLE
> - if (abort)
> - gd->flags &= ~GD_FLG_SILENT;
> -#endif
> -
> return abort;
> }
> # endif /* CONFIG_AUTOBOOT_KEYED */
>
> static int abortboot(int bootdelay)
> {
> - return __abortboot(bootdelay);
> + int ret;
> +
> + ret = __abortboot(bootdelay);
> +
> +#ifdef CONFIG_SILENT_CONSOLE
> + if (abort)
> + gd->flags &= ~GD_FLG_SILENT;
> +#endif
> +
> + return ret;
> }
>
> static void process_fdt_options(const void *blob)
>

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany