You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/02/23 15:08:38 UTC
[incubator-nuttx] branch pr360 updated (4bf2a1e -> 6bed84a)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch pr360
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 4bf2a1e tools/zds/zdsar.c: Correct memory corruption bug
new 7a25081 arch: undef USE_SERIALDRIVER if CONFIG_CONSOLE_SYSLOG
new 179d9a9 drivers/syslog: Rename SYSLOG_NONE to SYSLOG_DEFAULT
new 44a7f18 arch: use ifdef USE_EARLYSERIALINIT to include up_earlyserialinit
new 6bed84a arch: refine up_serialinit/up_earlyserialinit/rpmsg_serialinit
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/a1x/a1x_serial.c | 5 ++++-
arch/arm/src/am335x/am335x_serial.c | 5 ++++-
arch/arm/src/c5471/c5471_serial.c | 3 +++
arch/arm/src/common/up_internal.h | 9 +++------
arch/arm/src/dm320/dm320_serial.c | 5 ++++-
arch/arm/src/efm32/efm32_leserial.c | 3 +++
arch/arm/src/imx1/imx_serial.c | 5 ++++-
arch/arm/src/kl/kl_serial.c | 3 +++
arch/arm/src/lc823450/lc823450_serial.c | 5 ++++-
arch/arm/src/lpc214x/lpc214x_serial.c | 5 ++++-
arch/arm/src/lpc2378/lpc23xx_serial.c | 5 ++++-
arch/arm/src/lpc31xx/lpc31_serial.c | 3 +++
arch/arm/src/nuc1xx/nuc_serial.c | 5 ++++-
arch/arm/src/samd2l2/sam_serial.c | 3 +++
arch/arm/src/samd5e5/sam_serial.c | 3 +++
arch/arm/src/str71x/str71x_serial.c | 5 ++++-
arch/avr/src/at32uc3/at32uc3_config.h | 5 ++++-
arch/avr/src/at32uc3/at32uc3_serial.c | 3 +++
arch/avr/src/at90usb/at90usb_config.h | 5 ++++-
arch/avr/src/at90usb/at90usb_serial.c | 3 +++
arch/avr/src/atmega/atmega_config.h | 5 ++++-
arch/avr/src/atmega/atmega_serial.c | 3 +++
arch/avr/src/common/up_internal.h | 7 +++++--
arch/hc/src/common/up_internal.h | 16 ++++++++++++----
arch/mips/src/common/up_internal.h | 17 +++++++++++++++--
arch/mips/src/pic32mx/pic32mx-serial.c | 3 +++
arch/mips/src/pic32mz/pic32mz-serial.c | 3 +++
arch/misoc/src/lm32/lm32.h | 9 +++++++--
arch/misoc/src/minerva/minerva.h | 9 +++++++--
arch/or1k/src/common/up_internal.h | 15 +++++++--------
arch/renesas/src/common/up_internal.h | 16 ++++++++++++----
arch/risc-v/src/common/up_internal.h | 15 +++++++--------
arch/risc-v/src/fe310/fe310_serial.c | 3 +++
arch/risc-v/src/gap8/gap8_uart.c | 3 +++
arch/risc-v/src/k210/k210_serial.c | 3 +++
arch/risc-v/src/nr5m100/nr5_serial.c | 3 +++
arch/sim/src/sim/up_internal.h | 2 --
arch/x86/src/common/up_internal.h | 16 ++++++++++++----
arch/xtensa/src/common/xtensa.h | 9 +++++++--
arch/z16/src/common/up_internal.h | 16 +++++++++++-----
arch/z16/src/z16f/z16f_serial.c | 3 +++
drivers/syslog/Kconfig | 10 +++++-----
42 files changed, 206 insertions(+), 68 deletions(-)
[incubator-nuttx] 02/04: drivers/syslog: Rename SYSLOG_NONE to
SYSLOG_DEFAULT
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr360
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 179d9a9f0df5fd8a1bfa39ad157cf7380e7e05cd
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Feb 23 00:15:59 2020 +0800
drivers/syslog: Rename SYSLOG_NONE to SYSLOG_DEFAULT
since syslog still output if ARCH_LOWPUTC == y and
select the default syslog device by ARCH_LOWPUTC
Change-Id: I184e52d1e63c84d6b6c9d07c7d777187f8852be5
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/syslog/Kconfig | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig
index 0e18d32..87e4fe2 100644
--- a/drivers/syslog/Kconfig
+++ b/drivers/syslog/Kconfig
@@ -128,8 +128,8 @@ config SYSLOG_PREFIX_STRING
choice
prompt "System log device"
- default SYSLOG_CONSOLE if DEV_CONSOLE
- default SYSLOG_NONE if !DEV_CONSOLE
+ default SYSLOG_CONSOLE if !ARCH_LOWPUTC
+ default SYSLOG_DEFAULT if ARCH_LOWPUTC
depends on !ARCH_SYSLOG
config SYSLOG_CHAR
@@ -164,11 +164,11 @@ config SYSLOG_RPMSG
---help---
Use the rpmsg as a SYSLOG output device, send message to remote proc.
-config SYSLOG_NONE
- bool "No SYSLOG device"
+config SYSLOG_DEFAULT
+ bool "Default SYSLOG device"
---help---
syslog() interfaces will be present, but all output will go to the
- bit-bucket.
+ up_putc(ARCH_LOWPUTC == y) or bit-bucket(ARCH_LOWPUTC == n).
endchoice
[incubator-nuttx] 04/04: arch: refine
up_serialinit/up_earlyserialinit/rpmsg_serialinit
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr360
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6bed84a609bf61a33c3f5db9b928f70942a8cad7
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Sun Feb 23 18:12:07 2020 +0800
arch: refine up_serialinit/up_earlyserialinit/rpmsg_serialinit
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
arch/arm/src/common/up_internal.h | 6 ------
arch/avr/src/common/up_internal.h | 7 +++++--
arch/hc/src/common/up_internal.h | 7 +++++--
arch/mips/src/common/up_internal.h | 8 ++++++++
arch/or1k/src/common/up_internal.h | 6 ------
arch/renesas/src/common/up_internal.h | 7 +++++--
arch/risc-v/src/common/up_internal.h | 6 ------
arch/sim/src/sim/up_internal.h | 2 --
arch/x86/src/common/up_internal.h | 7 +++++--
arch/z16/src/common/up_internal.h | 7 ++++---
10 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index 90cc2bf..1c8bbf4 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -430,20 +430,14 @@ void up_lowputs(const char *str);
#ifdef USE_SERIALDRIVER
void up_serialinit(void);
-#else
-# define up_serialinit()
#endif
#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
-#else
-# define up_earlyserialinit()
#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
#ifdef CONFIG_ARM_LWL_CONSOLE
diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h
index ae16ec2..ae89d54 100644
--- a/arch/avr/src/common/up_internal.h
+++ b/arch/avr/src/common/up_internal.h
@@ -150,13 +150,16 @@ void up_lowinit(void);
/* Defined in chip/xxx_serial.c */
+#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_serialinit(void);
+#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* Defined in chip/xxx_ethernet.c */
diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h
index d85ba34..0943947 100644
--- a/arch/hc/src/common/up_internal.h
+++ b/arch/hc/src/common/up_internal.h
@@ -152,13 +152,16 @@ void up_sigdeliver(void);
/* Debug output */
+#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_serialinit(void);
+#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
void up_lowputc(char ch);
diff --git a/arch/mips/src/common/up_internal.h b/arch/mips/src/common/up_internal.h
index 9a10068..11916eb 100644
--- a/arch/mips/src/common/up_internal.h
+++ b/arch/mips/src/common/up_internal.h
@@ -242,10 +242,18 @@ void up_addregion(void);
/* Serial output */
void up_lowputc(char ch);
+
+#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_serialinit(void);
+#endif
+#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
+#endif
/* Network */
diff --git a/arch/or1k/src/common/up_internal.h b/arch/or1k/src/common/up_internal.h
index 3a76708..099b630 100644
--- a/arch/or1k/src/common/up_internal.h
+++ b/arch/or1k/src/common/up_internal.h
@@ -285,20 +285,14 @@ void up_lowputs(const char *str);
#ifdef USE_SERIALDRIVER
void up_serialinit(void);
-#else
-# define up_serialinit()
#endif
#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
-#else
-# define up_earlyserialinit()
#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* DMA **********************************************************************/
diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h
index a83a4df..ca74ca4 100644
--- a/arch/renesas/src/common/up_internal.h
+++ b/arch/renesas/src/common/up_internal.h
@@ -158,13 +158,16 @@ void up_vectorfiq(void);
/* Defined in xyz_serial.c */
+#ifdef USE_EARLYSERIALINIT
void up_earlyconsoleinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_consoleinit(void);
+#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* Defined in xyz_watchdog.c */
diff --git a/arch/risc-v/src/common/up_internal.h b/arch/risc-v/src/common/up_internal.h
index 283ea28..b28264c 100644
--- a/arch/risc-v/src/common/up_internal.h
+++ b/arch/risc-v/src/common/up_internal.h
@@ -190,20 +190,14 @@ void up_lowputs(const char *str);
#ifdef USE_SERIALDRIVER
void up_serialinit(void);
-#else
-# define up_serialinit()
#endif
#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
-#else
-# define up_earlyserialinit()
#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* The OS start routine **************************************************/
diff --git a/arch/sim/src/sim/up_internal.h b/arch/sim/src/sim/up_internal.h
index e57538e..b2ff25b 100644
--- a/arch/sim/src/sim/up_internal.h
+++ b/arch/sim/src/sim/up_internal.h
@@ -251,8 +251,6 @@ void up_timer_update(void);
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* up_devconsole.c **********************************************************/
diff --git a/arch/x86/src/common/up_internal.h b/arch/x86/src/common/up_internal.h
index 11f6353..3f7026b 100644
--- a/arch/x86/src/common/up_internal.h
+++ b/arch/x86/src/common/up_internal.h
@@ -195,13 +195,16 @@ void up_addregion(void);
/* Defined in xyz_serial.c */
+#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_serialinit(void);
+#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* Defined in xyz_watchdog.c */
diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h
index 3de83e7..0927138 100644
--- a/arch/z16/src/common/up_internal.h
+++ b/arch/z16/src/common/up_internal.h
@@ -145,14 +145,15 @@ void up_addregion(void);
/* Defined in xyz_serial.c */
#ifdef USE_SERIALDRIVER
-void up_earlyserialinit(void);
void up_serialinit(void);
#endif
+#ifdef USE_EARLYSERIALINIT
+void up_earlyserialinit(void);
+#endif
+
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* Defined in xyz_irq.c */
[incubator-nuttx] 03/04: arch: use ifdef USE_EARLYSERIALINIT to
include up_earlyserialinit
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr360
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 44a7f1843981090449e3118b320e99b3736a3f29
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Sun Feb 23 14:48:24 2020 +0800
arch: use ifdef USE_EARLYSERIALINIT to include up_earlyserialinit
There are cases that USE_SERIALDRIVER is defined but USE_EARLYSERIALINIT not defined
in some configs. So use ifdef USE_EARLYSERIALINIT to include up_earlyserialinit anyway.
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
arch/arm/src/a1x/a1x_serial.c | 5 ++++-
arch/arm/src/am335x/am335x_serial.c | 5 ++++-
arch/arm/src/c5471/c5471_serial.c | 3 +++
arch/arm/src/dm320/dm320_serial.c | 5 ++++-
arch/arm/src/efm32/efm32_leserial.c | 3 +++
arch/arm/src/imx1/imx_serial.c | 5 ++++-
arch/arm/src/kl/kl_serial.c | 3 +++
arch/arm/src/lc823450/lc823450_serial.c | 5 ++++-
arch/arm/src/lpc214x/lpc214x_serial.c | 5 ++++-
arch/arm/src/lpc2378/lpc23xx_serial.c | 5 ++++-
arch/arm/src/lpc31xx/lpc31_serial.c | 3 +++
arch/arm/src/nuc1xx/nuc_serial.c | 5 ++++-
arch/arm/src/samd2l2/sam_serial.c | 3 +++
arch/arm/src/samd5e5/sam_serial.c | 3 +++
arch/arm/src/str71x/str71x_serial.c | 5 ++++-
arch/avr/src/at32uc3/at32uc3_serial.c | 3 +++
arch/avr/src/at90usb/at90usb_serial.c | 3 +++
arch/avr/src/atmega/atmega_serial.c | 3 +++
arch/mips/src/pic32mx/pic32mx-serial.c | 3 +++
arch/mips/src/pic32mz/pic32mz-serial.c | 3 +++
arch/risc-v/src/fe310/fe310_serial.c | 3 +++
arch/risc-v/src/gap8/gap8_uart.c | 3 +++
arch/risc-v/src/k210/k210_serial.c | 3 +++
arch/risc-v/src/nr5m100/nr5_serial.c | 3 +++
arch/z16/src/z16f/z16f_serial.c | 3 +++
25 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c
index 0bd511f..79101a7 100644
--- a/arch/arm/src/a1x/a1x_serial.c
+++ b/arch/arm/src/a1x/a1x_serial.c
@@ -1433,8 +1433,10 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Funtions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in debug so that the
@@ -1514,6 +1516,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/am335x/am335x_serial.c b/arch/arm/src/am335x/am335x_serial.c
index 2926fcf..4af56ac 100644
--- a/arch/arm/src/am335x/am335x_serial.c
+++ b/arch/arm/src/am335x/am335x_serial.c
@@ -1266,8 +1266,10 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in debug so that the
@@ -1333,6 +1335,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/c5471/c5471_serial.c b/arch/arm/src/c5471/c5471_serial.c
index 1b47bcd..f9fced9 100644
--- a/arch/arm/src/c5471/c5471_serial.c
+++ b/arch/arm/src/c5471/c5471_serial.c
@@ -792,6 +792,8 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Funtions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_serialinit
*
@@ -810,6 +812,7 @@ void up_earlyserialinit(void)
CONSOLE_DEV.isconsole = true;
up_setup(&CONSOLE_DEV);
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/dm320/dm320_serial.c b/arch/arm/src/dm320/dm320_serial.c
index f45fc7a..c0aef17 100644
--- a/arch/arm/src/dm320/dm320_serial.c
+++ b/arch/arm/src/dm320/dm320_serial.c
@@ -706,8 +706,10 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Funtions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in
@@ -724,6 +726,7 @@ void up_earlyserialinit(void)
CONSOLE_DEV.isconsole = true;
up_setup(&CONSOLE_DEV);
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index fcd8760..c8c41c8 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -748,6 +748,8 @@ static bool efm32_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -778,6 +780,7 @@ void up_earlyserialinit(void)
efm32_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/imx1/imx_serial.c b/arch/arm/src/imx1/imx_serial.c
index 23a8e26..98f04d8 100644
--- a/arch/arm/src/imx1/imx_serial.c
+++ b/arch/arm/src/imx1/imx_serial.c
@@ -1060,8 +1060,10 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Funtions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in
@@ -1127,6 +1129,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/kl/kl_serial.c b/arch/arm/src/kl/kl_serial.c
index 7072286..aa55567 100644
--- a/arch/arm/src/kl/kl_serial.c
+++ b/arch/arm/src/kl/kl_serial.c
@@ -794,6 +794,8 @@ static bool up_txready(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -836,6 +838,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c
index 781a9ff..950e4ae9 100644
--- a/arch/arm/src/lc823450/lc823450_serial.c
+++ b/arch/arm/src/lc823450/lc823450_serial.c
@@ -1250,8 +1250,10 @@ retry:
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in
@@ -1296,6 +1298,7 @@ void up_earlyserialinit(void)
CONSOLE_DEV.isconsole = true;
up_setup(&CONSOLE_DEV);
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index 26c7642..99fd435 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -731,8 +731,10 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Funtions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in
@@ -760,6 +762,7 @@ void up_earlyserialinit(void)
CONSOLE_DEV.isconsole = true;
up_setup(&CONSOLE_DEV);
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index e9fd113..8005b58 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -845,8 +845,10 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Funtions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in
@@ -881,6 +883,7 @@ void up_earlyserialinit(void)
CONSOLE_DEV.isconsole = true;
up_setup(&CONSOLE_DEV);
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index 3ca5ae0..e44898b 100644
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -750,6 +750,8 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -778,6 +780,7 @@ void up_earlyserialinit(void)
up_setup(&g_uartport);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c
index a56ab6e..3a7dd46 100644
--- a/arch/arm/src/nuc1xx/nuc_serial.c
+++ b/arch/arm/src/nuc1xx/nuc_serial.c
@@ -997,8 +997,10 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Funtions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in debug so that the
@@ -1019,6 +1021,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/samd2l2/sam_serial.c b/arch/arm/src/samd2l2/sam_serial.c
index 95f23c3..18a117e 100644
--- a/arch/arm/src/samd2l2/sam_serial.c
+++ b/arch/arm/src/samd2l2/sam_serial.c
@@ -955,6 +955,8 @@ static bool sam_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -996,6 +998,7 @@ void up_earlyserialinit(void)
CONSOLE_DEV.isconsole = true;
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/samd5e5/sam_serial.c b/arch/arm/src/samd5e5/sam_serial.c
index 880dfb5..71edda7 100644
--- a/arch/arm/src/samd5e5/sam_serial.c
+++ b/arch/arm/src/samd5e5/sam_serial.c
@@ -1004,6 +1004,8 @@ static bool sam_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -1051,6 +1053,7 @@ void up_earlyserialinit(void)
CONSOLE_DEV.isconsole = true;
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index d2d40b9..4576959 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -879,8 +879,10 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
- * Name: up_serialinit
+ * Name: up_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in
@@ -915,6 +917,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/avr/src/at32uc3/at32uc3_serial.c b/arch/avr/src/at32uc3/at32uc3_serial.c
index a4d02d6..e2202f1 100644
--- a/arch/avr/src/at32uc3/at32uc3_serial.c
+++ b/arch/avr/src/at32uc3/at32uc3_serial.c
@@ -695,6 +695,8 @@ static bool up_txready(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -726,6 +728,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/avr/src/at90usb/at90usb_serial.c b/arch/avr/src/at90usb/at90usb_serial.c
index fad319d..414c961 100644
--- a/arch/avr/src/at90usb/at90usb_serial.c
+++ b/arch/avr/src/at90usb/at90usb_serial.c
@@ -513,6 +513,8 @@ static bool usart1_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -536,6 +538,7 @@ void up_earlyserialinit(void)
usart1_setup(&g_usart1port);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/avr/src/atmega/atmega_serial.c b/arch/avr/src/atmega/atmega_serial.c
index b3bfa80..4e63286 100644
--- a/arch/avr/src/atmega/atmega_serial.c
+++ b/arch/avr/src/atmega/atmega_serial.c
@@ -887,6 +887,8 @@ static bool usart1_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -919,6 +921,7 @@ void up_earlyserialinit(void)
# endif
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c
index a4f47b2..4956789 100644
--- a/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -822,6 +822,8 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -852,6 +854,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c
index a2670c0..a6e96a7 100644
--- a/arch/mips/src/pic32mz/pic32mz-serial.c
+++ b/arch/mips/src/pic32mz/pic32mz-serial.c
@@ -1073,6 +1073,8 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -1118,6 +1120,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/risc-v/src/fe310/fe310_serial.c b/arch/risc-v/src/fe310/fe310_serial.c
index e836f35..e484c18 100644
--- a/arch/risc-v/src/fe310/fe310_serial.c
+++ b/arch/risc-v/src/fe310/fe310_serial.c
@@ -601,6 +601,8 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -631,6 +633,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/risc-v/src/gap8/gap8_uart.c b/arch/risc-v/src/gap8/gap8_uart.c
index 77482e6..669059d 100644
--- a/arch/risc-v/src/gap8/gap8_uart.c
+++ b/arch/risc-v/src/gap8/gap8_uart.c
@@ -588,6 +588,8 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -609,6 +611,7 @@ void up_earlyserialinit(void)
up_setup(&g_uart0port);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/risc-v/src/k210/k210_serial.c b/arch/risc-v/src/k210/k210_serial.c
index 0912539..471c410 100644
--- a/arch/risc-v/src/k210/k210_serial.c
+++ b/arch/risc-v/src/k210/k210_serial.c
@@ -601,6 +601,8 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -631,6 +633,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/risc-v/src/nr5m100/nr5_serial.c b/arch/risc-v/src/nr5m100/nr5_serial.c
index ad75be2..a33bcf0 100644
--- a/arch/risc-v/src/nr5m100/nr5_serial.c
+++ b/arch/risc-v/src/nr5m100/nr5_serial.c
@@ -727,6 +727,8 @@ static bool up_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -757,6 +759,7 @@ void up_earlyserialinit(void)
up_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index 46122e4..e078cd9 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -688,6 +688,8 @@ static bool z16f_txempty(struct uart_dev_s *dev)
* Public Functions
****************************************************************************/
+#ifdef USE_EARLYSERIALINIT
+
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -747,6 +749,7 @@ void up_earlyserialinit(void)
z16f_setup(&CONSOLE_DEV);
#endif
}
+#endif
/****************************************************************************
* Name: up_serialinit
[incubator-nuttx] 01/04: arch: undef USE_SERIALDRIVER if
CONFIG_CONSOLE_SYSLOG
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr360
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 7a25081ede76881cbd81cb7c57ca3ec4722b2adf
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Sat Feb 22 23:01:12 2020 +0800
arch: undef USE_SERIALDRIVER if CONFIG_CONSOLE_SYSLOG
the wrong is introduced from:
commit f982ee43db683b7e34b154f5bc8c60a58b956820
Author: Xiang Xiao <xi...@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
Change-Id: I27447a069285c26edb0192b2747dbf2180d2628e
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
arch/arm/src/common/up_internal.h | 3 +++
arch/avr/src/at32uc3/at32uc3_config.h | 5 ++++-
arch/avr/src/at90usb/at90usb_config.h | 5 ++++-
arch/avr/src/atmega/atmega_config.h | 5 ++++-
arch/hc/src/common/up_internal.h | 9 +++++++--
arch/mips/src/common/up_internal.h | 9 +++++++--
arch/misoc/src/lm32/lm32.h | 9 +++++++--
arch/misoc/src/minerva/minerva.h | 9 +++++++--
arch/or1k/src/common/up_internal.h | 9 +++++++--
arch/renesas/src/common/up_internal.h | 9 +++++++--
arch/risc-v/src/common/up_internal.h | 9 +++++++--
arch/x86/src/common/up_internal.h | 9 +++++++--
arch/xtensa/src/common/xtensa.h | 9 +++++++--
arch/z16/src/common/up_internal.h | 9 +++++++--
14 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index 71d08ab..90cc2bf 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -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
diff --git a/arch/avr/src/at32uc3/at32uc3_config.h b/arch/avr/src/at32uc3/at32uc3_config.h
index 2a5d1e0..845f9f5 100644
--- a/arch/avr/src/at32uc3/at32uc3_config.h
+++ b/arch/avr/src/at32uc3/at32uc3_config.h
@@ -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
diff --git a/arch/avr/src/at90usb/at90usb_config.h b/arch/avr/src/at90usb/at90usb_config.h
index 91b172e..1f0f184 100644
--- a/arch/avr/src/at90usb/at90usb_config.h
+++ b/arch/avr/src/at90usb/at90usb_config.h
@@ -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
diff --git a/arch/avr/src/atmega/atmega_config.h b/arch/avr/src/atmega/atmega_config.h
index f764b8a..ffe6a40 100644
--- a/arch/avr/src/atmega/atmega_config.h
+++ b/arch/avr/src/atmega/atmega_config.h
@@ -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
diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h
index 3f84559..d85ba34 100644
--- a/arch/hc/src/common/up_internal.h
+++ b/arch/hc/src/common/up_internal.h
@@ -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
diff --git a/arch/mips/src/common/up_internal.h b/arch/mips/src/common/up_internal.h
index 5de04e5..9a10068 100644
--- a/arch/mips/src/common/up_internal.h
+++ b/arch/mips/src/common/up_internal.h
@@ -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
diff --git a/arch/misoc/src/lm32/lm32.h b/arch/misoc/src/lm32/lm32.h
index fab887b..64c0722 100644
--- a/arch/misoc/src/lm32/lm32.h
+++ b/arch/misoc/src/lm32/lm32.h
@@ -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
/****************************************************************************
diff --git a/arch/misoc/src/minerva/minerva.h b/arch/misoc/src/minerva/minerva.h
index 6c73a7b..ff9bdb0 100644
--- a/arch/misoc/src/minerva/minerva.h
+++ b/arch/misoc/src/minerva/minerva.h
@@ -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
/****************************************************************************
diff --git a/arch/or1k/src/common/up_internal.h b/arch/or1k/src/common/up_internal.h
index ed5cfe0..3a76708 100644
--- a/arch/or1k/src/common/up_internal.h
+++ b/arch/or1k/src/common/up_internal.h
@@ -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
diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h
index 03f0067..a83a4df 100644
--- a/arch/renesas/src/common/up_internal.h
+++ b/arch/renesas/src/common/up_internal.h
@@ -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
diff --git a/arch/risc-v/src/common/up_internal.h b/arch/risc-v/src/common/up_internal.h
index 50a5b36..283ea28 100644
--- a/arch/risc-v/src/common/up_internal.h
+++ b/arch/risc-v/src/common/up_internal.h
@@ -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
/****************************************************************************
diff --git a/arch/x86/src/common/up_internal.h b/arch/x86/src/common/up_internal.h
index fcd06cc..11f6353 100644
--- a/arch/x86/src/common/up_internal.h
+++ b/arch/x86/src/common/up_internal.h
@@ -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
diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h
index b9a4d5f..c50b269 100644
--- a/arch/xtensa/src/common/xtensa.h
+++ b/arch/xtensa/src/common/xtensa.h
@@ -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
diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h
index 4645222..3de83e7 100644
--- a/arch/z16/src/common/up_internal.h
+++ b/arch/z16/src/common/up_internal.h
@@ -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