10 files changed, 29 insertions, 37 deletions
diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index d8be31a97..50efbfdaf 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -99,7 +99,7 @@ CONFIG_EZ80_UART0=y
 # CONFIG_EZ80_UART1 is not set
 # CONFIG_EZ80_UART2 is not set
 # CONFIG_EZ80_EMAC is not set
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 
 #
 # Architecture Options
diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
index 37a256d5e..95baadc13 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
@@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=3
 CONFIG_START_DAY=14
 CONFIG_JULIAN_TIME=n
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_DEV_CONSOLE=y
 CONFIG_DEV_LOWCONSOLE=y
 CONFIG_MUTEX_TYPES=n
diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig
index 0cf4c33aa..6a910ee0b 100644
--- a/nuttx/configs/ez80f910200zco/httpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/httpd/defconfig
@@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=3
 CONFIG_START_DAY=14
 CONFIG_JULIAN_TIME=n
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_DEV_CONSOLE=y
 CONFIG_DEV_LOWCONSOLE=y
 CONFIG_MUTEX_TYPES=n
diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig
index 9f7d438be..22cf35a0c 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/configs/ez80f910200zco/nettest/defconfig
@@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=3
 CONFIG_START_DAY=14
 CONFIG_JULIAN_TIME=n
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_DEV_CONSOLE=y
 CONFIG_DEV_LOWCONSOLE=y
 CONFIG_MUTEX_TYPES=n
diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index 804a4563f..8ad3930ff 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=3
 CONFIG_START_DAY=14
 CONFIG_JULIAN_TIME=n
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_DEV_CONSOLE=y
 CONFIG_DEV_LOWCONSOLE=n
 CONFIG_MUTEX_TYPES=n
diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig
index 977dda1dc..3a1352333 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/configs/ez80f910200zco/ostest/defconfig
@@ -99,7 +99,7 @@ CONFIG_EZ80_UART0=y
 # CONFIG_EZ80_UART1 is not set
 # CONFIG_EZ80_UART2 is not set
 # CONFIG_EZ80_EMAC is not set
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_ARCH_TIMERHOOK=y
 
 #
diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig
index 316d150d0..82cea4fcf 100644
--- a/nuttx/configs/ez80f910200zco/poll/defconfig
+++ b/nuttx/configs/ez80f910200zco/poll/defconfig
@@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=3
 CONFIG_START_DAY=14
 CONFIG_JULIAN_TIME=n
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_DEV_CONSOLE=y
 CONFIG_DEV_LOWCONSOLE=y
 CONFIG_MUTEX_TYPES=n
diff --git a/nuttx/configs/p112/ostest/defconfig b/nuttx/configs/p112/ostest/defconfig
index 62162f37e..eb02fe6bc 100644
--- a/nuttx/configs/p112/ostest/defconfig
+++ b/nuttx/configs/p112/ostest/defconfig
@@ -119,6 +119,7 @@ CONFIG_ARCH_CHIP_Z8018216FSG=y
 # CONFIG_ARCH_CHIP_EZ80F93 is not set
 CONFIG_ARCH_CHIP_Z180=y
 CONFIG_ARCH_CHIP_Z80182=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_LINKER_HOME_AREA=0x0000
 CONFIG_LINKER_CODE_AREA=0x0200
 CONFIG_LINKER_DATA_AREA=0x8000
@@ -135,8 +136,25 @@ CONFIG_Z180_PHYSHEAP_END=0x100000
 #
 # Z180 Peripheral Support
 #
-CONFIG_Z180_UART0=y
-CONFIG_Z180_UART1=y
+# CONFIG_Z180_UART0 is not set
+# CONFIG_Z180_UART1 is not set
+CONFIG_Z180_ESCCA=y
+# CONFIG_Z180_ESCCB is not set
+# CONFIG_Z180_TMR1 is not set
+# CONFIG_Z180_PORTA is not set
+# CONFIG_Z180_PORTB is not set
+# CONFIG_Z180_MIMIC is not set
+CONFIG_Z180_ESCCA_SERIAL_CONSOLE=y
+
+#
+# ESCC Channel A Configuration
+#
+CONFIG_Z180_ESCCA_RXBUFSIZE=64
+CONFIG_Z180_ESCCA_TXBUFSIZE=64
+CONFIG_Z180_ESCCA_BAUD=9600
+CONFIG_Z180_ESCCA_BITS=8
+CONFIG_Z180_ESCCA_PARITY=0
+CONFIG_Z180_ESCCA_2STOP=0
 
 #
 # Architecture Options
@@ -261,32 +279,6 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
 # CONFIG_16550_UART is not set
-CONFIG_ARCH_HAVE_UART0=y
-CONFIG_ARCH_HAVE_UART1=y
-CONFIG_MCU_SERIAL=y
-CONFIG_UART0_SERIAL_CONSOLE=y
-# CONFIG_UART1_SERIAL_CONSOLE is not set
-# CONFIG_NO_SERIAL_CONSOLE is not set
-
-#
-# UART0 Configuration
-#
-CONFIG_UART0_RXBUFSIZE=64
-CONFIG_UART0_TXBUFSIZE=64
-CONFIG_UART0_BAUD=115200
-CONFIG_UART0_BITS=8
-CONFIG_UART0_PARITY=0
-CONFIG_UART0_2STOP=0
-
-#
-# UART1 Configuration
-#
-CONFIG_UART1_RXBUFSIZE=64
-CONFIG_UART1_TXBUFSIZE=64
-CONFIG_UART1_BAUD=115200
-CONFIG_UART1_BITS=8
-CONFIG_UART1_PARITY=0
-CONFIG_UART1_2STOP=0
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig
index b098c682b..7d9b227f4 100644
--- a/nuttx/configs/z8encore000zco/ostest/defconfig
+++ b/nuttx/configs/z8encore000zco/ostest/defconfig
@@ -88,7 +88,7 @@ CONFIG_ARCH_CHIP_Z8F6403=y
 # CONFIG_ARCH_CHIP_EZ80F93 is not set
 CONFIG_ARCH_CHIP_Z8F640X=y
 CONFIG_ARCH_CHIP_Z8=y
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_Z8_UART0=y
 CONFIG_Z8_UART1=y
 
diff --git a/nuttx/configs/z8f64200100kit/ostest/defconfig b/nuttx/configs/z8f64200100kit/ostest/defconfig
index caa685419..a34952987 100644
--- a/nuttx/configs/z8f64200100kit/ostest/defconfig
+++ b/nuttx/configs/z8f64200100kit/ostest/defconfig
@@ -88,7 +88,7 @@ CONFIG_ARCH_CHIP_Z8F6423=y
 # CONFIG_ARCH_CHIP_EZ80F93 is not set
 CONFIG_ARCH_CHIP_Z8F642X=y
 CONFIG_ARCH_CHIP_Z8=y
-CONFIG_HAVE_LOWUARTINIT=y
+CONFIG_HAVE_LOWSERIALINIT=y
 CONFIG_Z8_UART0=y
 CONFIG_Z8_UART1=y