diff -purN u-boot/common/console.c u-boot.silent/common/console.c --- u-boot/common/console.c 2003-10-16 01:53:50.000000000 +0200 +++ u-boot.silent/common/console.c 2003-12-15 10:37:49.000000000 +0100 @@ -191,6 +191,11 @@ void putc (const char c) { DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_SILENT_CONSOLE + if (gd->flags & GD_FLG_SILENT) + return(0); +#endif + if (gd->flags & GD_FLG_DEVINIT) { /* Send to the standard output */ fputc (stdout, c); @@ -204,6 +209,11 @@ void puts (const char *s) { DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_SILENT_CONSOLE + if (gd->flags & GD_FLG_SILENT) + return; +#endif + if (gd->flags & GD_FLG_DEVINIT) { /* Send to the standard output */ fputs (stdout, s); diff -purN u-boot/doc/README.silent u-boot.silent/doc/README.silent --- u-boot/doc/README.silent 2003-10-10 12:05:42.000000000 +0200 +++ u-boot.silent/doc/README.silent 2003-12-15 10:54:52.000000000 +0100 @@ -9,8 +9,6 @@ The following actions are taken if "sile - Until the console devices have been initialized, output has to be suppressed by testing for the flag "GD_FLG_SILENT" in "gd->flags". - Currently only the messages for the TRAB board are handled in this - way. - When the console devices have been initialized, "stdout" and "stderr" are set to "nulldev", so subsequent messages are diff -purN u-boot/lib_arm/board.c u-boot.silent/lib_arm/board.c --- u-boot/lib_arm/board.c 2003-12-07 01:46:27.000000000 +0100 +++ u-boot.silent/lib_arm/board.c 2003-12-15 10:39:02.000000000 +0100 @@ -115,13 +115,6 @@ static int init_baudrate (void) static int display_banner (void) { -#ifdef CONFIG_SILENT_CONSOLE - DECLARE_GLOBAL_DATA_PTR; - - if (gd->flags & GD_FLG_SILENT) - return (0); -#endif - printf ("\n\n%s\n\n", version_string); printf ("U-Boot code: %08lX -> %08lX BSS: -> %08lX\n", _armboot_start, _armboot_end_data, _armboot_end); @@ -148,11 +141,6 @@ static int display_dram_config (void) DECLARE_GLOBAL_DATA_PTR; int i; -#ifdef CONFIG_SILENT_CONSOLE - if (gd->flags & GD_FLG_SILENT) - return (0); -#endif - puts ("RAM Configuration:\n"); for(i=0; iflags & GD_FLG_SILENT) - return; -#endif puts ("Flash: "); print_size (size, "\n"); }