From: Piotr Dymacz <pepe2k@gmail.com>
Date: Sun, 14 Aug 2016 11:06:01 +0000 (+0200)
Subject: Enable silent console feature support by default
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=92d0863e4fac3ab22e08be4aeb9525cb878e20f2;p=oweals%2Fu-boot_mod.git

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 17b2b6c..248e8cc 100644
--- 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 d8cfae2..e2b2d7e 100644
--- 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 f0d3eb3..10f30ed 100644
--- 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 3e97be8..cb76b82 100644
--- 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 0966e24..8f7d910 100644
--- 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 c813882..dd2837c 100644
--- 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 */