arch: undef USE_SERIALDRIVER if CONFIG_CONSOLE_SYSLOG

An error was introduced from:

  commit f982ee43db
  Author: Xiang Xiao <xiaoxiang@xiaomi.com>
  Date:   Tue Feb 18 09:55:04 2020 +0800

    drivers/serial: Remove the lowconsole driver

    Replace with the syslog console driver which has more capability than lowconsole
This commit is contained in:
liuhaitao 2020-02-22 23:01:12 +08:00 committed by Gregory Nutt
parent 4bf2a1ee91
commit 8ca4ca5ae8
14 changed files with 85 additions and 23 deletions

View File

@ -64,6 +64,9 @@
# if defined(CONFIG_ARM_LWL_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# elif defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1

View File

@ -153,7 +153,10 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# if defined(HAVE_RS232_DEVICE)
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# elif defined(HAVE_RS232_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else

View File

@ -72,7 +72,10 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# if defined(HAVE_USART_DEVICE)
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# elif defined(HAVE_USART_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else

View File

@ -78,7 +78,10 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# if defined(HAVE_USART_DEVICE)
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# elif defined(HAVE_USART_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else

View File

@ -61,8 +61,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/* If some other device is used as the console, then the serial driver may

View File

@ -58,8 +58,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/* If some other device is used as the console, then the serial driver may

View File

@ -78,8 +78,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/****************************************************************************

View File

@ -78,8 +78,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/****************************************************************************

View File

@ -61,8 +61,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/* If some other device is used as the console, then the serial driver may

View File

@ -66,8 +66,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/* If some other device is used as the console, then the serial driver may

View File

@ -86,8 +86,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/****************************************************************************

View File

@ -60,8 +60,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/* If some other device is used as the console, then the serial driver may

View File

@ -61,8 +61,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/* If some other device is used as the console, then the serial driver may

View File

@ -67,8 +67,13 @@
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
#else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# endif
#endif
/* If some other device is used as the console, then the serial driver may