From 83302fb8f7ba3fa5dcd421bba93d0b37cdcb2f60 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Mon, 17 Oct 2016 20:12:38 -0600
Subject: [PATCH] config: Drop CONFIG_CONSOLE
This is not really a config. Rename it to avoid confusion.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
---
include/configs/MPC8349ITX.h | 6 +++---
scripts/config_whitelist.txt | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index c2f79a3b25..9e061bc626 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -356,7 +356,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
-#define CONFIG_CONSOLE ttyS0
+#define CONSOLE ttyS0
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500)
@@ -738,10 +738,10 @@ boards, we say we have two, but don't display a message if we find only one. */
__stringify(CONFIG_GATEWAYIP) ":" \
__stringify(CONFIG_NETMASK) ":" \
CONFIG_HOSTNAME ":" CONFIG_NETDEV ":off" \
- " console=" __stringify(CONFIG_CONSOLE) "," __stringify(CONFIG_BAUDRATE)
+ " console=" __stringify(CONSOLE) "," __stringify(CONFIG_BAUDRATE)
#define CONFIG_EXTRA_ENV_SETTINGS \
- "console=" __stringify(CONFIG_CONSOLE) "\0" \
+ "console=" __stringify(CONSOLE) "\0" \
"netdev=" CONFIG_NETDEV "\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \
"tftpflash=tftpboot $loadaddr $uboot; " \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fc933bbda6..9075e07e88 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -673,7 +673,6 @@ CONFIG_COMMON_ENV_SETTINGS
CONFIG_COMMON_ENV_UBI
CONFIG_COMPACT_FLASH
CONFIG_COMPAT
-CONFIG_CONSOLE
CONFIG_CONSOLE_DEV
CONFIG_CONSOLE_EXTRA_INFO
CONFIG_CONSOLE_INFO_QUIET
--
2.39.5