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:
parent
4bf2a1ee91
commit
8ca4ca5ae8
@ -64,6 +64,9 @@
|
|||||||
# if defined(CONFIG_ARM_LWL_CONSOLE)
|
# if defined(CONFIG_ARM_LWL_CONSOLE)
|
||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# elif defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
# else
|
# else
|
||||||
# define USE_SERIALDRIVER 1
|
# define USE_SERIALDRIVER 1
|
||||||
# define USE_EARLYSERIALINIT 1
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
@ -153,7 +153,10 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#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_SERIALDRIVER 1
|
||||||
# define USE_EARLYSERIALINIT 1
|
# define USE_EARLYSERIALINIT 1
|
||||||
# else
|
# else
|
||||||
|
@ -72,7 +72,10 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#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_SERIALDRIVER 1
|
||||||
# define USE_EARLYSERIALINIT 1
|
# define USE_EARLYSERIALINIT 1
|
||||||
# else
|
# else
|
||||||
|
@ -78,7 +78,10 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#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_SERIALDRIVER 1
|
||||||
# define USE_EARLYSERIALINIT 1
|
# define USE_EARLYSERIALINIT 1
|
||||||
# else
|
# else
|
||||||
|
@ -61,8 +61,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If some other device is used as the console, then the serial driver may
|
/* If some other device is used as the console, then the serial driver may
|
||||||
|
@ -58,8 +58,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If some other device is used as the console, then the serial driver may
|
/* If some other device is used as the console, then the serial driver may
|
||||||
|
@ -78,8 +78,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
@ -78,8 +78,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
@ -61,8 +61,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If some other device is used as the console, then the serial driver may
|
/* If some other device is used as the console, then the serial driver may
|
||||||
|
@ -66,8 +66,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If some other device is used as the console, then the serial driver may
|
/* If some other device is used as the console, then the serial driver may
|
||||||
|
@ -86,8 +86,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
@ -60,8 +60,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If some other device is used as the console, then the serial driver may
|
/* If some other device is used as the console, then the serial driver may
|
||||||
|
@ -61,8 +61,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If some other device is used as the console, then the serial driver may
|
/* If some other device is used as the console, then the serial driver may
|
||||||
|
@ -67,8 +67,13 @@
|
|||||||
# undef USE_SERIALDRIVER
|
# undef USE_SERIALDRIVER
|
||||||
# undef USE_EARLYSERIALINIT
|
# undef USE_EARLYSERIALINIT
|
||||||
#else
|
#else
|
||||||
# define USE_SERIALDRIVER 1
|
# if defined(CONFIG_CONSOLE_SYSLOG)
|
||||||
# define USE_EARLYSERIALINIT 1
|
# undef USE_SERIALDRIVER
|
||||||
|
# undef USE_EARLYSERIALINIT
|
||||||
|
# else
|
||||||
|
# define USE_SERIALDRIVER 1
|
||||||
|
# define USE_EARLYSERIALINIT 1
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If some other device is used as the console, then the serial driver may
|
/* If some other device is used as the console, then the serial driver may
|
||||||
|
Loading…
Reference in New Issue
Block a user