Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch: undef USE_SERIALDRIVER if CONFIG_CONSOLE_SYSLOG

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/common/up_internal.h
+3
View File
@@ -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
arch/avr/src/at32uc3/at32uc3_config.h
+4 -1
View File
@@ -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
arch/avr/src/at90usb/at90usb_config.h
+4 -1
View File
@@ -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
arch/avr/src/atmega/atmega_config.h
+4 -1
View File
@@ -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
arch/hc/src/common/up_internal.h
+7 -2
View File
@@ -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
arch/mips/src/common/up_internal.h
+7 -2
View File
@@ -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
arch/misoc/src/lm32/lm32.h
+7 -2
View File
@@ -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
/**************************************************************************** /****************************************************************************
arch/misoc/src/minerva/minerva.h
+7 -2
View File
@@ -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
/**************************************************************************** /****************************************************************************
arch/or1k/src/common/up_internal.h
+7 -2
View File
@@ -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
arch/renesas/src/common/up_internal.h
+7 -2
View File
@@ -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
arch/risc-v/src/common/up_internal.h
+7 -2
View File
@@ -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
/**************************************************************************** /****************************************************************************
arch/x86/src/common/up_internal.h
+7 -2
View File
@@ -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
arch/xtensa/src/common/xtensa.h
+7 -2
View File
@@ -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
arch/z16/src/common/up_internal.h
+7 -2
View File
@@ -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