| 1 | Index: u-boot-2010.06/include/configs/nanonote.h |
| 2 | =================================================================== |
| 3 | --- u-boot-2010.06.orig/include/configs/nanonote.h 2011-08-29 12:59:47.520570290 +0200 |
| 4 | +++ u-boot-2010.06/include/configs/nanonote.h 2011-08-29 13:55:48.958207218 +0200 |
| 5 | @@ -99,6 +99,8 @@ |
| 6 | #define CONFIG_SYS_MEMTEST_START 0x80100000 |
| 7 | #define CONFIG_SYS_MEMTEST_END 0x80800000 |
| 8 | |
| 9 | +#define CONFIG_SILENT_CONSOLE 1 /* Enable silent console */ |
| 10 | + |
| 11 | /* |
| 12 | * Environment |
| 13 | */ |
| 14 | Index: u-boot-2010.06/common/console.c |
| 15 | =================================================================== |
| 16 | --- u-boot-2010.06.orig/common/console.c 2011-08-29 13:18:53.987163122 +0200 |
| 17 | +++ u-boot-2010.06/common/console.c 2011-08-29 14:15:26.303638381 +0200 |
| 18 | @@ -628,6 +628,14 @@ |
| 19 | |
| 20 | gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ |
| 21 | |
| 22 | +#ifdef CONFIG_SILENT_CONSOLE |
| 23 | + /* Check one more time the contents of the silent environment |
| 24 | + * variable, because if the environment is loaded from NAND it was |
| 25 | + * not available when console_init_f() was called */ |
| 26 | + if (getenv("silent") != NULL) |
| 27 | + gd->flags |= GD_FLG_SILENT; |
| 28 | +#endif |
| 29 | + |
| 30 | stdio_print_current_devices(); |
| 31 | |
| 32 | #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE |
| 33 | @@ -703,6 +711,14 @@ |
| 34 | |
| 35 | gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ |
| 36 | |
| 37 | +#ifdef CONFIG_SILENT_CONSOLE |
| 38 | + /* Check one more time the contents of the silent environment |
| 39 | + * variable, because if the environment is loaded from NAND it was |
| 40 | + * not available when console_init_f() was called */ |
| 41 | + if (getenv("silent") != NULL) |
| 42 | + gd->flags |= GD_FLG_SILENT; |
| 43 | +#endif |
| 44 | + |
| 45 | stdio_print_current_devices(); |
| 46 | |
| 47 | /* Setting environment variables */ |
| 48 | |
