Remove CONFIG_USARTn_ISUART

arch/arm/src/efm32/Kconfig

@@ -157,20 +157,17 @@ config EFM32_BITBAND
 config EFM32_USART0
 	bool "USART0"
 	default n
-	select USART0_SERIALDRIVER
 	select ARCH_HAVE_SERIAL_TERMIOS
 
 config EFM32_USART1
 	bool "USART1"
 	default n
-	select USART1_SERIALDRIVER
 	select ARCH_HAVE_SERIAL_TERMIOS
 
 config EFM32_USART2
 	bool "USART2"
 	default n
 	depends on EFM32_HAVE_USART2
-	select USART2_SERIALDRIVER
 	select ARCH_HAVE_SERIAL_TERMIOS
 
 config EFM32_UART0
@@ -261,7 +258,7 @@ choice
 
 config EFM32_USART0_ISUART
 	bool "USART0 is a UART"
-	select USART0_ISUART
+	select USART0_SERIALDRIVER
 	select EFM32_USART_ISUART
 
 config EFM32_USART0_ISSPI
@@ -277,7 +274,7 @@ choice
 
 config EFM32_USART1_ISUART
 	bool "USART1 is a UART"
-	select USART1_ISUART
+	select USART1_SERIALDRIVER
 	select EFM32_USART_ISUART
 
 config EFM32_USART1_ISSPI
@@ -293,7 +290,7 @@ choice
 
 config EFM32_USART2_ISUART
 	bool "USART2 is a UART"
-	select USART2_ISUART
+	select USART2_SERIALDRIVER
 	select EFM32_USART_ISUART
 
 config EFM32_USART2_ISSPI

arch/arm/src/sam34/sam_lowputc.c

@@ -75,16 +75,16 @@
  * for our purposes.
  */
 
-#ifndef CONFIG_USART0_ISUART
+#ifndef CONFIG_USART0_SERIALDRIVER
 #  undef CONFIG_SAM34_USART0
 #endif
-#ifndef CONFIG_USART1_ISUART
+#ifndef CONFIG_USART1_SERIALDRIVER
 #  undef CONFIG_SAM34_USART1
 #endif
-#ifndef CONFIG_USART2_ISUART
+#ifndef CONFIG_USART2_SERIALDRIVER
 #  undef CONFIG_SAM34_USART2
 #endif
-#ifndef CONFIG_USART3_ISUART
+#ifndef CONFIG_USART3_SERIALDRIVER
 #  undef CONFIG_SAM34_USART3
 #endif
 

arch/arm/src/sam34/sam_serial.c

@@ -84,16 +84,16 @@
  * for our purposes.
  */
 
-#ifndef CONFIG_USART0_ISUART
+#ifndef CONFIG_USART0_SERIALDRIVER
 #  undef CONFIG_SAM34_USART0
 #endif
-#ifndef CONFIG_USART1_ISUART
+#ifndef CONFIG_USART1_SERIALDRIVER
 #  undef CONFIG_SAM34_USART1
 #endif
-#ifndef CONFIG_USART2_ISUART
+#ifndef CONFIG_USART2_SERIALDRIVER
 #  undef CONFIG_SAM34_USART2
 #endif
-#ifndef CONFIG_USART3_ISUART
+#ifndef CONFIG_USART3_SERIALDRIVER
 #  undef CONFIG_SAM34_USART3
 #endif
 

arch/arm/src/sama5/sam_config.h

@@ -52,27 +52,27 @@
  * for our purposes.
  */
 
-#ifndef CONFIG_USART0_ISUART
+#ifndef CONFIG_USART0_SERIALDRIVER
 #  undef CONFIG_SAMA5_USART0
 #  undef CONFIG_SAMA5_FLEXCOM0_USART
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #endif
-#ifndef CONFIG_USART1_ISUART
+#ifndef CONFIG_USART1_SERIALDRIVER
 #  undef CONFIG_SAMA5_USART1
 #  undef CONFIG_SAMA5_FLEXCOM1_USART
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #endif
-#ifndef CONFIG_USART2_ISUART
+#ifndef CONFIG_USART2_SERIALDRIVER
 #  undef CONFIG_SAMA5_USART2
 #  undef CONFIG_SAMA5_FLEXCOM2_USART
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #endif
-#ifndef CONFIG_USART3_ISUART
+#ifndef CONFIG_USART3_SERIALDRIVER
 #  undef CONFIG_SAMA5_USART3
 #  undef CONFIG_SAMA5_FLEXCOM3_USART
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #endif
-#ifndef CONFIG_USART4_ISUART
+#ifndef CONFIG_USART4_SERIALDRIVER
 #  undef CONFIG_SAMA5_USART4
 #  undef CONFIG_SAMA5_FLEXCOM4_USART
 #  undef CONFIG_USART4_SERIAL_CONSOLE
@@ -212,7 +212,7 @@
 #  define SAMA5_HAVE_UART_CONSOLE 1
 #  undef  SAMA5_HAVE_USART_CONSOLE
 #  undef  SAMA5_HAVE_FLEXCOM_CONSOLE
-#elif defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_USART0_ISUART)
+#elif defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_USART0_SERIALDRIVER)
 #  undef  CONFIG_SAMA5_DBGU_CONSOLE
 #  undef  CONFIG_UART0_SERIAL_CONSOLE
 #  undef  CONFIG_UART1_SERIAL_CONSOLE
@@ -227,7 +227,7 @@
 #  undef  SAMA5_HAVE_UART_CONSOLE
 #  define SAMA5_HAVE_USART_CONSOLE 1
 #  undef  SAMA5_HAVE_FLEXCOM_CONSOLE
-#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_USART1_ISUART)
+#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_USART1_SERIALDRIVER)
 #  undef  CONFIG_SAMA5_DBGU_CONSOLE
 #  undef  CONFIG_UART0_SERIAL_CONSOLE
 #  undef  CONFIG_UART1_SERIAL_CONSOLE
@@ -242,7 +242,7 @@
 #  undef  SAMA5_HAVE_UART_CONSOLE
 #  define SAMA5_HAVE_USART_CONSOLE 1
 #  undef  SAMA5_HAVE_FLEXCOM_CONSOLE
-#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_USART2_ISUART)
+#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_USART2_SERIALDRIVER)
 #  undef  CONFIG_SAMA5_DBGU_CONSOLE
 #  undef  CONFIG_UART0_SERIAL_CONSOLE
 #  undef  CONFIG_UART1_SERIAL_CONSOLE
@@ -257,7 +257,7 @@
 #  undef  SAMA5_HAVE_UART_CONSOLE
 #  define SAMA5_HAVE_USART_CONSOLE 1
 #  undef  SAMA5_HAVE_FLEXCOM_CONSOLE
-#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_USART3_ISUART)
+#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_USART3_SERIALDRIVER)
 #  undef  CONFIG_SAMA5_DBGU_CONSOLE
 #  undef  CONFIG_UART0_SERIAL_CONSOLE
 #  undef  CONFIG_UART1_SERIAL_CONSOLE
@@ -272,7 +272,7 @@
 #  undef  SAMA5_HAVE_UART_CONSOLE
 #  define SAMA5_HAVE_USART_CONSOLE 1
 #  undef  SAMA5_HAVE_FLEXCOM_CONSOLE
-#elif defined(CONFIG_USART4_SERIAL_CONSOLE) && defined(CONFIG_USART4_ISUART)
+#elif defined(CONFIG_USART4_SERIAL_CONSOLE) && defined(CONFIG_USART4_SERIALDRIVER)
 #  undef  CONFIG_SAMA5_DBGU_CONSOLE
 #  undef  CONFIG_UART0_SERIAL_CONSOLE
 #  undef  CONFIG_UART1_SERIAL_CONSOLE

arch/arm/src/sama5/sam_flexcom_serial.c

@@ -120,19 +120,19 @@
 #    define FLEXUS4_ASSIGNED    1
 #else
 #  undef CONSOLE_DEV                          /* No console */
-#  if defined(CONFIG_USART0_ISUART)
+#  if defined(CONFIG_USART0_SERIALDRIVER)
 #    define TTYFC0_DEV          g_flexus0port /* FLEXUS0 is ttyFC0 */
 #    define FLEXUS0_ASSIGNED    1
-#  elif defined(CONFIG_USART1_ISUART)
+#  elif defined(CONFIG_USART1_SERIALDRIVER)
 #    define TTYFC0_DEV          g_flexus1port /* FLEXUS1 is ttyFC0 */
 #    define FLEXUS1_ASSIGNED    1
-#  elif defined(CONFIG_USART2_ISUART)
+#  elif defined(CONFIG_USART2_SERIALDRIVER)
 #    define TTYFC0_DEV          g_flexus2port /* FLEXUS2 is ttyFC0 */
 #    define FLEXUS2_ASSIGNED    1
-#  elif defined(CONFIG_USART3_ISUART)
+#  elif defined(CONFIG_USART3_SERIALDRIVER)
 #    define TTYFC0_DEV          g_flexus3port /* FLEXUS3 is ttyFC0 */
 #    define FLEXUS3_ASSIGNED    1
-#  elif defined(CONFIG_USART4_ISUART)
+#  elif defined(CONFIG_USART4_SERIALDRIVER)
 #    define TTYFC0_DEV          g_flexus4port /* FLEXUS4 is ttyFC0 */
 #    define FLEXUS4_ASSIGNED    4
 #  endif
@@ -140,19 +140,19 @@
 
 /* Pick ttyFC1.  This could be any of USART0-4 excluding the console UART. */
 
-#if defined(CONFIG_USART0_ISUART) && !defined(FLEXUS0_ASSIGNED)
+#if defined(CONFIG_USART0_SERIALDRIVER) && !defined(FLEXUS0_ASSIGNED)
 #  define TTYFC1_DEV           g_flexus0port /* FLEXUS0 is ttyFC1 */
 #  define FLEXUS0_ASSIGNED     1
-#elif defined(CONFIG_USART1_ISUART) && !defined(FLEXUS1_ASSIGNED)
+#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(FLEXUS1_ASSIGNED)
 #  define TTYFC1_DEV           g_flexus1port /* FLEXUS1 is ttyFC1 */
 #  define FLEXUS1_ASSIGNED     1
-#elif defined(CONFIG_USART2_ISUART) && !defined(FLEXUS2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED)
 #  define TTYFC1_DEV           g_flexus2port /* FLEXUS2 is ttyFC1 */
 #  define FLEXUS2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(FLEXUS3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED)
 #  define TTYFC1_DEV           g_flexus3port /* FLEXUS3 is ttyFC1 */
 #  define FLEXUS3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(FLEXUS4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(FLEXUS4_ASSIGNED)
 #  define TTYFC1_DEV           g_flexus4port /* FLEXUS4 is ttyFC1 */
 #  define FLEXUS4_ASSIGNED     1
 #endif
@@ -162,16 +162,16 @@
  * could also be the console.
  */
 
-#if defined(CONFIG_USART1_ISUART) && !defined(FLEXUS1_ASSIGNED)
+#if defined(CONFIG_USART1_SERIALDRIVER) && !defined(FLEXUS1_ASSIGNED)
 #  define TTYFC2_DEV           g_flexus1port /* FLEXUS1 is ttyFC2 */
 #  define FLEXUS1_ASSIGNED     1
-#elif defined(CONFIG_USART2_ISUART) && !defined(FLEXUS2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED)
 #  define TTYFC2_DEV           g_flexus2port /* FLEXUS2 is ttyFC2 */
 #  define FLEXUS2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(FLEXUS3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED)
 #  define TTYFC2_DEV           g_flexus3port /* FLEXUS3 is ttyFC2 */
 #  define FLEXUS3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYFC2_DEV           g_flexus4port /* FLEXUS4 is ttyFC2 */
 #  define FLEXUS4_ASSIGNED     1
 #endif
@@ -181,13 +181,13 @@
  * FLEXUS2-4 could also be the console.
  */
 
-#if defined(CONFIG_USART2_ISUART) && !defined(FLEXUS2_ASSIGNED)
+#if defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED)
 #  define TTYFC3_DEV           g_flexus2port /* FLEXUS2 is ttyFC3 */
 #  define FLEXUS2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(FLEXUS3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED)
 #  define TTYFC3_DEV           g_flexus3port /* FLEXUS3 is ttyFC3 */
 #  define FLEXUS3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(FLEXUS4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(FLEXUS4_ASSIGNED)
 #  define TTYFC3_DEV           g_flexus4port /* FLEXUS4 is ttyFC3 */
 #  define FLEXUS4_ASSIGNED     1
 #endif
@@ -197,10 +197,10 @@
  * USART3-4 could also be the console.
  */
 
-#if defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#if defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYFC4_DEV           g_flexus3port /* USART3 is ttyFC4 */
 #  define USART3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYFC4_DEV           g_flexus4port /* USART4 is ttyFC4 */
 #  define USART4_ASSIGNED     1
 #endif
@@ -234,19 +234,19 @@ struct flexus_dev_s
  ****************************************************************************/
 
 static int  flexus_interrupt(struct uart_dev_s *dev);
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
 static int  flexus0_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART1_ISUART
+#ifdef CONFIG_USART1_SERIALDRIVER
 static int  flexus1_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART2_ISUART
+#ifdef CONFIG_USART2_SERIALDRIVER
 static int  flexus2_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART3_ISUART
+#ifdef CONFIG_USART3_SERIALDRIVER
 static int  flexus3_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART4_ISUART
+#ifdef CONFIG_USART4_SERIALDRIVER
 static int  flexus4_interrupt(int irq, void *context);
 #endif
 
@@ -288,30 +288,30 @@ static const struct uart_ops_s g_flexus_ops =
 
 /* I/O buffers */
 
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
 static char g_flexus0rxbuffer[CONFIG_USART0_RXBUFSIZE];
 static char g_flexus0txbuffer[CONFIG_USART0_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART1_ISUART
+#ifdef CONFIG_USART1_SERIALDRIVER
 static char g_flexus1rxbuffer[CONFIG_USART1_RXBUFSIZE];
 static char g_flexus1txbuffer[CONFIG_USART1_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART2_ISUART
+#ifdef CONFIG_USART2_SERIALDRIVER
 static char g_flexus2rxbuffer[CONFIG_USART2_RXBUFSIZE];
 static char g_flexus2txbuffer[CONFIG_USART2_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART3_ISUART
+#ifdef CONFIG_USART3_SERIALDRIVER
 static char g_flexus3rxbuffer[CONFIG_USART3_RXBUFSIZE];
 static char g_flexus3txbuffer[CONFIG_USART3_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART4_ISUART
+#ifdef CONFIG_USART4_SERIALDRIVER
 static char g_flexus4rxbuffer[CONFIG_USART4_RXBUFSIZE];
 static char g_flexus4txbuffer[CONFIG_USART4_TXBUFSIZE];
 #endif
 
 /* This describes the state of the USART0 port. */
 
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
 static struct flexus_dev_s g_flexus0priv =
 {
   .handler        = flexus0_interrupt,
@@ -345,7 +345,7 @@ static uart_dev_t g_flexus0port =
 
 /* This describes the state of the USART1 port. */
 
-#ifdef CONFIG_USART1_ISUART
+#ifdef CONFIG_USART1_SERIALDRIVER
 static struct flexus_dev_s g_flexus1priv =
 {
   .handler        = flexus1_interrupt,
@@ -379,7 +379,7 @@ static uart_dev_t g_flexus1port =
 
 /* This describes the state of the USART2 port. */
 
-#ifdef CONFIG_USART2_ISUART
+#ifdef CONFIG_USART2_SERIALDRIVER
 static struct flexus_dev_s g_flexus2priv =
 {
   .handler        = flexus2_interrupt,
@@ -413,7 +413,7 @@ static uart_dev_t g_flexus2port =
 
 /* This describes the state of the USART3 port. */
 
-#ifdef CONFIG_USART3_ISUART
+#ifdef CONFIG_USART3_SERIALDRIVER
 static struct flexus_dev_s g_flexus3priv =
 {
   .handler        = flexus3_interrupt,
@@ -447,7 +447,7 @@ static uart_dev_t g_flexus3port =
 
 /* This describes the state of the USART4 port. */
 
-#ifdef CONFIG_USART4_ISUART
+#ifdef CONFIG_USART4_SERIALDRIVER
 static struct flexus_dev_s g_flexus4priv =
 {
   .handler        = flexus4_interrupt,
@@ -613,31 +613,31 @@ static int flexus_interrupt(struct uart_dev_s *dev)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
 static int  flexus0_interrupt(int irq, void *context)
 {
   return flexus_interrupt(&g_flexus0port);
 }
 #endif
-#ifdef CONFIG_USART1_ISUART
+#ifdef CONFIG_USART1_SERIALDRIVER
 static int  flexus1_interrupt(int irq, void *context)
 {
   return flexus_interrupt(&g_flexus1port);
 }
 #endif
-#ifdef CONFIG_USART2_ISUART
+#ifdef CONFIG_USART2_SERIALDRIVER
 static int  flexus2_interrupt(int irq, void *context)
 {
   return flexus_interrupt(&g_flexus2port);
 }
 #endif
-#ifdef CONFIG_USART3_ISUART
+#ifdef CONFIG_USART3_SERIALDRIVER
 static int  flexus3_interrupt(int irq, void *context)
 {
   return flexus_interrupt(&g_flexus3port);
 }
 #endif
-#ifdef CONFIG_USART4_ISUART
+#ifdef CONFIG_USART4_SERIALDRIVER
 static int  flexus4_interrupt(int irq, void *context)
 {
   return flexus_interrupt(&g_flexus4port);

arch/arm/src/sama5/sam_lowputc.c

@@ -379,7 +379,7 @@ void sam_lowsetup(void)
 #ifdef CONFIG_SAMA5_UART4
   sam_uart4_enableclk();
 #endif
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
   sam_usart0_enableclk();
 #endif
 #ifdef CONFIG_SAMA5_USART1
@@ -436,7 +436,7 @@ void sam_lowsetup(void)
   (void)sam_configpio(PIO_UART4_TXD);
 #endif
 
-#if defined(CONFIG_USART0_ISUART) && defined(CONFIG_SAMA5_USART0)
+#if defined(CONFIG_USART0_SERIALDRIVER) && defined(CONFIG_SAMA5_USART0)
   (void)sam_configpio(PIO_USART0_RXD);
   (void)sam_configpio(PIO_USART0_TXD);
 #ifdef CONFIG_USART0_OFLOWCONTROL
@@ -447,7 +447,7 @@ void sam_lowsetup(void)
 #endif
 #endif
 
-#if defined(CONFIG_USART1_ISUART) && defined(CONFIG_SAMA5_USART1)
+#if defined(CONFIG_USART1_SERIALDRIVER) && defined(CONFIG_SAMA5_USART1)
   (void)sam_configpio(PIO_USART1_RXD);
   (void)sam_configpio(PIO_USART1_TXD);
 #ifdef CONFIG_USART1_OFLOWCONTROL
@@ -458,7 +458,7 @@ void sam_lowsetup(void)
 #endif
 #endif
 
-#if defined(CONFIG_USART2_ISUART) && defined(CONFIG_SAMA5_USART2)
+#if defined(CONFIG_USART2_SERIALDRIVER) && defined(CONFIG_SAMA5_USART2)
   (void)sam_configpio(PIO_USART2_RXD);
   (void)sam_configpio(PIO_USART2_TXD);
 #ifdef CONFIG_USART2_OFLOWCONTROL
@@ -469,7 +469,7 @@ void sam_lowsetup(void)
 #endif
 #endif
 
-#if defined(CONFIG_USART3_ISUART) && defined(CONFIG_SAMA5_USART3)
+#if defined(CONFIG_USART3_SERIALDRIVER) && defined(CONFIG_SAMA5_USART3)
   (void)sam_configpio(PIO_USART3_RXD);
   (void)sam_configpio(PIO_USART3_TXD);
 #ifdef CONFIG_USART3_OFLOWCONTROL
@@ -480,7 +480,7 @@ void sam_lowsetup(void)
 #endif
 #endif
 
-#if defined(CONFIG_USART4_ISUART) && defined(CONFIG_SAMA5_USART4)
+#if defined(CONFIG_USART4_SERIALDRIVER) && defined(CONFIG_SAMA5_USART4)
   (void)sam_configpio(PIO_USART4_RXD);
   (void)sam_configpio(PIO_USART4_TXD);
 #ifdef CONFIG_USART4_OFLOWCONTROL
@@ -500,7 +500,7 @@ void sam_lowsetup(void)
    *   FLEXCOM_IO4 = RTS
    */
 
-#if defined(CONFIG_USART0_ISUART) && defined(CONFIG_SAMA5_FLEXCOM0_USART)
+#if defined(CONFIG_USART0_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM0_USART)
   (void)sam_configpio(PIO_FLEXCOM0_IO0);
   (void)sam_configpio(PIO_FLEXCOM0_IO1);
 #ifdef CONFIG_USART0_OFLOWCONTROL
@@ -511,7 +511,7 @@ void sam_lowsetup(void)
 #endif
 #endif
 
-#if defined(CONFIG_USART1_ISUART) && defined(CONFIG_SAMA5_FLEXCOM1_USART)
+#if defined(CONFIG_USART1_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM1_USART)
   (void)sam_configpio(PIO_FLEXCOM1_IO0);
   (void)sam_configpio(PIO_FLEXCOM1_IO1);
 #ifdef CONFIG_USART1_OFLOWCONTROL
@@ -522,7 +522,7 @@ void sam_lowsetup(void)
 #endif
 #endif
 
-#if defined(CONFIG_USART2_ISUART) && defined(CONFIG_SAMA5_FLEXCOM2_USART)
+#if defined(CONFIG_USART2_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM2_USART)
   (void)sam_configpio(PIO_FLEXCOM2_IO0);
   (void)sam_configpio(PIO_FLEXCOM2_IO1);
 #ifdef CONFIG_USART2_OFLOWCONTROL
@@ -533,7 +533,7 @@ void sam_lowsetup(void)
 #endif
 #endif
 
-#if defined(CONFIG_USART3_ISUART) && defined(CONFIG_SAMA5_FLEXCOM3_USART)
+#if defined(CONFIG_USART3_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM3_USART)
   (void)sam_configpio(PIO_FLEXCOM3_IO0);
   (void)sam_configpio(PIO_FLEXCOM3_IO1);
 #ifdef CONFIG_USART3_OFLOWCONTROL
@@ -544,7 +544,7 @@ void sam_lowsetup(void)
 #endif
 #endif
 
-#if defined(CONFIG_USART4_ISUART) && defined(CONFIG_SAMA5_FLEXCOM4_USART)
+#if defined(CONFIG_USART4_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM4_USART)
   (void)sam_configpio(PIO_FLEXCOM4_IO0);
   (void)sam_configpio(PIO_FLEXCOM4_IO1);
 #ifdef CONFIG_USART4_OFLOWCONTROL

arch/arm/src/sama5/sam_serial.c

@@ -167,19 +167,19 @@
 #  elif defined(CONFIG_SAMA5_UART4)
 #    define TTYS0_DEV           g_uart1port  /* UART4 is ttyS0 */
 #    define UART4_ASSIGNED      1
-#  elif defined(CONFIG_USART0_ISUART)
+#  elif defined(CONFIG_USART0_SERIALDRIVER)
 #    define TTYS0_DEV           g_usart0port /* USART0 is ttyS0 */
 #    define USART0_ASSIGNED     1
-#  elif defined(CONFIG_USART1_ISUART)
+#  elif defined(CONFIG_USART1_SERIALDRIVER)
 #    define TTYS0_DEV           g_usart1port /* USART1 is ttyS0 */
 #    define USART1_ASSIGNED     1
-#  elif defined(CONFIG_USART2_ISUART)
+#  elif defined(CONFIG_USART2_SERIALDRIVER)
 #    define TTYS0_DEV           g_usart2port /* USART2 is ttyS0 */
 #    define USART2_ASSIGNED     1
-#  elif defined(CONFIG_USART3_ISUART)
+#  elif defined(CONFIG_USART3_SERIALDRIVER)
 #    define TTYS0_DEV           g_usart3port /* USART3 is ttyS0 */
 #    define USART3_ASSIGNED     1
-#  elif defined(CONFIG_USART4_ISUART)
+#  elif defined(CONFIG_USART4_SERIALDRIVER)
 #    define TTYS0_DEV           g_usart4port /* USART4 is ttyS0 */
 #    define USART4_ASSIGNED     4
 #  endif
@@ -202,19 +202,19 @@
 #elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS1_DEV           g_uart1port  /* UART4 is ttyS1 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
+#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
 #  define TTYS1_DEV           g_usart0port /* USART0 is ttyS1 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
+#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
 #  define TTYS1_DEV           g_usart1port /* USART1 is ttyS1 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
 #  define TTYS1_DEV           g_usart2port /* USART2 is ttyS1 */
 #  define USART2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS1_DEV           g_usart3port /* USART3 is ttyS1 */
 #  define USART3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS1_DEV           g_usart4port /* USART4 is ttyS1 */
 #  define USART4_ASSIGNED     1
 #endif
@@ -236,19 +236,19 @@
 #elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS2_DEV           g_uart1port  /* UART4 is ttyS2 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
+#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
 #  define TTYS2_DEV           g_usart0port /* USART0 is ttyS2 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
+#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
 #  define TTYS2_DEV           g_usart1port /* USART1 is ttyS2 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
 #  define TTYS2_DEV           g_usart2port /* USART2 is ttyS2 */
 #  define USART2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS2_DEV           g_usart3port /* USART3 is ttyS2 */
 #  define USART3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS2_DEV           g_usart4port /* USART4 is ttyS2 */
 #  define USART4_ASSIGNED     1
 #endif
@@ -267,19 +267,19 @@
 #elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS3_DEV           g_uart1port  /* UART4 is ttyS3 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
+#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
 #  define TTYS3_DEV           g_usart0port /* USART0 is ttyS3 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
+#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
 #  define TTYS3_DEV           g_usart1port /* USART1 is ttyS3 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
 #  define TTYS3_DEV           g_usart2port /* USART2 is ttyS3 */
 #  define USART2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS3_DEV           g_usart3port /* USART3 is ttyS3 */
 #  define USART3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS3_DEV           g_usart4port /* USART4 is ttyS3 */
 #  define USART4_ASSIGNED     1
 #endif
@@ -295,19 +295,19 @@
 #elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS4_DEV           g_uart1port  /* UART4 is ttyS4 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
+#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
 #  define TTYS4_DEV           g_usart0port /* USART0 is ttyS4 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
+#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
 #  define TTYS4_DEV           g_usart1port /* USART1 is ttyS4 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
 #  define TTYS4_DEV           g_usart2port /* USART2 is ttyS4 */
 #  define USART2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS4_DEV           g_usart3port /* USART3 is ttyS4 */
 #  define USART3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS4_DEV           g_usart4port /* USART4 is ttyS4 */
 #  define USART4_ASSIGNED     1
 #endif
@@ -320,19 +320,19 @@
 #if defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS5_DEV           g_uart4port  /* UART4 is ttyS5 */
 #  define UART1_ASSIGNED      1
-#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
+#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
 #  define TTYS5_DEV           g_usart0port /* USART0 is ttyS5 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
+#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
 #  define TTYS5_DEV           g_usart1port /* USART1 is ttyS5 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
 #  define TTYS5_DEV           g_usart2port /* USART2 is ttyS5 */
 #  define USART2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS5_DEV           g_usart3port /* USART3 is ttyS5 */
 #  define USART3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS5_DEV           g_usart4port /* USART4 is ttyS5 */
 #  define USART4_ASSIGNED     1
 #endif
@@ -342,19 +342,19 @@
  * could also be the console.
  */
 
-#if defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
+#if defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
 #  define TTYS6_DEV           g_usart0port /* USART0 is ttyS6 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
+#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
 #  define TTYS6_DEV           g_usart1port /* USART1 is ttyS6 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
 #  define TTYS6_DEV           g_usart2port /* USART2 is ttyS6 */
 #  define USART2_ASSIGNED     1
-#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS6_DEV           g_usart3port /* USART3 is ttyS6 */
 #  define USART3_ASSIGNED     1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS6_DEV           g_usart4port /* USART4 is ttyS6 */
 #  define USART4_ASSIGNED     1
 #endif
@@ -364,16 +364,16 @@
  * USART1-4 could also be the console.
  */
 
-#if defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
+#if defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
 #  define TTYS7_DEV           g_usart1port /* USART1 is ttyS7 */
 #  define USART1_ASSIGNED      1
-#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
+#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
 #  define TTYS7_DEV           g_usart2port /* USART2 is ttyS7 */
 #  define USART2_ASSIGNED      1
-#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS7_DEV           g_usart3port /* USART3 is ttyS7 */
 #  define USART3_ASSIGNED      1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS7_DEV           g_usart4port /* USART4 is ttyS7 */
 #  define USART4_ASSIGNED      1
 #endif
@@ -383,13 +383,13 @@
  * USART2-4 could also be the console.
  */
 
-#if defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
+#if defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
 #  define TTYS8_DEV           g_usart2port /* USART2 is ttyS8 */
 #  define USART2_ASSIGNED      1
-#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS8_DEV           g_usart3port /* USART3 is ttyS8 */
 #  define USART3_ASSIGNED      1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS8_DEV           g_usart4port /* USART4 is ttyS8 */
 #  define USART4_ASSIGNED      1
 #endif
@@ -399,10 +399,10 @@
  * USART3-4 could also be the console.
  */
 
-#if defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
+#if defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
 #  define TTYS9_DEV           g_usart3port /* USART3 is ttyS9 */
 #  define USART3_ASSIGNED      1
-#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
+#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
 #  define TTYS9_DEV           g_usart4port /* USART4 is ttyS9 */
 #  define USART4_ASSIGNED      1
 #endif
@@ -451,19 +451,19 @@ static int  up_uart3_interrupt(int irq, void *context);
 #ifdef CONFIG_SAMA5_UART4
 static int  up_uart4_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
 static int  up_usart0_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART1_ISUART
+#ifdef CONFIG_USART1_SERIALDRIVER
 static int  up_usart1_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART2_ISUART
+#ifdef CONFIG_USART2_SERIALDRIVER
 static int  up_usart2_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART3_ISUART
+#ifdef CONFIG_USART3_SERIALDRIVER
 static int  up_usart3_interrupt(int irq, void *context);
 #endif
-#ifdef CONFIG_USART4_ISUART
+#ifdef CONFIG_USART4_SERIALDRIVER
 static int  up_usart4_interrupt(int irq, void *context);
 #endif
 
@@ -525,23 +525,23 @@ static char g_uart3txbuffer[CONFIG_UART3_TXBUFSIZE];
 static char g_uart4rxbuffer[CONFIG_UART4_RXBUFSIZE];
 static char g_uart4txbuffer[CONFIG_UART4_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
 static char g_usart0rxbuffer[CONFIG_USART0_RXBUFSIZE];
 static char g_usart0txbuffer[CONFIG_USART0_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART1_ISUART
+#ifdef CONFIG_USART1_SERIALDRIVER
 static char g_usart1rxbuffer[CONFIG_USART1_RXBUFSIZE];
 static char g_usart1txbuffer[CONFIG_USART1_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART2_ISUART
+#ifdef CONFIG_USART2_SERIALDRIVER
 static char g_usart2rxbuffer[CONFIG_USART2_RXBUFSIZE];
 static char g_usart2txbuffer[CONFIG_USART2_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART3_ISUART
+#ifdef CONFIG_USART3_SERIALDRIVER
 static char g_usart3rxbuffer[CONFIG_USART3_RXBUFSIZE];
 static char g_usart3txbuffer[CONFIG_USART3_TXBUFSIZE];
 #endif
-#ifdef CONFIG_USART4_ISUART
+#ifdef CONFIG_USART4_SERIALDRIVER
 static char g_usart4rxbuffer[CONFIG_USART4_RXBUFSIZE];
 static char g_usart4txbuffer[CONFIG_USART4_TXBUFSIZE];
 #endif
@@ -753,7 +753,7 @@ static uart_dev_t g_uart4port =
 
 /* This describes the state of the USART0 port. */
 
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
 static struct up_dev_s g_usart0priv =
 {
   .handler        = up_usart0_interrupt,
@@ -787,7 +787,7 @@ static uart_dev_t g_usart0port =
 
 /* This describes the state of the USART1 port. */
 
-#ifdef CONFIG_USART1_ISUART
+#ifdef CONFIG_USART1_SERIALDRIVER
 static struct up_dev_s g_usart1priv =
 {
   .handler        = up_usart1_interrupt,
@@ -821,7 +821,7 @@ static uart_dev_t g_usart1port =
 
 /* This describes the state of the USART2 port. */
 
-#ifdef CONFIG_USART2_ISUART
+#ifdef CONFIG_USART2_SERIALDRIVER
 static struct up_dev_s g_usart2priv =
 {
   .handler        = up_usart2_interrupt,
@@ -855,7 +855,7 @@ static uart_dev_t g_usart2port =
 
 /* This describes the state of the USART3 port. */
 
-#ifdef CONFIG_USART3_ISUART
+#ifdef CONFIG_USART3_SERIALDRIVER
 static struct up_dev_s g_usart3priv =
 {
   .handler        = up_usart3_interrupt,
@@ -889,7 +889,7 @@ static uart_dev_t g_usart3port =
 
 /* This describes the state of the USART4 port. */
 
-#ifdef CONFIG_USART4_ISUART
+#ifdef CONFIG_USART4_SERIALDRIVER
 static struct up_dev_s g_usart4priv =
 {
   .handler        = up_usart4_interrupt,
@@ -1073,31 +1073,31 @@ static int  up_uart4_interrupt(int irq, void *context)
   return up_interrupt(&g_uart4port);
 }
 #endif
-#ifdef CONFIG_USART0_ISUART
+#ifdef CONFIG_USART0_SERIALDRIVER
 static int  up_usart0_interrupt(int irq, void *context)
 {
   return up_interrupt(&g_usart0port);
 }
 #endif
-#ifdef CONFIG_USART1_ISUART
+#ifdef CONFIG_USART1_SERIALDRIVER
 static int  up_usart1_interrupt(int irq, void *context)
 {
   return up_interrupt(&g_usart1port);
 }
 #endif
-#ifdef CONFIG_USART2_ISUART
+#ifdef CONFIG_USART2_SERIALDRIVER
 static int  up_usart2_interrupt(int irq, void *context)
 {
   return up_interrupt(&g_usart2port);
 }
 #endif
-#ifdef CONFIG_USART3_ISUART
+#ifdef CONFIG_USART3_SERIALDRIVER
 static int  up_usart3_interrupt(int irq, void *context)
 {
   return up_interrupt(&g_usart3port);
 }
 #endif
-#ifdef CONFIG_USART4_ISUART
+#ifdef CONFIG_USART4_SERIALDRIVER
 static int  up_usart4_interrupt(int irq, void *context)
 {
   return up_interrupt(&g_usart4port);

arch/arm/src/samdl/Kconfig

@@ -590,7 +590,6 @@ config SAMDL_SERCOM0_ISSPI
 config SAMDL_SERCOM0_ISUSART
 	bool "USART"
 	select USART0_SERIALDRIVER
-	select USART0_ISUART
 
 endchoice
 
@@ -624,7 +623,6 @@ config SAMDL_SERCOM1_ISSPI
 config SAMDL_SERCOM1_ISUSART
 	bool "USART"
 	select USART1_SERIALDRIVER
-	select USART1_ISUART
 
 endchoice
 
@@ -644,7 +642,6 @@ config SAMDL_SERCOM2_ISSPI
 config SAMDL_SERCOM2_ISUSART
 	bool "USART"
 	select USART2_SERIALDRIVER
-	select USART2_ISUART
 
 endchoice
 
@@ -664,7 +661,6 @@ config SAMDL_SERCOM3_ISSPI
 config SAMDL_SERCOM3_ISUSART
 	bool "USART"
 	select USART3_SERIALDRIVER
-	select USART3_ISUART
 
 endchoice
 
@@ -684,7 +680,6 @@ config SAMDL_SERCOM4_ISSPI
 config SAMDL_SERCOM4_ISUSART
 	bool "USART"
 	select USART4_SERIALDRIVER
-	select USART4_ISUART
 
 endchoice
 
@@ -704,7 +699,6 @@ config SAMDL_SERCOM5_ISSPI
 config SAMDL_SERCOM5_ISUSART
 	bool "USART"
 	select USART5_SERIALDRIVER
-	select USART5_ISUART
 
 endchoice
 

arch/arm/src/samdl/sam_config.h

@@ -56,7 +56,7 @@
 #define SAMDL_HAVE_USART5 1
 
 #if !defined(CONFIG_SAMDL_SERCOM0) || !defined(CONFIG_SAMDL_SERCOM0_ISUSART) || \
-    !defined(CONFIG_USART0_ISUART)
+    !defined(CONFIG_USART0_SERIALDRIVER)
 #  undef SAMDL_HAVE_USART0
 #  undef CONFIG_SAMDL_SERCOM0_ISUSART
 #  undef CONFIG_USART0_SERIAL_CONSOLE
@@ -66,7 +66,7 @@
 #endif
 
 #if !defined(CONFIG_SAMDL_SERCOM1) || !defined(CONFIG_SAMDL_SERCOM1_ISUSART) || \
-    !defined(CONFIG_USART1_ISUART)
+    !defined(CONFIG_USART1_SERIALDRIVER)
 #  undef SAMDL_HAVE_USART1
 #  undef CONFIG_SAMDL_SERCOM1_ISUSART
 #  undef CONFIG_USART1_SERIAL_CONSOLE
@@ -76,7 +76,7 @@
 #endif
 
 #if !defined(CONFIG_SAMDL_SERCOM2) || !defined(CONFIG_SAMDL_SERCOM2_ISUSART) || \
-    !defined(CONFIG_USART2_ISUART)
+    !defined(CONFIG_USART2_SERIALDRIVER)
 #  undef SAMDL_HAVE_USART2
 #  undef CONFIG_SAMDL_SERCOM2_ISUSART
 #  undef CONFIG_USART2_SERIAL_CONSOLE
@@ -86,7 +86,7 @@
 #endif
 
 #if !defined(CONFIG_SAMDL_SERCOM3) || !defined(CONFIG_SAMDL_SERCOM3_ISUSART) || \
-    !defined(CONFIG_USART3_ISUART)
+    !defined(CONFIG_USART3_SERIALDRIVER)
 #  undef SAMDL_HAVE_USART3
 #  undef CONFIG_SAMDL_SERCOM3_ISUSART
 #  undef CONFIG_USART3_SERIAL_CONSOLE
@@ -96,7 +96,7 @@
 #endif
 
 #if !defined(CONFIG_SAMDL_SERCOM4) || !defined(CONFIG_SAMDL_SERCOM4_ISUSART) || \
-    !defined(CONFIG_USART4_ISUART)
+    !defined(CONFIG_USART4_SERIALDRIVER)
 #  undef SAMDL_HAVE_USART4
 #  undef CONFIG_SAMDL_SERCOM4_ISUSART
 #  undef CONFIG_USART4_SERIAL_CONSOLE
@@ -106,7 +106,7 @@
 #endif
 
 #if !defined(CONFIG_SAMDL_SERCOM5) || !defined(CONFIG_SAMDL_SERCOM5_ISUSART) || \
-    !defined(CONFIG_USART5_ISUART)
+    !defined(CONFIG_USART5_SERIALDRIVER)
 #  undef SAMDL_HAVE_USART5
 #  undef CONFIG_SAMDL_SERCOM5_ISUSART
 #  undef CONFIG_USART5_SERIAL_CONSOLE

arch/arm/src/samv7/sam_config.h

@@ -113,19 +113,19 @@
  * enabled for our purposes.
  */
 
-#if !defined(CONFIG_USART0_ISUART) && !defined(CONFIG_USART0_ISSPI)
+#if !defined(CONFIG_USART0_SERIALDRIVER) && !defined(CONFIG_USART0_ISSPI)
 #  undef CONFIG_SAMV7_USART0
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART0_IFLOWCONTROL
 #endif
 
-#if !defined(CONFIG_USART1_ISUART) && !defined(CONFIG_USART1_ISSPI)
+#if !defined(CONFIG_USART1_SERIALDRIVER) && !defined(CONFIG_USART1_ISSPI)
 #  undef CONFIG_SAMV7_USART1
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #  undef CONFIG_USART1_IFLOWCONTROL
 #endif
 
-#if !defined(CONFIG_USART2_ISUART) && !defined(CONFIG_USART2_ISSPI)
+#if !defined(CONFIG_USART2_SERIALDRIVER) && !defined(CONFIG_USART2_ISSPI)
 #  undef CONFIG_SAMV7_USART2
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  undef CONFIG_USART2_IFLOWCONTROL

arch/arm/src/samv7/sam_serial.c

@@ -123,13 +123,13 @@
 #  elif defined(CONFIG_SAMV7_UART4)
 #    define TTYS0_DEV           g_uart4port  /* UART4 is ttyS0 */
 #    define UART4_ASSIGNED      1
-#  elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
+#  elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
 #    define TTYS0_DEV           g_usart0port /* USART0 is ttyS0 */
 #    define USART0_ASSIGNED     1
-#  elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
+#  elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
 #    define TTYS0_DEV           g_usart1port /* USART1 is ttyS0 */
 #    define USART1_ASSIGNED     1
-#  elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
+#  elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
 #    define TTYS0_DEV           g_usart2port /* USART2 is ttyS0 */
 #    define USART2_ASSIGNED     1
 #  endif
@@ -154,15 +154,15 @@
 #elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS1_DEV           g_uart4port  /* UART4 is ttyS1 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
      !defined(USART0_ASSIGNED)
 #  define TTYS1_DEV           g_usart0port /* USART0 is ttyS1 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
      !defined(USART1_ASSIGNED)
 #  define TTYS1_DEV           g_usart1port /* USART1 is ttyS1 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
      !defined(USART2_ASSIGNED)
 #  define TTYS1_DEV           g_usart2port /* USART2 is ttyS1 */
 #  define USART2_ASSIGNED     1
@@ -185,15 +185,15 @@
 #elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS2_DEV           g_uart4port  /* UART4 is ttyS2 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
      !defined(USART0_ASSIGNED)
 #  define TTYS2_DEV           g_usart0port /* USART0 is ttyS2 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
      !defined(USART1_ASSIGNED)
 #  define TTYS2_DEV           g_usart1port /* USART1 is ttyS2 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
      !defined(USART2_ASSIGNED)
 #  define TTYS2_DEV           g_usart2port /* USART2 is ttyS2 */
 #  define USART2_ASSIGNED     1
@@ -213,15 +213,15 @@
 #elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS3_DEV           g_uart4port  /* UART4 is ttyS3 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
      !defined(USART0_ASSIGNED)
 #  define TTYS3_DEV           g_usart0port /* USART0 is ttyS3 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
      !defined(USART1_ASSIGNED)
 #  define TTYS3_DEV           g_usart1port /* USART1 is ttyS3 */
 #  define USART1_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
      !defined(USART2_ASSIGNED)
 #  define TTYS3_DEV           g_usart2port /* USART2 is ttyS3 */
 #  define USART2_ASSIGNED     1
@@ -238,15 +238,15 @@
 #elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS4_DEV           g_uart4port  /* UART4 is ttyS4 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
      !defined(USART0_ASSIGNED)
 #  define TTYS4_DEV           g_usart0port /* USART0 is ttyS4 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
      !defined(USART1_ASSIGNED)
 #  define TTYS4_DEV           g_usart1port /* USART1 is ttyS4 */
 #  define USART1_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
      !defined(USART2_ASSIGNED)
 #  define TTYS4_DEV           g_usart2port /* USART2 is ttyS4 */
 #  define USART2_ASSIGNED      1
@@ -260,15 +260,15 @@
 #if defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
 #  define TTYS5_DEV           g_uart4port  /* UART4 is ttyS5 */
 #  define UART4_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
      !defined(USART0_ASSIGNED)
 #  define TTYS5_DEV           g_usart0port /* USART0 is ttyS5 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
      !defined(USART1_ASSIGNED)
 #  define TTYS5_DEV           g_usart1port /* USART1 is ttyS5 */
 #  define USART1_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
      !defined(USART2_ASSIGNED)
 #  define TTYS5_DEV           g_usart2port /* USART2 is ttyS5 */
 #  define USART2_ASSIGNED      1
@@ -279,15 +279,15 @@
  * One of USART0-2 could also be the console.
  */
 
-#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
+#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
    !defined(USART0_ASSIGNED)
 #  define TTYS6_DEV           g_usart0port /* USART0 is ttyS6 */
 #  define USART0_ASSIGNED     1
-#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
      !defined(USART1_ASSIGNED)
 #  define TTYS6_DEV           g_usart1port /* USART1 is ttyS6 */
 #  define USART1_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
      !defined(USART2_ASSIGNED)
 #  define TTYS6_DEV           g_usart2port /* USART2 is ttyS6 */
 #  define USART2_ASSIGNED      1
@@ -298,11 +298,11 @@
  * One of of USART1-2 could also be the console.
  */
 
-#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
+#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
    !defined(USART1_ASSIGNED)
 #  define TTYS7_DEV           g_usart1port /* USART1 is ttyS7 */
 #  define USART1_ASSIGNED      1
-#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
+#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
      !defined(USART2_ASSIGNED)
 #  define TTYS7_DEV           g_usart2port /* USART2 is ttyS7 */
 #  define USART2_ASSIGNED      1
@@ -369,13 +369,13 @@ static int  sam_uart3_interrupt(int irq, void *context);
 #ifdef CONFIG_SAMV7_UART4
 static int  sam_uart4_interrupt(int irq, void *context);
 #endif
-#if defined(CONFIG_SAMV7_USART0) &&  defined(CONFIG_USART0_ISUART)
+#if defined(CONFIG_SAMV7_USART0) &&  defined(CONFIG_USART0_SERIALDRIVER)
 static int  sam_usart0_interrupt(int irq, void *context);
 #endif
-#if defined(CONFIG_SAMV7_USART1) &&  defined(CONFIG_USART1_ISUART)
+#if defined(CONFIG_SAMV7_USART1) &&  defined(CONFIG_USART1_SERIALDRIVER)
 static int  sam_usart1_interrupt(int irq, void *context);
 #endif
-#if defined(CONFIG_SAMV7_USART2) &&  defined(CONFIG_USART2_ISUART)
+#if defined(CONFIG_SAMV7_USART2) &&  defined(CONFIG_USART2_SERIALDRIVER)
 static int  sam_usart2_interrupt(int irq, void *context);
 #endif
 static int  sam_ioctl(struct file *filep, int cmd, unsigned long arg);
@@ -432,15 +432,15 @@ static char g_uart3txbuffer[CONFIG_UART3_TXBUFSIZE];
 static char g_uart4rxbuffer[CONFIG_UART4_RXBUFSIZE];
 static char g_uart4txbuffer[CONFIG_UART4_TXBUFSIZE];
 #endif
-#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
+#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
 static char g_usart0rxbuffer[CONFIG_USART0_RXBUFSIZE];
 static char g_usart0txbuffer[CONFIG_USART0_TXBUFSIZE];
 #endif
-#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
+#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
 static char g_usart1rxbuffer[CONFIG_USART1_RXBUFSIZE];
 static char g_usart1txbuffer[CONFIG_USART1_TXBUFSIZE];
 #endif
-#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
+#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
 static char g_usart2rxbuffer[CONFIG_USART2_RXBUFSIZE];
 static char g_usart2txbuffer[CONFIG_USART2_TXBUFSIZE];
 #endif
@@ -602,7 +602,7 @@ static uart_dev_t g_uart4port =
 
 /* This describes the state of the USART0 port. */
 
-#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
+#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
 static struct sam_dev_s g_usart0priv =
 {
   .usartbase      = SAM_USART0_BASE,
@@ -636,7 +636,7 @@ static uart_dev_t g_usart0port =
 
 /* This describes the state of the USART1 port. */
 
-#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
+#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
 static struct sam_dev_s g_usart1priv =
 {
   .usartbase      = SAM_USART1_BASE,
@@ -670,7 +670,7 @@ static uart_dev_t g_usart1port =
 
 /* This describes the state of the USART2 port. */
 
-#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
+#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
 static struct sam_dev_s g_usart2priv =
 {
   .usartbase      = SAM_USART2_BASE,
@@ -1115,19 +1115,19 @@ static int  sam_uart4_interrupt(int irq, void *context)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
+#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
 static int  sam_usart0_interrupt(int irq, void *context)
 {
   return sam_interrupt(&g_usart0port);
 }
 #endif
-#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
+#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
 static int  sam_usart1_interrupt(int irq, void *context)
 {
   return sam_interrupt(&g_usart1port);
 }
 #endif
-#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
+#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
 static int  sam_usart2_interrupt(int irq, void *context)
 {
   return sam_interrupt(&g_usart2port);

arch/arm/src/stm32f7/stm32_config.h

@@ -113,13 +113,13 @@
  * for our purposes.
  */
 
-#ifndef CONFIG_USART0_ISUART
+#ifndef CONFIG_USART0_SERIALDRIVER
 #  undef CONFIG_STM32F7_USART0
 #endif
-#ifndef CONFIG_USART1_ISUART
+#ifndef CONFIG_USART1_SERIALDRIVER
 #  undef CONFIG_STM32F7_USART1
 #endif
-#ifndef CONFIG_USART2_ISUART
+#ifndef CONFIG_USART2_SERIALDRIVER
 #  undef CONFIG_STM32F7_USART2
 #endif
 

arch/avr/src/at32uc3/Kconfig

@@ -73,18 +73,15 @@ menu "AT32U3 Peripheral Selections"
 config AVR32_USART0
 	bool "USART0"
 	default n
-	select USART0_SERIALDRIVER
 
 config AVR32_USART1
 	bool "USART1"
 	default n
-	select USART1_SERIALDRIVER
 
 config AVR32_USART2
 	bool "USART2"
 	default n
 	depends on ARCH_CHIP_AT32UC3B0
-	select USART2_SERIALDRIVER
 
 endmenu # AT32U3 Peripheral Selections
 
@@ -108,7 +105,7 @@ config AVR32_USART0_MODEM
 
 config AVR32_USART0_RS232
 	bool "USART0 is RS-232"
-	select USART0_ISUART
+	select USART0_SERIALDRIVER
 
 config AVR32_USART0_RS485
 	bool "USART0 is RS-485"
@@ -140,7 +137,7 @@ config AVR32_USART1_MODEM
 
 config AVR32_USART1_RS232
 	bool "USART1 is RS-232"
-	select USART1_ISUART
+	select USART1_SERIALDRIVER
 
 config AVR32_USART1_RS485
 	bool "USART1 is RS-485"
@@ -172,7 +169,7 @@ config AVR32_USART2_MODEM
 
 config AVR32_USART2_RS232
 	bool "USART2 is RS-232"
-	select USART2_ISUART
+	select USART2_SERIALDRIVER
 
 config AVR32_USART2_RS485
 	bool "USART2 is RS-485"

configs/amber/hello/defconfig

@@ -243,7 +243,6 @@ CONFIG_USART0_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART0_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_USART0_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set

configs/arduino-due/README.txt

@@ -822,10 +822,10 @@ Arduino DUE-specific Configuration Options
     CONFIG_SAM34_GPIOD_IRQ
     CONFIG_SAM34_GPIOE_IRQ
     CONFIG_SAM34_GPIOF_IRQ
-    CONFIG_USART0_ISUART
+    CONFIG_USART0_SERIALDRIVER
-    CONFIG_USART1_ISUART
+    CONFIG_USART1_SERIALDRIVER
-    CONFIG_USART2_ISUART
+    CONFIG_USART2_SERIALDRIVER
-    CONFIG_USART3_ISUART
+    CONFIG_USART3_SERIALDRIVER
 
   ST91SAM4S specific device driver settings
 
@@ -885,7 +885,7 @@ Configurations
        Board Selection -> Peripheral
          CONFIG_SAM34_UART0=n              : Disable UART0.  Can't use with this shield
          CONFIG_SAM34_USART0=y             : Enable USART0
-         CONFIG_USART0_ISUART=y
+         CONFIG_USART0_SERIALDRIVER=y
 
        Device Drivers -> Serial
          CONFIG_USART0_SERIAL_CONSOLE=y    : Configure the console on USART0
@@ -966,7 +966,7 @@ Configuration sub-directories
        Board Selection -> Peripheral
          CONFIG_SAM34_UART0=n              : Disable UART0.  Can't use with this shield
          CONFIG_SAM34_USART0=y             : Enable USART0
-         CONFIG_USART0_ISUART=y
+         CONFIG_USART0_SERIALDRIVER=y
 
        Device Drivers -> Serial
          CONFIG_USART0_SERIAL_CONSOLE=y    : Configure the console on USART0

configs/arduino-mega2560/hello/defconfig

@@ -327,7 +327,6 @@ CONFIG_USART0_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART0_ISUART=y
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set

configs/arduino-mega2560/nsh/defconfig

@@ -335,7 +335,6 @@ CONFIG_USART0_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART0_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/avr32dev1/nsh/defconfig

@@ -281,7 +281,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_USART1_SERIAL_CONSOLE=y

configs/avr32dev1/ostest/defconfig

@@ -280,7 +280,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set

configs/cloudctrl/nsh/defconfig

@@ -813,7 +813,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2

configs/fire-stm32v2/nsh/defconfig

@@ -819,8 +819,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/hymini-stm32v/buttons/defconfig

@@ -703,7 +703,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/hymini-stm32v/nsh/defconfig

@@ -732,7 +732,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/hymini-stm32v/nsh2/defconfig

@@ -820,7 +820,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/hymini-stm32v/usbmsc/defconfig

@@ -727,8 +727,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/hymini-stm32v/usbnsh/defconfig

@@ -706,7 +706,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/hymini-stm32v/usbserial/defconfig

@@ -712,8 +712,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/lpc4330-xplorer/nsh/defconfig

@@ -497,7 +497,6 @@ CONFIG_USART0_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART0_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2

configs/lpc4337-ws/nsh/defconfig

@@ -494,7 +494,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2

configs/lpc4357-evb/nsh/defconfig

@@ -429,7 +429,6 @@ CONFIG_USART0_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART0_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2

configs/lpc4370-link2/nsh/defconfig

@@ -492,7 +492,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2

configs/maple/nsh/defconfig

@@ -693,7 +693,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/maple/nx/defconfig

@@ -773,7 +773,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/maple/usbnsh/defconfig

@@ -700,7 +700,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/micropendous3/hello/defconfig

@@ -251,7 +251,6 @@ CONFIG_USART1_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set

configs/mikroe-stm32f4/fulldemo/defconfig

@@ -878,7 +878,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/mikroe-stm32f4/kostest/defconfig

@@ -829,7 +829,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/mikroe-stm32f4/nsh/defconfig

@@ -796,7 +796,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/mikroe-stm32f4/usbnsh/defconfig

@@ -805,7 +805,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/moteino-mega/hello/defconfig

@@ -300,7 +300,6 @@ CONFIG_USART0_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART0_ISUART=y
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set

configs/moteino-mega/nsh/defconfig

@@ -308,7 +308,6 @@ CONFIG_USART0_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART0_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/nucleo-144/README.txt

@@ -260,7 +260,7 @@ Serial Consoles
   Use make menuconfig to configure USART8 as the console:
 
     CONFIG_STM32F7_UART8=y
-    CONFIG_USART8_ISUART=y
+    CONFIG_USART8_SERIALDRIVER=y
     CONFIG_USART8_SERIAL_CONSOLE=y
     CONFIG_UART8_RXBUFSIZE=256
     CONFIG_UART8_TXBUFSIZE=256

configs/nucleo-144/evalos/defconfig

@@ -525,7 +525,6 @@ CONFIG_USART3_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART3_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/nucleo-144/nsh/defconfig

@@ -510,7 +510,6 @@ CONFIG_USART6_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART6_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/nucleo-f4x1re/README.txt

@@ -395,7 +395,7 @@ Serial Consoles
   To configure USART1 as the console:
 
     CONFIG_STM32_USART1=y
-    CONFIG_USART1_ISUART=y
+    CONFIG_USART1_SERIALDRIVER=y
     CONFIG_USART1_SERIAL_CONSOLE=y
     CONFIG_USART1_RXBUFSIZE=256
     CONFIG_USART1_TXBUFSIZE=256
@@ -434,7 +434,7 @@ Serial Consoles
   To configure USART2 as the console:
 
     CONFIG_STM32_USART2=y
-    CONFIG_USART2_ISUART=y
+    CONFIG_USART2_SERIALDRIVER=y
     CONFIG_USART2_SERIAL_CONSOLE=y
     CONFIG_USART2_RXBUFSIZE=256
     CONFIG_USART2_TXBUFSIZE=256
@@ -455,7 +455,7 @@ Serial Consoles
   To configure USART6 as the console:
 
     CONFIG_STM32_USART6=y
-    CONFIG_USART6_ISUART=y
+    CONFIG_USART6_SERIALDRIVER=y
     CONFIG_USART6_SERIAL_CONSOLE=y
     CONFIG_USART6_RXBUFSIZE=256
     CONFIG_USART6_TXBUFSIZE=256

configs/nucleo-f4x1re/f401-nsh/defconfig

@@ -708,7 +708,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/nucleo-f4x1re/f411-nsh/defconfig

@@ -710,7 +710,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/nucleo-l476rg/README.txt

@@ -377,7 +377,7 @@ Serial Consoles
   To configure USART1 as the console:
 
     CONFIG_STM32_USART1=y
-    CONFIG_USART1_ISUART=y
+    CONFIG_USART1_SERIALDRIVER=y
     CONFIG_USART1_SERIAL_CONSOLE=y
     CONFIG_USART1_RXBUFSIZE=256
     CONFIG_USART1_TXBUFSIZE=256
@@ -416,7 +416,7 @@ Serial Consoles
   To configure USART2 as the console:
 
     CONFIG_STM32_USART2=y
-    CONFIG_USART2_ISUART=y
+    CONFIG_USART2_SERIALDRIVER=y
     CONFIG_USART2_SERIAL_CONSOLE=y
     CONFIG_USART2_RXBUFSIZE=256
     CONFIG_USART2_TXBUFSIZE=256
@@ -437,7 +437,7 @@ Serial Consoles
   To configure USART6 as the console:
 
     CONFIG_STM32_USART6=y
-    CONFIG_USART6_ISUART=y
+    CONFIG_USART6_SERIALDRIVER=y
     CONFIG_USART6_SERIAL_CONSOLE=y
     CONFIG_USART6_RXBUFSIZE=256
     CONFIG_USART6_TXBUFSIZE=256

configs/nucleo-l476rg/nsh/defconfig

@@ -585,7 +585,6 @@ CONFIG_USART2_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set

configs/olimex-stm32-h405/usbnsh/defconfig

@@ -772,7 +772,6 @@ CONFIG_USART3_SERIALDRIVER=y
 #
 # USART Configuration
 #
-CONFIG_USART3_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set