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

Masahiro Yamada
2016-06-21T05:32:46Z

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(-)

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)
--
1.9.1