| 1 | From 5eb4d4c598f2806bd1b3d1140e917bfead7851ad Mon Sep 17 00:00:00 2001 |
| 2 | From: Xiangfu <xiangfu@openmobilefree.net> |
| 3 | Date: Wed, 10 Oct 2012 23:51:26 +0800 |
| 4 | Subject: [PATCH 6/6] enable silent console |
| 5 | |
| 6 | --- |
| 7 | common/console.c | 16 ++++++++++++++++ |
| 8 | include/configs/qi_lb60.h | 2 ++ |
| 9 | 2 files changed, 18 insertions(+) |
| 10 | |
| 11 | diff --git a/common/console.c b/common/console.c |
| 12 | index 1177f7d..e8a2078 100644 |
| 13 | --- a/common/console.c |
| 14 | +++ b/common/console.c |
| 15 | @@ -685,6 +685,14 @@ done: |
| 16 | |
| 17 | gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ |
| 18 | |
| 19 | +#ifdef CONFIG_SILENT_CONSOLE |
| 20 | + /* Check one more time the contents of the silent environment |
| 21 | + * variable, because if the environment is loaded from NAND it was |
| 22 | + * not available when console_init_f() was called */ |
| 23 | + if (getenv("silent") != NULL) |
| 24 | + gd->flags |= GD_FLG_SILENT; |
| 25 | +#endif |
| 26 | + |
| 27 | stdio_print_current_devices(); |
| 28 | |
| 29 | #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE |
| 30 | @@ -760,6 +768,14 @@ int console_init_r(void) |
| 31 | |
| 32 | gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ |
| 33 | |
| 34 | +#ifdef CONFIG_SILENT_CONSOLE |
| 35 | + /* Check one more time the contents of the silent environment |
| 36 | + * variable, because if the environment is loaded from NAND it was |
| 37 | + * not available when console_init_f() was called */ |
| 38 | + if (getenv("silent") != NULL) |
| 39 | + gd->flags |= GD_FLG_SILENT; |
| 40 | +#endif |
| 41 | + |
| 42 | stdio_print_current_devices(); |
| 43 | |
| 44 | /* Setting environment variables */ |
| 45 | diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h |
| 46 | index d3e78ad..a3534ff 100644 |
| 47 | --- a/include/configs/qi_lb60.h |
| 48 | +++ b/include/configs/qi_lb60.h |
| 49 | @@ -102,6 +102,8 @@ |
| 50 | #define CONFIG_SYS_NO_FLASH |
| 51 | #define CONFIG_SYS_FLASH_BASE 0 /* init flash_base as 0 */ |
| 52 | |
| 53 | +#define CONFIG_SILENT_CONSOLE 1 /* Enable silent console */ |
| 54 | + |
| 55 | /* |
| 56 | * Command line configuration |
| 57 | */ |
| 58 | -- |
| 59 | 1.7.9.5 |
| 60 | |
| 61 | |
