Enable silent console feature support by default

As we already support writable environment on most of the
devices, it makes sense to include support for silent console
by default.

It's up to the user to enable it, using "silent" environment
variable, ex. "setenv silent 1; saveenv".

diff --git a/Makefile b/Makefile
index 17b2b6c99074e53ac3d92730c35f59ec05063c85..248e8cc51e5d6a8f9406c60765aa33bc83038758 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,6 @@ export MAKECMD=make --silent --no-print-directory ARCH=mips
 # boot delay (time to autostart boot command)
 export CONFIG_BOOTDELAY=1
 
-# uncomment following line, to disable output in U-Boot console
-#export DISABLE_CONSOLE_OUTPUT=1
-
 # uncomment following line, to build RAM version images (without low level initialization)
 #export CONFIG_SKIP_LOWLEVEL_INIT=1
 
@@ -280,15 +277,7 @@ wallys_dr531:
        @make --no-print-directory show_size
 
 ifdef CONFIG_SKIP_LOWLEVEL_INIT
-  ifdef DISABLE_CONSOLE_OUTPUT
-show_size:     export UBOOT_FILE_NAME_SUFFIX=__SILENT-CONSOLE__RAM
-  else
 show_size:     export UBOOT_FILE_NAME_SUFFIX=__RAM
-  endif
-else
-  ifdef DISABLE_CONSOLE_OUTPUT
-show_size:     export UBOOT_FILE_NAME_SUFFIX=__SILENT-CONSOLE
-  endif
 endif
 show_size:
 ifdef COMPRESSED_UBOOT

diff --git a/u-boot/Makefile b/u-boot/Makefile
index d8cfae25a7165e793ed2dfadb2699157e35de8b8..e2b2d7e04686ddd8606089b040be7f8415bcff4a 100644 (file)
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -324,15 +324,12 @@ ifdef CONFIG_MAX_UBOOT_SIZE_KB
        @echo "#define CONFIG_MAX_UBOOT_SIZE_KB "$(CONFIG_MAX_UBOOT_SIZE_KB) >> include/config.h
 endif
 
-ifdef DISABLE_CONSOLE_OUTPUT
-       @echo "#define CONFIG_SILENT_CONSOLE                1" >> include/config.h
-endif
-
 ifdef CONFIG_SKIP_LOWLEVEL_INIT
        @echo "#define CONFIG_SKIP_LOWLEVEL_INIT            1" >> include/config.h
        @echo "#undef COMPRESSED_UBOOT"                        >> include/config.h
 endif
 
+       @echo "#define CONFIG_SILENT_CONSOLE                1" >> include/config.h
        @echo "#define CONFIG_DELAY_TO_AUTORUN_HTTPD        3" >> include/config.h
        @echo "#define CONFIG_DELAY_TO_AUTORUN_CONSOLE      5" >> include/config.h
        @echo "#define CONFIG_DELAY_TO_AUTORUN_NETCONSOLE   7" >> include/config.h

diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h
index f0d3eb307017907e0731fb3e14872d91f9c256bc..10f30ed1a0beeebc5d95076bb8d5b6c31bfb14ce 100644 (file)
--- a/u-boot/include/configs/ap121.h
+++ b/u-boot/include/configs/ap121.h
@@ -559,8 +559,7 @@
                                                                                        "echo OK!; " \
                                                                                "else " \
                                                                                        "echo ERROR! Server not reachable!; " \
-                                                                               "fi\0" \
-                                                                       SILENT_ENV_VARIABLE
+                                                                               "fi\0"
 
 #define CFG_ATHRS26_PHY                                1
 #define CFG_AG7240_NMACS                       2

diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h
index 3e97be87a39b2eae1f103137a5feaad8ad88254b..cb76b82d9985fd3ae7842fb5769e86cf61993527 100644 (file)
--- a/u-boot/include/configs/ap143.h
+++ b/u-boot/include/configs/ap143.h
@@ -77,12 +77,6 @@
 #define CFG_MEMTEST_END                (CFG_SDRAM_BASE + bd->bi_memsize - 0x200001)    /* RAM test end   = CFG_SDRAM_BASE + RAM size - 2 MB - 1 Byte */
 #define CFG_RX_ETH_BUFFER   16
 
-#if defined(CONFIG_SILENT_CONSOLE)
-       #define SILENT_ENV_VARIABLE     "silent=1\0"
-#else
-       #define SILENT_ENV_VARIABLE     ""
-#endif
-
 #define CFG_DCACHE_SIZE                32768
 #define CFG_ICACHE_SIZE                65536
 #define CFG_CACHELINE_SIZE     32
@@ -312,9 +306,7 @@
                                                                                        "fi; " \
                                                                                "else " \
                                                                                        "echo ERROR! Server not reachable!; " \
-                                                                               "fi\0" \
-                                                                       SILENT_ENV_VARIABLE
-
+                                                                               "fi\0"
 /*
  * Cache lock for stack
  */

diff --git a/u-boot/include/configs/ar7240.h b/u-boot/include/configs/ar7240.h
index 0966e245a10ede0b760ef8be0f87c34868c9c75b..8f7d91018a4a033acb3eca28137d3c2bbf7ebb06 100644 (file)
--- a/u-boot/include/configs/ar7240.h
+++ b/u-boot/include/configs/ar7240.h
@@ -38,12 +38,6 @@
 #define CFG_MEMTEST_END                (CFG_SDRAM_BASE + bd->bi_memsize - 0x200001)    /* RAM test end   = CFG_SDRAM_BASE + RAM size - 2 MB - 1 Byte */
 #define CFG_RX_ETH_BUFFER   16
 
-#if defined(CONFIG_SILENT_CONSOLE)
-       #define SILENT_ENV_VARIABLE     "silent=1\0"
-#else
-       #define SILENT_ENV_VARIABLE     ""
-#endif
-
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */

diff --git a/u-boot/include/configs/db12x.h b/u-boot/include/configs/db12x.h
index c813882e360e9f245cffd047c0369f0fa60671b1..dd2837c7e1421a79a94adde01b8d97d0755b152a 100644 (file)
--- a/u-boot/include/configs/db12x.h
+++ b/u-boot/include/configs/db12x.h
@@ -269,8 +269,7 @@
                                                                                        "echo OK!; " \
                                                                                "else " \
                                                                                        "echo ERROR! Server not reachable!; " \
-                                                                               "fi\0" \
-                                                                       SILENT_ENV_VARIABLE
+                                                                               "fi\0"
 
 #define CFG_MII0_RMII                          1
 #define CFG_BOOTM_LEN                          (16 << 20) /* 16 MB */