Change how UARTs are enabled for i.MX, M16C, and ez80 to make them compatible with other chips

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5374 42af7a65-404d-4744-a932-0658087f49c3

28 files changed, 67 insertions, 67 deletions

diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig
index 6d4ee61a2..2d8f82180 100644
--- a/nuttx/configs/eagle100/httpd/defconfig
+++ b/nuttx/configs/eagle100/httpd/defconfig
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6918 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=256
diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig
index 4956d0875..fa0740208 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/configs/eagle100/nettest/defconfig
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6918 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=256
diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index 7f6bd1f54..d8041c299 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/configs/eagle100/nsh/defconfig
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6918 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=256
diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig
index a4760eae5..756902bb0 100644
--- a/nuttx/configs/eagle100/nxflat/defconfig
+++ b/nuttx/configs/eagle100/nxflat/defconfig
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6918 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=256
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 4b98e25e0..43c77fe07 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6918 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=256
diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig
index 5af32d202..dceac0990 100644
--- a/nuttx/configs/eagle100/thttpd/defconfig
+++ b/nuttx/configs/eagle100/thttpd/defconfig
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6918 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=256
diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
index 8047a23da..82ad3ce5d 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6B96 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
index 6ce065ca8..bcf2a9426 100644
--- a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
+++ b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6B96 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index 3039eec6c..9450ff876 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -56,8 +56,8 @@ CONFIG_ARCH_TIMERHOOK=n
 #
 # eZ80 specific device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_EZ80_UART0=y
+CONFIG_EZ80_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=0
diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
index 329ff2824..37a256d5e 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # eZ80 specific device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_EZ80_UART0=y
+CONFIG_EZ80_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=0
diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig
index 1feeafd58..0cf4c33aa 100644
--- a/nuttx/configs/ez80f910200zco/httpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/httpd/defconfig
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # eZ80 specific device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_EZ80_UART0=y
+CONFIG_EZ80_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=0
diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig
index 1ba356095..9f7d438be 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/configs/ez80f910200zco/nettest/defconfig
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # eZ80 specific device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_EZ80_UART0=y
+CONFIG_EZ80_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=0
diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index 73de6b096..804a4563f 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # eZ80 specific device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_EZ80_UART0=y
+CONFIG_EZ80_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=64
diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig
index bf306e38d..7ffd452ee 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/configs/ez80f910200zco/ostest/defconfig
@@ -56,8 +56,8 @@ CONFIG_ARCH_TIMERHOOK=y
 #
 # eZ80 specific device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_EZ80_UART0=y
+CONFIG_EZ80_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=64
diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig
index 0d7d765cf..316d150d0 100644
--- a/nuttx/configs/ez80f910200zco/poll/defconfig
+++ b/nuttx/configs/ez80f910200zco/poll/defconfig
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # eZ80 specific device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
+CONFIG_EZ80_UART0=y
+CONFIG_EZ80_UART1=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART0_TXBUFSIZE=0
diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
index 9aa8f1db3..704d8ad91 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6432 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=n
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=y
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=n
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
index 299cef48c..0be2cfd4c 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6432 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=n
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=y
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=n
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/lm3s6432-s2e/src/up_boot.c b/nuttx/configs/lm3s6432-s2e/src/up_boot.c
index 3c5787f99..5bb7b670f 100644
--- a/nuttx/configs/lm3s6432-s2e/src/up_boot.c
+++ b/nuttx/configs/lm3s6432-s2e/src/up_boot.c
@@ -54,7 +54,7 @@
  * Definitions
  ************************************************************************************/
 
-#if !defined(CONFIG_UART1_DISABLE) && !defined(CONFIG_SSI0_DISABLE)
+#if defined(CONFIG_LM3S_UART1) && !defined(CONFIG_SSI0_DISABLE)
 #  error Only one of UART1 and SSI0 can be enabled on this board.
 #endif
 
diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index d10ad9db9..7b75178ea 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6965 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index 10d10f705..bca864013 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6965 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig
index e638ac3c7..fcee44433 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S6965 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index 769c5d8e9..573ea582e 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S8962 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index 653bdc483..30c3b8952 100755
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nx/defconfig
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S8962 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig
index ce1ed1a1d..e19cab1cc 100755
--- a/nuttx/configs/lm3s8962-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
 #
 # LM3S8962 specific serial device driver settings
 #
-CONFIG_UART0_DISABLE=n
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_LM3S_UART0=y
+CONFIG_LM3S_UART1=n
+CONFIG_LM3S_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig
index 03d79e70a..54dbf6cce 100644
--- a/nuttx/configs/mx1ads/ostest/defconfig
+++ b/nuttx/configs/mx1ads/ostest/defconfig
@@ -59,9 +59,9 @@ CONFIG_ARCH_ROMPGTABLE=n
 #
 # IMX specific serial device driver settings
 #
-CONFIG_UART1_DISABLE=n
-CONFIG_UART2_DISABLE=y
-CONFIG_UART3_DISABLE=y
+CONFIG_IMX_UART1=y
+CONFIG_IMX_UART2=n
+CONFIG_IMX_UART3=n
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_UART2_SERIAL_CONSOLE=n
 CONFIG_UART3_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/skp16c26/include/board.h b/nuttx/configs/skp16c26/include/board.h
index cf0a1c15b..d656e1352 100644
--- a/nuttx/configs/skp16c26/include/board.h
+++ b/nuttx/configs/skp16c26/include/board.h
@@ -57,7 +57,7 @@
  * To be safe, we will error out on either selection:
  */
 
-#if !defined(CONFIG_UART1_DISABLE) || !defined(CONFIG_UART2_DISABLE)
+#if defined(CONFIG_M16C_UART1) || defined(CONFIG_M16C_UART2)
 #  error "UART1/2 should not be used on SKP16C26"
 #endif
 
diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig
index d223a8350..cf93d5b10 100644
--- a/nuttx/configs/skp16c26/ostest/defconfig
+++ b/nuttx/configs/skp16c26/ostest/defconfig
@@ -57,9 +57,9 @@ CONFIG_ARCH_LCD=y
 #
 # M16C specific device driver settings
 #
-CONFIG_UART0_DISABLE=y
-CONFIG_UART1_DISABLE=y
-CONFIG_UART2_DISABLE=y
+CONFIG_M16C_UART0=n
+CONFIG_M16C_UART1=n
+CONFIG_M16C_UART2=n
 CONFIG_UART0_SERIAL_CONSOLE=n
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/skp16c26/src/up_lcdconsole.c b/nuttx/configs/skp16c26/src/up_lcdconsole.c
index 1ae00fb22..617cc26ec 100644
--- a/nuttx/configs/skp16c26/src/up_lcdconsole.c
+++ b/nuttx/configs/skp16c26/src/up_lcdconsole.c
@@ -46,11 +46,11 @@
 
 /* Only use the LCD as a console if there are is no serial console */
 
-#if defined(CONFIG_UART0_SERIAL_CONSOLE) && !defined(CONFIG_UART0_DISABLE)
+#if defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_M16C_UART0)
 #  define HAVE_SERIALCONSOLE 1
-#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && !defined(CONFIG_UART1_DISABLE)
+#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_M16C_UART1)
 #  define HAVE_SERIALCONSOLE 1
-#elif defined(CONFIG_UART2_SERIAL_CONSOLE) && !defined(CONFIG_UART2_DISABLE)
+#elif defined(CONFIG_UART2_SERIAL_CONSOLE) && defined(CONFIG_M16C_UART2)
 #  define HAVE_SERIALCONSOLE 1
 #else
 #  undef HAVE_SERIALCONSOLE