[U-Boot] [PATCH 1/2] config: Add CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE

Doug Anderson
2012-01-10T19:16:57Z

I have set this config option based on the existing usage of
CONFIG_SILENT_CONSOLE. This is to support a future change
deprecating the silencing of the linux console in bootm by
having bootm modify the linux command-line arguments.

Signed-off-by: Doug Anderson <dianders@chromium.org>
---
include/configs/KUP4K.h | 3 +++
include/configs/KUP4X.h | 3 +++
include/configs/QS823.h | 1 +
include/configs/QS850.h | 1 +
include/configs/QS860T.h | 1 +
include/configs/TQM5200.h | 3 +++
include/configs/a4m072.h | 3 +++
include/configs/bfin_adi_common.h | 3 +++
include/configs/cm5200.h | 3 +++
include/configs/cpu9260.h | 3 +++
include/configs/cpuat91.h | 3 +++
include/configs/mcc200.h | 3 +++
include/configs/mimc200.h | 3 +++
include/configs/omap3_evm_quick_mmc.h | 3 +++
include/configs/omap3_evm_quick_nand.h | 3 +++
include/configs/pdm360ng.h | 3 +++
include/configs/sc3.h | 3 +++
17 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index c0035e6..7f55748 100644
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -502,6 +502,9 @@
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* enble null device */
#define CONFIG_VERSION_VARIABLE 1

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
/* pass open firmware flat tree */
#define CONFIG_OF_LIBFDT 1
#define CONFIG_OF_BOARD_SETUP 1
diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index 5084ccc..07233fa 100644
--- a/include/configs/KUP4X.h
+++ b/include/configs/KUP4X.h
@@ -452,6 +452,9 @@
#define CONFIG_AUTOBOOT_STOP_STR "." /* easy to stop for now */
#define CONFIG_SILENT_CONSOLE 1

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
#define CONFIG_USB_STORAGE 1
#define CONFIG_USB_SL811HS 1

diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index 36efbf2..84aea2a 100644
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -37,6 +37,7 @@
/* various debug settings */
#undef CONFIG_SYS_DEVICE_NULLDEV /* null device */
#undef CONFIG_SILENT_CONSOLE /* silent console */
+#undef CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* silent console ? */
#undef DEBUG_FLASH /* debug flash code */
#undef FLASH_DEBUG /* debug fash code */
diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index 5c6ed07..15e6adb 100644
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -37,6 +37,7 @@
/* various debug settings */
#undef CONFIG_SYS_DEVICE_NULLDEV /* null device */
#undef CONFIG_SILENT_CONSOLE /* silent console */
+#undef CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* silent console ? */
#undef DEBUG_FLASH /* debug flash code */
#undef FLASH_DEBUG /* debug fash code */
diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index b0bee82..99ac280 100644
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -37,6 +37,7 @@
/* various debug settings */
#undef CONFIG_SYS_DEVICE_NULLDEV /* null device */
#undef CONFIG_SILENT_CONSOLE /* silent console */
+#undef CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE
#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* silent console ? */
#undef DEBUG_FLASH /* debug flash code */
#undef FLASH_DEBUG /* debug fash code */
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 6ea3faa..9415f29 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -71,6 +71,9 @@
#define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* used to detect S1 switch position */
#define CONFIG_USB_BIN_FIXUP 1 /* for a buggy USB device */
+
+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
#if 0
#define FO300_SILENT_CONSOLE_WHEN_S1_CLOSED 1 /* silent console on PSC1 when S1 */
/* switch is closed */
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 1c13904..bbd34d4 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -55,6 +55,9 @@
#define CONFIG_SILENT_CONSOLE
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
/*
* PCI Mapping:
* 0x40000000 - 0x4fffffff - PCI Memory
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 3fbf5c6..fc874b2 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -108,6 +108,9 @@
#define CONFIG_LOADS_ECHO 1
#define CONFIG_JTAG_CONSOLE
#define CONFIG_SILENT_CONSOLE
+
+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
#ifndef CONFIG_BAUDRATE
# define CONFIG_BAUDRATE 57600
#endif
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 0abe090..0596795 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -63,6 +63,9 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#define CONFIG_SILENT_CONSOLE 1 /* needed to silence i2c_init() */

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
/*
* Ethernet configuration
*/
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index 8674a35..116b915 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -504,6 +504,9 @@
#define CONFIG_SILENT_CONSOLE
#define CONFIG_NETCONSOLE

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
/*
* Size of malloc() pool
*/
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 1b43c54..5b2e770 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -224,6 +224,9 @@
#define CONFIG_DEVICE_NULLDEV
#define CONFIG_SILENT_CONSOLE

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
#define CONFIG_AUTOBOOT_KEYED
#define CONFIG_AUTOBOOT_PROMPT \
"Press SPACE to abort autoboot\n"
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index b56b273..1c08358 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -425,4 +425,7 @@
#define CONFIG_AUTOBOOT_STOP_STR "432"
#define CONFIG_SILENT_CONSOLE 1

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
#endif /* __CONFIG_H */
diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index d8d8256..83f0635 100644
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -87,6 +87,9 @@
#define CONFIG_DISABLE_CONSOLE /* disable console */
#define CONFIG_SYS_DEVICE_NULLDEV /* include nulldev device */

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
#define CONFIG_LCD 1

/*
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index 912da7d..8202333 100644
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -45,6 +45,9 @@
#define CONFIG_SILENT_CONSOLE
#define CONFIG_ENV_IS_NOWHERE

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
/* ----------------------------------------------------------------------------
* Supported hardware
* ----------------------------------------------------------------------------
diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h
index 2f879c0..39096db 100644
--- a/include/configs/omap3_evm_quick_nand.h
+++ b/include/configs/omap3_evm_quick_nand.h
@@ -44,6 +44,9 @@
#define CONFIG_SILENT_CONSOLE
#define CONFIG_ENV_IS_NOWHERE

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
/* -----------------------------------------------------------------------------
* Include common board configuration
* -----------------------------------------------------------------------------
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index f0154e0..e704937 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -55,6 +55,9 @@
#define CONFIG_SYS_DEVICE_NULLDEV
#define CONFIG_SILENT_CONSOLE

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
/* Video */
#define CONFIG_VIDEO

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 2d6e51d..7857382 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -130,6 +130,9 @@
#define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */

+/* Added based on usage of CONFIG_SILENT_CONSOLE; please remove when possible */
+#define CONFIG_DEPRECATED_SILENT_LINUX_CONSOLE 1
+
#if 1 /* feel free to disable for development */
#define CONFIG_AUTOBOOT_KEYED /* Enable password protection */
#define CONFIG_AUTOBOOT_PROMPT \
--
1.7.3.1