summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-05 14:46:43 +0000
committerTom Rini <trini@ti.com>2012-12-11 13:18:12 -0700
commit78c112c9f9eb3cd06ea53e1c414cabc55560e9cd (patch)
tree12686d2c4fbbbcd6be3ebe3730450d64265a4a2c
parent9ad557be2fc45bb0207cb6cb5de5bf51c9daa689 (diff)
downloadu-boot-imx-78c112c9f9eb3cd06ea53e1c414cabc55560e9cd.zip
u-boot-imx-78c112c9f9eb3cd06ea53e1c414cabc55560e9cd.tar.gz
u-boot-imx-78c112c9f9eb3cd06ea53e1c414cabc55560e9cd.tar.bz2
console: Enable function to display console info
The CONFIG_SYS_CONSOLE_INFO_QUIET option should suppress the console information, but allow boards to display it later if required. Adjust the code to support this. This is used to avoid printing the information while the LCD display is not ready, since it only becomes ready when stdio init is complete. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/console.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/console.c b/common/console.c
index 1177f7d..25b141a 100644
--- a/common/console.c
+++ b/common/console.c
@@ -591,7 +591,6 @@ int console_init_f(void)
void stdio_print_current_devices(void)
{
-#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET
/* Print information */
puts("In: ");
if (stdio_devices[stdin] == NULL) {
@@ -613,7 +612,6 @@ void stdio_print_current_devices(void)
} else {
printf ("%s\n", stdio_devices[stderr]->name);
}
-#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
}
#ifdef CONFIG_SYS_CONSOLE_IS_IN_ENV
@@ -685,7 +683,9 @@ done:
gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */
+#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET
stdio_print_current_devices();
+#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/* set the environment variables (will overwrite previous env settings) */
@@ -760,7 +760,9 @@ int console_init_r(void)
gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */
+#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET
stdio_print_current_devices();
+#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
/* Setting environment variables */
for (i = 0; i < 3; i++) {