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>
This commit is contained in:
Simon Glass 2016-10-17 20:12:38 -06:00 committed by Tom Rini
parent ef26d6039a
commit 83302fb8f7
2 changed files with 3 additions and 4 deletions

View file

@ -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 \ #define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
#define CONFIG_CONSOLE ttyS0 #define CONSOLE ttyS0
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) #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_GATEWAYIP) ":" \
__stringify(CONFIG_NETMASK) ":" \ __stringify(CONFIG_NETMASK) ":" \
CONFIG_HOSTNAME ":" CONFIG_NETDEV ":off" \ CONFIG_HOSTNAME ":" CONFIG_NETDEV ":off" \
" console=" __stringify(CONFIG_CONSOLE) "," __stringify(CONFIG_BAUDRATE) " console=" __stringify(CONSOLE) "," __stringify(CONFIG_BAUDRATE)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=" __stringify(CONFIG_CONSOLE) "\0" \ "console=" __stringify(CONSOLE) "\0" \
"netdev=" CONFIG_NETDEV "\0" \ "netdev=" CONFIG_NETDEV "\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \
"tftpflash=tftpboot $loadaddr $uboot; " \ "tftpflash=tftpboot $loadaddr $uboot; " \

View file

@ -673,7 +673,6 @@ CONFIG_COMMON_ENV_SETTINGS
CONFIG_COMMON_ENV_UBI CONFIG_COMMON_ENV_UBI
CONFIG_COMPACT_FLASH CONFIG_COMPACT_FLASH
CONFIG_COMPAT CONFIG_COMPAT
CONFIG_CONSOLE
CONFIG_CONSOLE_DEV CONFIG_CONSOLE_DEV
CONFIG_CONSOLE_EXTRA_INFO CONFIG_CONSOLE_EXTRA_INFO
CONFIG_CONSOLE_INFO_QUIET CONFIG_CONSOLE_INFO_QUIET