diff --git a/arch/arm/src/efm32/Kconfig b/arch/arm/src/efm32/Kconfig index e391183f97a..ad1abfbfa06 100644 --- a/arch/arm/src/efm32/Kconfig +++ b/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 diff --git a/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c index 88be9f0752c..13d5046ef08 100644 --- a/arch/arm/src/sam34/sam_lowputc.c +++ b/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 diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c index 306a1210ea5..46df27954a1 100644 --- a/arch/arm/src/sam34/sam_serial.c +++ b/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 diff --git a/arch/arm/src/sama5/sam_config.h b/arch/arm/src/sama5/sam_config.h index 650d6c15032..14ab9b8dcfa 100644 --- a/arch/arm/src/sama5/sam_config.h +++ b/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 diff --git a/arch/arm/src/sama5/sam_flexcom_serial.c b/arch/arm/src/sama5/sam_flexcom_serial.c index c65c1aab474..c0d4693ac86 100644 --- a/arch/arm/src/sama5/sam_flexcom_serial.c +++ b/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); diff --git a/arch/arm/src/sama5/sam_lowputc.c b/arch/arm/src/sama5/sam_lowputc.c index 84e7a37d213..f94f6f05167 100644 --- a/arch/arm/src/sama5/sam_lowputc.c +++ b/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 diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c index 0083606dba1..a73ac33cd24 100644 --- a/arch/arm/src/sama5/sam_serial.c +++ b/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); diff --git a/arch/arm/src/samdl/Kconfig b/arch/arm/src/samdl/Kconfig index ea7a54a7fb3..a890db6a0fd 100644 --- a/arch/arm/src/samdl/Kconfig +++ b/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 diff --git a/arch/arm/src/samdl/sam_config.h b/arch/arm/src/samdl/sam_config.h index 846e3291d31..db85694e5d2 100644 --- a/arch/arm/src/samdl/sam_config.h +++ b/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 diff --git a/arch/arm/src/samv7/sam_config.h b/arch/arm/src/samv7/sam_config.h index 242c2eb5037..05e6db84f11 100644 --- a/arch/arm/src/samv7/sam_config.h +++ b/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 diff --git a/arch/arm/src/samv7/sam_serial.c b/arch/arm/src/samv7/sam_serial.c index bb7827ea636..6744a72ce2e 100644 --- a/arch/arm/src/samv7/sam_serial.c +++ b/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); diff --git a/arch/arm/src/stm32f7/stm32_config.h b/arch/arm/src/stm32f7/stm32_config.h index 09762b9c6b6..d26fee87139 100644 --- a/arch/arm/src/stm32f7/stm32_config.h +++ b/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 diff --git a/arch/avr/src/at32uc3/Kconfig b/arch/avr/src/at32uc3/Kconfig index 1528a3682de..4f244e530cb 100644 --- a/arch/avr/src/at32uc3/Kconfig +++ b/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" diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig index 776b8f2eefd..5c62c54f886 100644 --- a/configs/amber/hello/defconfig +++ b/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 diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt index 290c095ef3a..e128fb71d68 100644 --- a/configs/arduino-due/README.txt +++ b/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_USART1_ISUART - CONFIG_USART2_ISUART - CONFIG_USART3_ISUART + CONFIG_USART0_SERIALDRIVER + CONFIG_USART1_SERIALDRIVER + CONFIG_USART2_SERIALDRIVER + 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 diff --git a/configs/arduino-mega2560/hello/defconfig b/configs/arduino-mega2560/hello/defconfig index 987dff0f7d5..4459053ee1b 100644 --- a/configs/arduino-mega2560/hello/defconfig +++ b/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 diff --git a/configs/arduino-mega2560/nsh/defconfig b/configs/arduino-mega2560/nsh/defconfig index efca605df16..9aee289d6d7 100644 --- a/configs/arduino-mega2560/nsh/defconfig +++ b/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 diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig index 77eced83ba3..0f87f200461 100644 --- a/configs/avr32dev1/nsh/defconfig +++ b/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 diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig index c0e4f0ff5ce..6fc2eed59f4 100644 --- a/configs/avr32dev1/ostest/defconfig +++ b/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 diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig index 3f94800d4bb..1ad599bdb47 100644 --- a/configs/cloudctrl/nsh/defconfig +++ b/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 diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig index bf83254989b..62c9eab5944 100644 --- a/configs/fire-stm32v2/nsh/defconfig +++ b/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 diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig index 81dc4c32aec..2de9a25b331 100644 --- a/configs/hymini-stm32v/buttons/defconfig +++ b/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 diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig index 6435625a709..2db32fd210e 100644 --- a/configs/hymini-stm32v/nsh/defconfig +++ b/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 diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index eaada2fb30c..71705a0361e 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/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 diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig index 8ba24dece5b..be1eeeef987 100644 --- a/configs/hymini-stm32v/usbmsc/defconfig +++ b/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 diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig index a8e5fefe5c7..9cf98c3df9a 100644 --- a/configs/hymini-stm32v/usbnsh/defconfig +++ b/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 diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig index 8f7b9144e61..4b242e01a55 100644 --- a/configs/hymini-stm32v/usbserial/defconfig +++ b/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 diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig index a3e6787ee51..a6a461ba6c9 100644 --- a/configs/lpc4330-xplorer/nsh/defconfig +++ b/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 diff --git a/configs/lpc4337-ws/nsh/defconfig b/configs/lpc4337-ws/nsh/defconfig index 76e4c657dd7..4f36719c26f 100644 --- a/configs/lpc4337-ws/nsh/defconfig +++ b/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 diff --git a/configs/lpc4357-evb/nsh/defconfig b/configs/lpc4357-evb/nsh/defconfig index eabdacbbe50..e1f25c97d57 100644 --- a/configs/lpc4357-evb/nsh/defconfig +++ b/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 diff --git a/configs/lpc4370-link2/nsh/defconfig b/configs/lpc4370-link2/nsh/defconfig index 8d46af3627b..8a14cef0675 100644 --- a/configs/lpc4370-link2/nsh/defconfig +++ b/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 diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig index 7cadcc1cae5..5233c526902 100644 --- a/configs/maple/nsh/defconfig +++ b/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 diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig index 39241301fc7..a6f7707e81c 100644 --- a/configs/maple/nx/defconfig +++ b/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 diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig index 3752fd47c98..42ace19439f 100644 --- a/configs/maple/usbnsh/defconfig +++ b/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 diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig index 83b31bfeb64..a1a6f7ceeca 100644 --- a/configs/micropendous3/hello/defconfig +++ b/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 diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig index da949f7c055..dc0899b6dd4 100644 --- a/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/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 diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig index 719709c2e32..92b18878d68 100644 --- a/configs/mikroe-stm32f4/kostest/defconfig +++ b/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 diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig index c30de1609bb..506a161bbb3 100644 --- a/configs/mikroe-stm32f4/nsh/defconfig +++ b/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 diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig index 3e81c9d2168..12c9e850a9b 100644 --- a/configs/mikroe-stm32f4/usbnsh/defconfig +++ b/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 diff --git a/configs/moteino-mega/hello/defconfig b/configs/moteino-mega/hello/defconfig index f6ce9e582bf..92218c71f21 100644 --- a/configs/moteino-mega/hello/defconfig +++ b/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 diff --git a/configs/moteino-mega/nsh/defconfig b/configs/moteino-mega/nsh/defconfig index 2aece637922..3625027ae26 100644 --- a/configs/moteino-mega/nsh/defconfig +++ b/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 diff --git a/configs/nucleo-144/README.txt b/configs/nucleo-144/README.txt index 77ca0f01707..e99cd427de3 100644 --- a/configs/nucleo-144/README.txt +++ b/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 diff --git a/configs/nucleo-144/evalos/defconfig b/configs/nucleo-144/evalos/defconfig index 1fdee8d4eef..9944952cac6 100644 --- a/configs/nucleo-144/evalos/defconfig +++ b/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 diff --git a/configs/nucleo-144/nsh/defconfig b/configs/nucleo-144/nsh/defconfig index 218ea02fa2e..cb59abca25c 100644 --- a/configs/nucleo-144/nsh/defconfig +++ b/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 diff --git a/configs/nucleo-f4x1re/README.txt b/configs/nucleo-f4x1re/README.txt index 066474d69e1..4a84121a400 100644 --- a/configs/nucleo-f4x1re/README.txt +++ b/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 diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig index d0b8683cd2b..08158babad6 100644 --- a/configs/nucleo-f4x1re/f401-nsh/defconfig +++ b/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 diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig index 55c28f55b36..eabffcc9ee3 100644 --- a/configs/nucleo-f4x1re/f411-nsh/defconfig +++ b/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 diff --git a/configs/nucleo-l476rg/README.txt b/configs/nucleo-l476rg/README.txt index ab8ff50b27a..d576d83d880 100644 --- a/configs/nucleo-l476rg/README.txt +++ b/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 diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig index ea1bc23ad75..4f2c7c8da4e 100644 --- a/configs/nucleo-l476rg/nsh/defconfig +++ b/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 diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig index 08d6d0df6db..c4eb5670665 100644 --- a/configs/olimex-stm32-h405/usbnsh/defconfig +++ b/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 diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig index 1ad8fcc6244..a06e8ce6f7e 100644 --- a/configs/olimex-stm32-h407/nsh/defconfig +++ b/configs/olimex-stm32-h407/nsh/defconfig @@ -732,7 +732,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 diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig index e5be82f83f3..fd285300297 100644 --- a/configs/olimex-stm32-p107/nsh/defconfig +++ b/configs/olimex-stm32-p107/nsh/defconfig @@ -799,7 +799,6 @@ CONFIG_USART2_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART2_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig index b0bbad23691..af96f794177 100644 --- a/configs/olimex-stm32-p207/nsh/defconfig +++ b/configs/olimex-stm32-p207/nsh/defconfig @@ -839,7 +839,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 diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig index 3ce198d053d..acc1ef42ea7 100644 --- a/configs/olimexino-stm32/can/defconfig +++ b/configs/olimexino-stm32/can/defconfig @@ -769,7 +769,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig index 4ce578d1b5f..3403023d025 100644 --- a/configs/olimexino-stm32/composite/defconfig +++ b/configs/olimexino-stm32/composite/defconfig @@ -771,8 +771,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_NPOLLWAITERS=2 diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig index 8a4fe99f49e..b0c9ae6873f 100644 --- a/configs/olimexino-stm32/nsh/defconfig +++ b/configs/olimexino-stm32/nsh/defconfig @@ -769,8 +769,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_NPOLLWAITERS=2 diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig index 7f2d768429b..aa6998750ac 100644 --- a/configs/olimexino-stm32/smallnsh/defconfig +++ b/configs/olimexino-stm32/smallnsh/defconfig @@ -747,7 +747,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig index 43396831d7d..2863be38807 100644 --- a/configs/olimexino-stm32/tiny/defconfig +++ b/configs/olimexino-stm32/tiny/defconfig @@ -751,7 +751,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/sam3u-ek/README.txt b/configs/sam3u-ek/README.txt index d2e92fb08be..2a03890a2ca 100644 --- a/configs/sam3u-ek/README.txt +++ b/configs/sam3u-ek/README.txt @@ -379,10 +379,10 @@ SAM3U-EK-specific Configuration Options CONFIG_SAM34_GPIOA_IRQ CONFIG_SAM34_GPIOB_IRQ CONFIG_SAM34_GPIOC_IRQ - CONFIG_USART0_ISUART - CONFIG_USART1_ISUART - CONFIG_USART2_ISUART - CONFIG_USART3_ISUART + CONFIG_USART0_SERIALDRIVER + CONFIG_USART1_SERIALDRIVER + CONFIG_USART2_SERIALDRIVER + CONFIG_USART3_SERIALDRIVER CONFIG_SAM34_NAND - NAND memory SAM3U specific device driver settings diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt index 22f9ab157b6..90b979059ee 100644 --- a/configs/sam4e-ek/README.txt +++ b/configs/sam4e-ek/README.txt @@ -1189,10 +1189,10 @@ SAM4E-EK-specific Configuration Options CONFIG_SAM34_GPIOP_IRQ CONFIG_SAM34_GPIOQ_IRQ - CONFIG_USART0_ISUART - CONFIG_USART1_ISUART - CONFIG_USART2_ISUART - CONFIG_USART3_ISUART + CONFIG_USART0_SERIALDRIVER + CONFIG_USART1_SERIALDRIVER + CONFIG_USART2_SERIALDRIVER + CONFIG_USART3_SERIALDRIVER SAM3U specific device driver settings diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig index 0215f96eb45..869702660df 100644 --- a/configs/sam4e-ek/nsh/defconfig +++ b/configs/sam4e-ek/nsh/defconfig @@ -644,7 +644,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 diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig index ae9b420787e..5e2ebc17c0e 100644 --- a/configs/sam4e-ek/nxwm/defconfig +++ b/configs/sam4e-ek/nxwm/defconfig @@ -707,7 +707,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 diff --git a/configs/sam4e-ek/src/sam_boot.c b/configs/sam4e-ek/src/sam_boot.c index d0dda097b09..f103a897d8c 100644 --- a/configs/sam4e-ek/src/sam_boot.c +++ b/configs/sam4e-ek/src/sam_boot.c @@ -70,10 +70,10 @@ #ifdef CONFIG_SAM34_USART1 static inline void board_config_usart1(void) { -#if defined(CONFIG_USART1_ISUART) - (void)sam_configgpio(GPIO_RS232_ENABLE); -#else /* if defined(CONFIG_USART1_RS485) */ +#if defined(CONFIG_USART1_RS485) */ (void)sam_configgpio(GPIO_RS485_ENABLE); +#else /* if defined(CONFIG_USART1_SERIALDRIVER) */ + (void)sam_configgpio(GPIO_RS232_ENABLE); #endif } #else diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig index 3dfd0804513..58b643af0cb 100644 --- a/configs/sam4e-ek/usbnsh/defconfig +++ b/configs/sam4e-ek/usbnsh/defconfig @@ -645,7 +645,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 diff --git a/configs/sam4l-xplained/README.txt b/configs/sam4l-xplained/README.txt index de3ef5a81c9..a52b8ae8c44 100644 --- a/configs/sam4l-xplained/README.txt +++ b/configs/sam4l-xplained/README.txt @@ -566,10 +566,10 @@ SAM4L Xplained Pro-specific Configuration Options CONFIG_SAM34_GPIOA_IRQ CONFIG_SAM34_GPIOB_IRQ CONFIG_SAM34_GPIOC_IRQ - CONFIG_USART0_ISUART - CONFIG_USART1_ISUART - CONFIG_USART2_ISUART - CONFIG_USART3_ISUART + CONFIG_USART0_SERIALDRIVER + CONFIG_USART1_SERIALDRIVER + CONFIG_USART2_SERIALDRIVER + CONFIG_USART3_SERIALDRIVER ST91SAM4L specific device driver settings diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig index 9122bfc766d..223ce701c65 100644 --- a/configs/sam4l-xplained/nsh/defconfig +++ b/configs/sam4l-xplained/nsh/defconfig @@ -533,7 +533,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 diff --git a/configs/sam4s-xplained-pro/README.txt b/configs/sam4s-xplained-pro/README.txt index b0b76de1cd5..83f19be9296 100644 --- a/configs/sam4s-xplained-pro/README.txt +++ b/configs/sam4s-xplained-pro/README.txt @@ -464,10 +464,10 @@ SAM4S Xplained-specific Configuration Options CONFIG_GPIOA_IRQ CONFIG_GPIOB_IRQ CONFIG_GPIOC_IRQ - CONFIG_USART0_ISUART - CONFIG_USART1_ISUART - CONFIG_USART2_ISUART - CONFIG_USART3_ISUART + CONFIG_USART0_SERIALDRIVER + CONFIG_USART1_SERIALDRIVER + CONFIG_USART2_SERIALDRIVER + CONFIG_USART3_SERIALDRIVER ST91SAM4S specific device driver settings diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig index 76288e66757..d5008bd41a2 100644 --- a/configs/sam4s-xplained-pro/nsh/defconfig +++ b/configs/sam4s-xplained-pro/nsh/defconfig @@ -585,7 +585,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 diff --git a/configs/sam4s-xplained/README.txt b/configs/sam4s-xplained/README.txt index 4d49a0a5bf1..d5af219e241 100644 --- a/configs/sam4s-xplained/README.txt +++ b/configs/sam4s-xplained/README.txt @@ -456,10 +456,10 @@ SAM4S Xplained-specific Configuration Options CONFIG_SAM34_GPIOA_IRQ CONFIG_SAM34_GPIOB_IRQ CONFIG_SAM34_GPIOC_IRQ - CONFIG_USART0_ISUART - CONFIG_USART1_ISUART - CONFIG_USART2_ISUART - CONFIG_USART3_ISUART + CONFIG_USART0_SERIALDRIVER + CONFIG_USART1_SERIALDRIVER + CONFIG_USART2_SERIALDRIVER + CONFIG_USART3_SERIALDRIVER ST91SAM4S specific device driver settings diff --git a/configs/sama5d2-xult/README.txt b/configs/sama5d2-xult/README.txt index 8adbabe7fdf..9af903ada86 100644 --- a/configs/sama5d2-xult/README.txt +++ b/configs/sama5d2-xult/README.txt @@ -849,11 +849,11 @@ REVISIT: Unverified, cloned text from the SAMA5D4-EK README.txt CONFIG_SAMA5_PIOC_IRQ - Support PIOD interrupts CONFIG_SAMA5_PIOD_IRQ - Support PIOD interrupts - CONFIG_USART0_ISUART - Flexcom0 is configured as a UART - CONFIG_USART1_ISUART - Flexcom1 is configured as a UART - CONFIG_USART2_ISUART - Flexcom2 is configured as a UART - CONFIG_USART3_ISUART - Flexcom3 is configured as a UART - CONFIG_USART4_ISUART - Flexcom4 is configured as a UART + CONFIG_USART0_SERIALDRIVER - Flexcom0 is configured as a UART + CONFIG_USART1_SERIALDRIVER - Flexcom1 is configured as a UART + CONFIG_USART2_SERIALDRIVER - Flexcom2 is configured as a UART + CONFIG_USART3_SERIALDRIVER - Flexcom3 is configured as a UART + CONFIG_USART4_SERIALDRIVER - Flexcom4 is configured as a UART AT91SAMA5 specific device driver settings diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig index 076e2cddd3d..537cb8d4ea1 100644 --- a/configs/sama5d2-xult/nsh/defconfig +++ b/configs/sama5d2-xult/nsh/defconfig @@ -597,7 +597,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt index 5421b218f93..93cfb9a6c2e 100644 --- a/configs/sama5d3-xplained/README.txt +++ b/configs/sama5d3-xplained/README.txt @@ -2915,10 +2915,10 @@ SAMA5D3-Xplained Configuration Options CONFIG_SAMA5_PIOD_IRQ - Support PIOD interrupts CONFIG_SAMA5_PIOE_IRQ - Support PIOE interrupts - CONFIG_USART0_ISUART - USART0 is configured as a UART - CONFIG_USART1_ISUART - USART1 is configured as a UART - CONFIG_USART2_ISUART - USART2 is configured as a UART - CONFIG_USART3_ISUART - USART3 is configured as a UART + CONFIG_USART0_SERIALDRIVER - USART0 is configured as a UART + CONFIG_USART1_SERIALDRIVER - USART1 is configured as a UART + CONFIG_USART2_SERIALDRIVER - USART2 is configured as a UART + CONFIG_USART3_SERIALDRIVER - USART3 is configured as a UART AT91SAMA5 specific device driver settings diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt index 3a7ebc57294..82a5c2fd4cc 100644 --- a/configs/sama5d3x-ek/README.txt +++ b/configs/sama5d3x-ek/README.txt @@ -3240,10 +3240,10 @@ SAMA5D3x-EK Configuration Options CONFIG_SAMA5_PIOD_IRQ - Support PIOD interrupts CONFIG_SAMA5_PIOE_IRQ - Support PIOE interrupts - CONFIG_USART0_ISUART - USART0 is configured as a UART - CONFIG_USART1_ISUART - USART1 is configured as a UART - CONFIG_USART2_ISUART - USART2 is configured as a UART - CONFIG_USART3_ISUART - USART3 is configured as a UART + CONFIG_USART0_SERIALDRIVER - USART0 is configured as a UART + CONFIG_USART1_SERIALDRIVER - USART1 is configured as a UART + CONFIG_USART2_SERIALDRIVER - USART2 is configured as a UART + CONFIG_USART3_SERIALDRIVER - USART3 is configured as a UART AT91SAMA5 specific device driver settings diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig index d5feee4c2a2..fc3d188f897 100644 --- a/configs/sama5d3x-ek/demo/defconfig +++ b/configs/sama5d3x-ek/demo/defconfig @@ -674,7 +674,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 diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig index 2e3a2140224..0be49453e11 100644 --- a/configs/sama5d3x-ek/hello/defconfig +++ b/configs/sama5d3x-ek/hello/defconfig @@ -532,7 +532,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig index d88c24e581e..56b211c95f5 100644 --- a/configs/sama5d3x-ek/norboot/defconfig +++ b/configs/sama5d3x-ek/norboot/defconfig @@ -546,7 +546,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig index c9fb27f122d..78c20734934 100644 --- a/configs/sama5d3x-ek/nsh/defconfig +++ b/configs/sama5d3x-ek/nsh/defconfig @@ -550,7 +550,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 diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig index 05cb6bd9496..7a4734bead8 100644 --- a/configs/sama5d3x-ek/nx/defconfig +++ b/configs/sama5d3x-ek/nx/defconfig @@ -591,7 +591,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 diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig index 7047ef2c750..7a1878be00b 100644 --- a/configs/sama5d3x-ek/nxplayer/defconfig +++ b/configs/sama5d3x-ek/nxplayer/defconfig @@ -649,7 +649,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 diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig index 1375a49907e..5e533abf0da 100644 --- a/configs/sama5d3x-ek/nxwm/defconfig +++ b/configs/sama5d3x-ek/nxwm/defconfig @@ -649,7 +649,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 diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig index 2b3bcd4104c..c058dd759b8 100644 --- a/configs/sama5d3x-ek/ov2640/defconfig +++ b/configs/sama5d3x-ek/ov2640/defconfig @@ -617,7 +617,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt index 5f2e569a087..7e3f33bd3bb 100644 --- a/configs/sama5d4-ek/README.txt +++ b/configs/sama5d4-ek/README.txt @@ -3526,10 +3526,10 @@ SAMA4D4-EK Configuration Options CONFIG_SAMA5_PIOD_IRQ - Support PIOD interrupts CONFIG_SAMA5_PIOE_IRQ - Support PIOE interrupts - CONFIG_USART0_ISUART - USART0 is configured as a UART - CONFIG_USART1_ISUART - USART1 is configured as a UART - CONFIG_USART2_ISUART - USART2 is configured as a UART - CONFIG_USART3_ISUART - USART3 is configured as a UART + CONFIG_USART0_SERIALDRIVER - USART0 is configured as a UART + CONFIG_USART1_SERIALDRIVER - USART1 is configured as a UART + CONFIG_USART2_SERIALDRIVER - USART2 is configured as a UART + CONFIG_USART3_SERIALDRIVER - USART3 is configured as a UART AT91SAMA5 specific device driver settings diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig index ece2235e636..64151008f58 100644 --- a/configs/sama5d4-ek/at25boot/defconfig +++ b/configs/sama5d4-ek/at25boot/defconfig @@ -610,7 +610,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 diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig index 6d3cc44b76e..e777febe93b 100644 --- a/configs/sama5d4-ek/bridge/defconfig +++ b/configs/sama5d4-ek/bridge/defconfig @@ -650,7 +650,6 @@ CONFIG_USART3_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig index d0e5a8da567..f12701c0c51 100644 --- a/configs/sama5d4-ek/dramboot/defconfig +++ b/configs/sama5d4-ek/dramboot/defconfig @@ -567,7 +567,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 diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig index 233ce84fc6b..b598b3f7cc9 100644 --- a/configs/sama5d4-ek/elf/defconfig +++ b/configs/sama5d4-ek/elf/defconfig @@ -593,8 +593,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig index d0b3c361563..347761f235e 100644 --- a/configs/sama5d4-ek/ipv6/defconfig +++ b/configs/sama5d4-ek/ipv6/defconfig @@ -794,8 +794,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig index e2a4818b0b7..1992f4004bc 100644 --- a/configs/sama5d4-ek/knsh/defconfig +++ b/configs/sama5d4-ek/knsh/defconfig @@ -622,8 +622,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS index bdfbc4f2d34..a069c2d2a7d 100644 --- a/configs/sama5d4-ek/knsh/defconfig.ROMFS +++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS @@ -512,8 +512,8 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y +CONFIG_USART3_SERIALDRIVER=y +CONFIG_USART4_SERIALDRIVER=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index 78afd6d4495..eeab2f01314 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -796,8 +796,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig index 5e3cb961d52..33173d299dc 100644 --- a/configs/sama5d4-ek/nxwm/defconfig +++ b/configs/sama5d4-ek/nxwm/defconfig @@ -765,8 +765,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig index 812658acadb..4490b66233c 100644 --- a/configs/sama5d4-ek/ramtest/defconfig +++ b/configs/sama5d4-ek/ramtest/defconfig @@ -567,7 +567,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 diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig index 1034f8f4ba9..5df5b16c4d0 100644 --- a/configs/samd20-xplained/nsh/defconfig +++ b/configs/samd20-xplained/nsh/defconfig @@ -496,8 +496,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig index 57dd571fb18..1610bf7397e 100644 --- a/configs/samd21-xplained/nsh/defconfig +++ b/configs/samd21-xplained/nsh/defconfig @@ -494,8 +494,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set diff --git a/configs/same70-xplained/README.txt b/configs/same70-xplained/README.txt index 9a0ed6fa835..548e496e0a3 100644 --- a/configs/same70-xplained/README.txt +++ b/configs/same70-xplained/README.txt @@ -1139,7 +1139,7 @@ NOTES: USART1. UART3 might be a good option (the Arduino RXD/TXD): -CONFIG_SAMV7_USART1=y - -CONFIG_USART1_ISUART=y + -CONFIG_USART1_SERIALDRIVER=y -CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USART1_RXBUFSIZE=256 -CONFIG_USART1_TXBUFSIZE=256 diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig index b075b8123fc..17951d79a84 100644 --- a/configs/same70-xplained/netnsh/defconfig +++ b/configs/same70-xplained/netnsh/defconfig @@ -681,7 +681,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 diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig index c00de67abec..7a425dcb802 100644 --- a/configs/same70-xplained/nsh/defconfig +++ b/configs/same70-xplained/nsh/defconfig @@ -623,7 +623,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 diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig index 6ba6ee32eb6..c44ddac15aa 100644 --- a/configs/saml21-xplained/nsh/defconfig +++ b/configs/saml21-xplained/nsh/defconfig @@ -482,8 +482,6 @@ CONFIG_USART4_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig index c62abbd1198..93136214dec 100644 --- a/configs/samv71-xult/mxtxplnd/defconfig +++ b/configs/samv71-xult/mxtxplnd/defconfig @@ -671,7 +671,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 diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig index b331629d774..7bba67ff6e2 100644 --- a/configs/samv71-xult/nxwm/defconfig +++ b/configs/samv71-xult/nxwm/defconfig @@ -680,7 +680,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 diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig index 3297dca5aeb..8e63767f22b 100644 --- a/configs/shenzhou/nsh/defconfig +++ b/configs/shenzhou/nsh/defconfig @@ -800,7 +800,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 diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index 842129754b2..99442a110ad 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -869,7 +869,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 diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig index cbc5ad6cd5e..916a8502d32 100644 --- a/configs/shenzhou/thttpd/defconfig +++ b/configs/shenzhou/thttpd/defconfig @@ -852,7 +852,6 @@ CONFIG_USART2_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART2_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig index deade5be0df..58cc681e27b 100644 --- a/configs/spark/composite/defconfig +++ b/configs/spark/composite/defconfig @@ -758,7 +758,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 diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig index abf2cc0c744..8ca981562be 100644 --- a/configs/spark/nsh/defconfig +++ b/configs/spark/nsh/defconfig @@ -757,7 +757,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 diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig index 40f168ecb9a..67c57e2c136 100644 --- a/configs/spark/usbmsc/defconfig +++ b/configs/spark/usbmsc/defconfig @@ -757,7 +757,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 diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig index 98276db0779..19fed07df8c 100644 --- a/configs/spark/usbnsh/defconfig +++ b/configs/spark/usbnsh/defconfig @@ -751,7 +751,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 diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig index 384fabd4ef2..10d28c0afd3 100644 --- a/configs/spark/usbserial/defconfig +++ b/configs/spark/usbserial/defconfig @@ -755,7 +755,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 diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig index 01a52f0289b..79afddd8b70 100644 --- a/configs/stm3210e-eval/buttons/defconfig +++ b/configs/stm3210e-eval/buttons/defconfig @@ -704,8 +704,6 @@ CONFIG_USART2_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y -CONFIG_USART2_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig index e1bbc75a383..e5412ac4b55 100644 --- a/configs/stm3210e-eval/composite/defconfig +++ b/configs/stm3210e-eval/composite/defconfig @@ -777,8 +777,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 diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig index 9c49ac8d792..8c4cdcd5b9e 100644 --- a/configs/stm3210e-eval/nsh/defconfig +++ b/configs/stm3210e-eval/nsh/defconfig @@ -779,8 +779,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 diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index 6b8140c65e6..e4868e0d8f1 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -836,8 +836,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 diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index ea4fb79de38..0229e097f35 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -774,8 +774,6 @@ CONFIG_USART2_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y -CONFIG_USART2_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm3210e-eval/nxterm/defconfig b/configs/stm3210e-eval/nxterm/defconfig index ddbf57bf914..15309beafb5 100644 --- a/configs/stm3210e-eval/nxterm/defconfig +++ b/configs/stm3210e-eval/nxterm/defconfig @@ -770,8 +770,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 diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig index c08457d8fbd..372ead7465d 100644 --- a/configs/stm3210e-eval/pm/defconfig +++ b/configs/stm3210e-eval/pm/defconfig @@ -811,8 +811,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 diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig index 8608819a2d2..3a85f542b55 100644 --- a/configs/stm3210e-eval/usbmsc/defconfig +++ b/configs/stm3210e-eval/usbmsc/defconfig @@ -742,8 +742,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 diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig index 73fcaa4f96a..dc7cda266ea 100644 --- a/configs/stm3210e-eval/usbserial/defconfig +++ b/configs/stm3210e-eval/usbserial/defconfig @@ -718,8 +718,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 diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig index 2e500266cec..6d2dd3d1300 100644 --- a/configs/stm3220g-eval/dhcpd/defconfig +++ b/configs/stm3220g-eval/dhcpd/defconfig @@ -771,7 +771,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 diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig index e5b82e2731c..ee753d9d286 100644 --- a/configs/stm3220g-eval/nettest/defconfig +++ b/configs/stm3220g-eval/nettest/defconfig @@ -772,7 +772,6 @@ CONFIG_USART3_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig index 026d5f7d0e8..0046e360d29 100644 --- a/configs/stm3220g-eval/nsh/defconfig +++ b/configs/stm3220g-eval/nsh/defconfig @@ -836,7 +836,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 diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index 9fa572fec7c..40a6f167905 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -886,7 +886,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 diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig index 738ca2ab574..c0ea09b3bd4 100644 --- a/configs/stm3220g-eval/telnetd/defconfig +++ b/configs/stm3220g-eval/telnetd/defconfig @@ -774,7 +774,6 @@ CONFIG_USART3_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig index e4fcfe4d1e2..472b4354921 100644 --- a/configs/stm3240g-eval/dhcpd/defconfig +++ b/configs/stm3240g-eval/dhcpd/defconfig @@ -780,7 +780,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 diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig index 35e267a0ba2..2c2b2375879 100644 --- a/configs/stm3240g-eval/discover/defconfig +++ b/configs/stm3240g-eval/discover/defconfig @@ -803,7 +803,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 diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig index 9f9e8b6670f..9bc3e7f8d15 100644 --- a/configs/stm3240g-eval/knxwm/defconfig +++ b/configs/stm3240g-eval/knxwm/defconfig @@ -838,7 +838,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 diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig index e308846a287..d8aadc97fc7 100644 --- a/configs/stm3240g-eval/nettest/defconfig +++ b/configs/stm3240g-eval/nettest/defconfig @@ -781,7 +781,6 @@ CONFIG_USART3_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig index 4753f79a50a..430629d9fda 100644 --- a/configs/stm3240g-eval/nsh/defconfig +++ b/configs/stm3240g-eval/nsh/defconfig @@ -823,7 +823,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 diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig index 37325cb201a..1ce9db616c0 100644 --- a/configs/stm3240g-eval/nxterm/defconfig +++ b/configs/stm3240g-eval/nxterm/defconfig @@ -861,7 +861,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 diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index 8502894b902..db49bdef41a 100644 --- a/configs/stm3240g-eval/nxwm/defconfig +++ b/configs/stm3240g-eval/nxwm/defconfig @@ -888,7 +888,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 diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig index 762057caee7..ac29812963f 100644 --- a/configs/stm3240g-eval/telnetd/defconfig +++ b/configs/stm3240g-eval/telnetd/defconfig @@ -783,7 +783,6 @@ CONFIG_USART3_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig index 73f147bd862..646d9bce1e6 100644 --- a/configs/stm3240g-eval/webserver/defconfig +++ b/configs/stm3240g-eval/webserver/defconfig @@ -840,7 +840,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 diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig index f554369996c..97689659858 100644 --- a/configs/stm3240g-eval/xmlrpc/defconfig +++ b/configs/stm3240g-eval/xmlrpc/defconfig @@ -798,7 +798,6 @@ CONFIG_USART3_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART3_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig index 4d6fe80db6f..854d8b8fe9c 100644 --- a/configs/stm32_tiny/nsh/defconfig +++ b/configs/stm32_tiny/nsh/defconfig @@ -714,7 +714,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig index f41ed2a4c79..930370b72a7 100644 --- a/configs/stm32_tiny/usbnsh/defconfig +++ b/configs/stm32_tiny/usbnsh/defconfig @@ -689,7 +689,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 diff --git a/configs/stm32f103-minimum/nsh/defconfig b/configs/stm32f103-minimum/nsh/defconfig index 99ea9389455..7a6a1b1a50b 100644 --- a/configs/stm32f103-minimum/nsh/defconfig +++ b/configs/stm32f103-minimum/nsh/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_NPOLLWAITERS=2 diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig index d585efcdaf2..bc956ebb704 100644 --- a/configs/stm32f103-minimum/usbnsh/defconfig +++ b/configs/stm32f103-minimum/usbnsh/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 diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig index b93c3498c7f..8b933dc816f 100644 --- a/configs/stm32f3discovery/nsh/defconfig +++ b/configs/stm32f3discovery/nsh/defconfig @@ -712,7 +712,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 diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig index 65e440461ef..0e4d84ecb53 100644 --- a/configs/stm32f3discovery/usbnsh/defconfig +++ b/configs/stm32f3discovery/usbnsh/defconfig @@ -735,7 +735,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 diff --git a/configs/stm32f411e-disco/nsh/defconfig b/configs/stm32f411e-disco/nsh/defconfig index f9798b8b4c0..f8811cc2f45 100644 --- a/configs/stm32f411e-disco/nsh/defconfig +++ b/configs/stm32f411e-disco/nsh/defconfig @@ -704,7 +704,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 diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig index 9b287af9a8d..29d4d4ea4df 100644 --- a/configs/stm32f429i-disco/extflash/defconfig +++ b/configs/stm32f429i-disco/extflash/defconfig @@ -810,7 +810,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 diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig index a08f4b3c95b..7c6de919676 100644 --- a/configs/stm32f429i-disco/lcd/defconfig +++ b/configs/stm32f429i-disco/lcd/defconfig @@ -782,7 +782,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 diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig index c92f562842f..a7882e2201c 100644 --- a/configs/stm32f429i-disco/ltdc/defconfig +++ b/configs/stm32f429i-disco/ltdc/defconfig @@ -824,7 +824,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 diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig index 19f025f7188..e5061d7b104 100644 --- a/configs/stm32f429i-disco/nsh/defconfig +++ b/configs/stm32f429i-disco/nsh/defconfig @@ -740,7 +740,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 diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig index 787b971c75a..8ba6d3498e4 100644 --- a/configs/stm32f429i-disco/usbmsc/defconfig +++ b/configs/stm32f429i-disco/usbmsc/defconfig @@ -764,7 +764,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 diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig index cdb9f816a1b..2fcacfac99b 100644 --- a/configs/stm32f429i-disco/usbnsh/defconfig +++ b/configs/stm32f429i-disco/usbnsh/defconfig @@ -748,7 +748,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 diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig index c066ec4d926..ff82464253b 100644 --- a/configs/stm32f4discovery/cxxtest/defconfig +++ b/configs/stm32f4discovery/cxxtest/defconfig @@ -734,7 +734,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 diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig index 380e1405391..0aed80c7958 100644 --- a/configs/stm32f4discovery/elf/defconfig +++ b/configs/stm32f4discovery/elf/defconfig @@ -734,7 +734,6 @@ CONFIG_USART2_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART2_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig index dc0ad8bc879..cf084013adf 100644 --- a/configs/stm32f4discovery/ipv6/defconfig +++ b/configs/stm32f4discovery/ipv6/defconfig @@ -844,7 +844,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 diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig index 8186a529a8d..75ea7570024 100644 --- a/configs/stm32f4discovery/kostest/defconfig +++ b/configs/stm32f4discovery/kostest/defconfig @@ -742,7 +742,6 @@ CONFIG_USART2_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART2_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig index 501b9af1470..819ccc8abb5 100644 --- a/configs/stm32f4discovery/netnsh/defconfig +++ b/configs/stm32f4discovery/netnsh/defconfig @@ -849,7 +849,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 diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig index 67b36f6bf77..ada9987412a 100644 --- a/configs/stm32f4discovery/nsh/defconfig +++ b/configs/stm32f4discovery/nsh/defconfig @@ -749,7 +749,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 diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig index b3c3b96fe79..446ec54c27a 100644 --- a/configs/stm32f4discovery/nxlines/defconfig +++ b/configs/stm32f4discovery/nxlines/defconfig @@ -789,7 +789,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 diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig index f1fe7b04aef..d2499cde60a 100644 --- a/configs/stm32f4discovery/pm/defconfig +++ b/configs/stm32f4discovery/pm/defconfig @@ -755,7 +755,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 diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig index 378411766cb..02452b35575 100644 --- a/configs/stm32f4discovery/posix_spawn/defconfig +++ b/configs/stm32f4discovery/posix_spawn/defconfig @@ -734,7 +734,6 @@ CONFIG_USART2_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART2_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig index b015db193fc..f9c11a58b42 100644 --- a/configs/stm32f4discovery/rgbled/defconfig +++ b/configs/stm32f4discovery/rgbled/defconfig @@ -783,7 +783,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 diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig index bff1f819695..bceb08eac99 100644 --- a/configs/stm32f4discovery/usbnsh/defconfig +++ b/configs/stm32f4discovery/usbnsh/defconfig @@ -757,7 +757,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 diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig index aa65746a5eb..079f197c1ff 100644 --- a/configs/stm32f4discovery/winbuild/defconfig +++ b/configs/stm32f4discovery/winbuild/defconfig @@ -684,7 +684,6 @@ CONFIG_USART2_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART2_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/stm32f746g-disco/knsh/defconfig b/configs/stm32f746g-disco/knsh/defconfig index 322c5220bee..6edc370a236 100644 --- a/configs/stm32f746g-disco/knsh/defconfig +++ b/configs/stm32f746g-disco/knsh/defconfig @@ -520,7 +520,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 diff --git a/configs/stm32f746g-disco/netnsh/defconfig b/configs/stm32f746g-disco/netnsh/defconfig index 16e82125a52..efd988abdf9 100644 --- a/configs/stm32f746g-disco/netnsh/defconfig +++ b/configs/stm32f746g-disco/netnsh/defconfig @@ -579,7 +579,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 diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig index a50b4c08f85..fdac7f8dd68 100644 --- a/configs/stm32f746g-disco/nsh/defconfig +++ b/configs/stm32f746g-disco/nsh/defconfig @@ -512,7 +512,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 diff --git a/configs/stm32l476vg-disco/README.txt b/configs/stm32l476vg-disco/README.txt index f6f0479ad54..e8355e79bc8 100644 --- a/configs/stm32l476vg-disco/README.txt +++ b/configs/stm32l476vg-disco/README.txt @@ -379,7 +379,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 @@ -418,7 +418,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 @@ -439,7 +439,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 diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig index bd10662dfe3..1b79946f714 100644 --- a/configs/stm32l476vg-disco/nsh/defconfig +++ b/configs/stm32l476vg-disco/nsh/defconfig @@ -633,7 +633,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 diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig index d0aa56aba72..c81b4344abe 100644 --- a/configs/stm32ldiscovery/nsh/defconfig +++ b/configs/stm32ldiscovery/nsh/defconfig @@ -695,7 +695,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 diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig index edd007cacf9..19ac81a47d2 100644 --- a/configs/stm32vldiscovery/nsh/defconfig +++ b/configs/stm32vldiscovery/nsh/defconfig @@ -714,7 +714,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 diff --git a/configs/teensy-2.0/hello/defconfig b/configs/teensy-2.0/hello/defconfig index 8025d62e936..423049ad667 100644 --- a/configs/teensy-2.0/hello/defconfig +++ b/configs/teensy-2.0/hello/defconfig @@ -331,7 +331,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/teensy-2.0/nsh/defconfig b/configs/teensy-2.0/nsh/defconfig index 058e74e9ff4..eaf3e24cc9e 100644 --- a/configs/teensy-2.0/nsh/defconfig +++ b/configs/teensy-2.0/nsh/defconfig @@ -342,7 +342,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 diff --git a/configs/teensy-2.0/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig index b38d5cad914..b185f2467c6 100644 --- a/configs/teensy-2.0/usbmsc/defconfig +++ b/configs/teensy-2.0/usbmsc/defconfig @@ -364,7 +364,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig index c471b211f31..00dd9398491 100644 --- a/configs/viewtool-stm32f107/highpri/defconfig +++ b/configs/viewtool-stm32f107/highpri/defconfig @@ -718,7 +718,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig index a447f3b660b..d937ddfe500 100644 --- a/configs/viewtool-stm32f107/netnsh/defconfig +++ b/configs/viewtool-stm32f107/netnsh/defconfig @@ -777,7 +777,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig index 1a7b05a6215..f3e15c40ede 100644 --- a/configs/viewtool-stm32f107/nsh/defconfig +++ b/configs/viewtool-stm32f107/nsh/defconfig @@ -716,7 +716,6 @@ CONFIG_USART1_SERIALDRIVER=y # # USART Configuration # -CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index f524b2d7fb3..ef4858171dc 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -410,104 +410,53 @@ config SCI1_SERIALDRIVER config USART0_SERIALDRIVER bool default n + select MCU_SERIAL config USART1_SERIALDRIVER bool default n + select MCU_SERIAL config USART2_SERIALDRIVER bool default n + select MCU_SERIAL config USART3_SERIALDRIVER bool default n + select MCU_SERIAL config USART4_SERIALDRIVER bool default n + select MCU_SERIAL config USART5_SERIALDRIVER bool default n + select MCU_SERIAL config USART6_SERIALDRIVER bool default n + select MCU_SERIAL config USART7_SERIALDRIVER bool default n + select MCU_SERIAL config USART8_SERIALDRIVER bool default n + select MCU_SERIAL config OTHER_UART_SERIALDRIVER bool default n select MCU_SERIAL -# -# USARTn configuration. Is the USART configured to behave like a UART? -# - -comment "USART Configuration" - -config USART0_ISUART - bool "USART0 is a UART" - default y - depends on USART0_SERIALDRIVER - select MCU_SERIAL - -config USART1_ISUART - bool "USART1 is a UART" - default y - depends on USART1_SERIALDRIVER - select MCU_SERIAL - -config USART2_ISUART - bool "USART2 is a UART" - default y - depends on USART2_SERIALDRIVER - select MCU_SERIAL - -config USART3_ISUART - bool "USART3 is a UART" - default y - depends on USART3_SERIALDRIVER - select MCU_SERIAL - -config USART4_ISUART - bool "USART4 is a UART" - default y - depends on USART4_SERIALDRIVER - select MCU_SERIAL - -config USART5_ISUART - bool "USART5 is a UART" - default y - depends on USART5_SERIALDRIVER - select MCU_SERIAL - -config USART6_ISUART - bool "USART6 is a UART" - default y - depends on USART6_SERIALDRIVER - select MCU_SERIAL - -config USART7_ISUART - bool "USART7 is a UART" - default y - depends on USART7_SERIALDRIVER - select MCU_SERIAL - -config USART8_ISUART - bool "USART8 is a UART" - default y - depends on USART8_SERIALDRIVER - select MCU_SERIAL - config MCU_SERIAL bool default n @@ -624,7 +573,7 @@ config UART0_SERIAL_CONSOLE config USART0_SERIAL_CONSOLE bool "USART0" - depends on USART0_ISUART + depends on USART0_SERIALDRIVER config UART1_SERIAL_CONSOLE bool "UART1" @@ -632,7 +581,7 @@ config UART1_SERIAL_CONSOLE config USART1_SERIAL_CONSOLE bool "USART1" - depends on USART1_ISUART + depends on USART1_SERIALDRIVER config UART2_SERIAL_CONSOLE bool "UART2" @@ -640,7 +589,7 @@ config UART2_SERIAL_CONSOLE config USART2_SERIAL_CONSOLE bool "USART2" - depends on USART2_ISUART + depends on USART2_SERIALDRIVER config UART3_SERIAL_CONSOLE bool "UART3" @@ -656,7 +605,7 @@ config UART4_SERIAL_CONSOLE config USART4_SERIAL_CONSOLE bool "USART4" - depends on USART4_ISUART + depends on USART4_SERIALDRIVER config UART5_SERIAL_CONSOLE bool "UART5" @@ -664,7 +613,7 @@ config UART5_SERIAL_CONSOLE config USART5_SERIAL_CONSOLE bool "USART5" - depends on USART5_ISUART + depends on USART5_SERIALDRIVER config UART6_SERIAL_CONSOLE bool "UART6" @@ -672,7 +621,7 @@ config UART6_SERIAL_CONSOLE config USART6_SERIAL_CONSOLE bool "USART6" - depends on USART6_ISUART + depends on USART6_SERIALDRIVER config UART7_SERIAL_CONSOLE bool "UART7" @@ -680,7 +629,7 @@ config UART7_SERIAL_CONSOLE config USART7_SERIAL_CONSOLE bool "USART7" - depends on USART7_ISUART + depends on USART7_SERIALDRIVER config UART8_SERIAL_CONSOLE bool "UART8" @@ -688,7 +637,7 @@ config UART8_SERIAL_CONSOLE config USART8_SERIAL_CONSOLE bool "USART8" - depends on USART8_ISUART + depends on USART8_SERIALDRIVER config SCI0_SERIAL_CONSOLE bool "SCI0" @@ -841,7 +790,7 @@ config UART0_DMA endmenu menu "USART0 Configuration" - depends on USART0_ISUART + depends on USART0_SERIALDRIVER config USART0_RXBUFSIZE int "Receive buffer size" @@ -971,7 +920,7 @@ config UART1_DMA endmenu menu "USART1 Configuration" - depends on USART1_ISUART + depends on USART1_SERIALDRIVER config USART1_RXBUFSIZE int "Receive buffer size" @@ -1101,7 +1050,7 @@ config UART2_DMA endmenu menu "USART2 Configuration" - depends on USART2_ISUART + depends on USART2_SERIALDRIVER config USART2_RXBUFSIZE int "Receive buffer size" @@ -1230,7 +1179,7 @@ config UART3_DMA endmenu menu "USART3 Configuration" - depends on USART3_ISUART + depends on USART3_SERIALDRIVER config USART3_RXBUFSIZE int "Receive buffer size" @@ -1360,7 +1309,7 @@ config UART4_DMA endmenu menu "USART4 Configuration" - depends on USART4_ISUART + depends on USART4_SERIALDRIVER config USART4_RXBUFSIZE int "Receive buffer size" @@ -1490,7 +1439,7 @@ config UART5_DMA endmenu menu "USART5 Configuration" - depends on USART5_ISUART + depends on USART5_SERIALDRIVER config USART5_RXBUFSIZE int "Receive buffer size" @@ -1555,7 +1504,7 @@ config USART5_DMA endmenu menu "USART6 Configuration" - depends on USART6_ISUART + depends on USART6_SERIALDRIVER config USART6_RXBUFSIZE int "Receive buffer size" @@ -1685,7 +1634,7 @@ config UART6_DMA endmenu menu "USART7 Configuration" - depends on USART7_ISUART + depends on USART7_SERIALDRIVER config USART7_RXBUFSIZE int "Receive buffer size" @@ -1815,7 +1764,7 @@ config UART7_DMA endmenu menu "USART8 Configuration" - depends on USART8_ISUART + depends on USART8_SERIALDRIVER config USART8_RXBUFSIZE int "Receive buffer size"