diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig index 0b27615e94..48067482f8 100644 --- a/arch/arm/src/sama5/Kconfig +++ b/arch/arm/src/sama5/Kconfig @@ -823,6 +823,7 @@ choice config SAMA5_FLEXCOM0_USART bool "USART" + select SAMA5_FLEXCOM0_USART select SAMA5_FLEXCOM_USART select USART0_SERIALDRIVER select ARCH_HAVE_SERIAL_TERMIOS @@ -844,6 +845,7 @@ choice config SAMA5_FLEXCOM1_USART bool "USART" + select SAMA5_FLEXCOM1_USART select SAMA5_FLEXCOM_USART select USART1_SERIALDRIVER select ARCH_HAVE_SERIAL_TERMIOS @@ -865,6 +867,7 @@ choice config SAMA5_FLEXCOM2_USART bool "USART" + select SAMA5_FLEXCOM2_USART select SAMA5_FLEXCOM_USART select USART2_SERIALDRIVER select ARCH_HAVE_SERIAL_TERMIOS @@ -886,13 +889,14 @@ choice config SAMA5_FLEXCOM3_USART bool "USART" + select SAMA5_FLEXCOM3_USART select SAMA5_FLEXCOM_USART + select USART3_SERIALDRIVER + select ARCH_HAVE_SERIAL_TERMIOS config SAMA5_FLEXCOM3_SPI bool "SPI" select SAMA5_FLEXCOM_SPI - select USART3_SERIALDRIVER - select ARCH_HAVE_SERIAL_TERMIOS config SAMA5_FLEXCOM3_TWI bool "TWI" @@ -907,6 +911,7 @@ choice config SAMA5_FLEXCOM4_USART bool "USART" + select SAMA5_FLEXCOM4_USART select SAMA5_FLEXCOM_USART select USART4_SERIALDRIVER select ARCH_HAVE_SERIAL_TERMIOS diff --git a/arch/arm/src/sama5/sam_config.h b/arch/arm/src/sama5/sam_config.h index c9a5b0a9ed..9efe7aaa34 100644 --- a/arch/arm/src/sama5/sam_config.h +++ b/arch/arm/src/sama5/sam_config.h @@ -101,6 +101,19 @@ # error "Cannot have both USART and Flexcom USART" #endif +#if defined (SAMA5_HAVE_FLEXCOM_USART) +# undef CONFIG_USART0_SERIAL_CONSOLE +# undef CONFIG_USART1_SERIAL_CONSOLE +# undef CONFIG_USART2_SERIAL_CONSOLE +# undef CONFIG_USART3_SERIAL_CONSOLE +# undef CONFIG_USART4_SERIAL_CONSOLE +# undef CONFIG_SAMA5_USART0 +# undef CONFIG_SAMA5_USART1 +# undef CONFIG_SAMA5_USART2 +# undef CONFIG_SAMA5_USART3 +# undef CONFIG_SAMA5_USART4 +#endif + #undef SUPPRESS_CONSOLE_CONFIG #ifdef CONFIG_SUPPRESS_UART_CONFIG # define SUPPRESS_CONSOLE_CONFIG 1 diff --git a/arch/arm/src/sama5/sam_flexcom_serial.c b/arch/arm/src/sama5/sam_flexcom_serial.c index 98a8227aaa..a244e6aaa6 100644 --- a/arch/arm/src/sama5/sam_flexcom_serial.c +++ b/arch/arm/src/sama5/sam_flexcom_serial.c @@ -73,7 +73,7 @@ #undef USART3_ASSIGNED #undef USART4_ASSIGNED -#ifdef SAMA5_HAVE_FLEXCOM_USART +#ifdef CONFIG_SAMA5_FLEXCOM_USART /* Which Flexcom with be ttyFC0/console and which ttyFC1? ttyFC2? ttyFC3? * ttyFC4? ttyFC5? @@ -117,16 +117,13 @@ # define FLEXUS3_ASSIGNED 1 # elif defined(CONFIG_USART4_SERIALDRIVER) # define TTYFC0_DEV g_flexus4port /* FLEXUS4 is ttyFC0 */ -# define FLEXUS4_ASSIGNED 4 +# define FLEXUS4_ASSIGNED 1 # endif #endif -/* Pick ttyFC1. This could be any of USART0-4 excluding the console UART. */ +/* Pick ttyFC1. This could be any of USART1-4 excluding the console UART. */ -#if defined(CONFIG_USART0_SERIALDRIVER) && !defined(FLEXUS0_ASSIGNED) -# define TTYFC1_DEV g_flexus0port /* FLEXUS0 is ttyFC1 */ -# define FLEXUS0_ASSIGNED 1 -#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(FLEXUS1_ASSIGNED) +#if defined(CONFIG_USART1_SERIALDRIVER) && !defined(FLEXUS1_ASSIGNED) # define TTYFC1_DEV g_flexus1port /* FLEXUS1 is ttyFC1 */ # define FLEXUS1_ASSIGNED 1 #elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED) @@ -140,34 +137,28 @@ # define FLEXUS4_ASSIGNED 1 #endif -/* Pick ttyFC2. This could be one of FLEXUS1-4. It can't be FLEXUS0 +/* Pick ttyFC2. This could be one of FLEXUS2-4. It can't be FLEXUS0 * because that was either assigned as ttyFC0 or ttyFC1. One of these * could also be the console. */ -#if defined(CONFIG_USART1_SERIALDRIVER) && !defined(FLEXUS1_ASSIGNED) -# define TTYFC2_DEV g_flexus1port /* FLEXUS1 is ttyFC2 */ -# define FLEXUS1_ASSIGNED 1 -#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED) +#if defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED) # define TTYFC2_DEV g_flexus2port /* FLEXUS2 is ttyFC2 */ # define FLEXUS2_ASSIGNED 1 #elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED) # define TTYFC2_DEV g_flexus3port /* FLEXUS3 is ttyFC2 */ # define FLEXUS3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(FLEXUS4_ASSIGNED) # define TTYFC2_DEV g_flexus4port /* FLEXUS4 is ttyFC2 */ # define FLEXUS4_ASSIGNED 1 #endif -/* Pick ttyFC3. This could be one of FLEXUS2-4. It can't be FLEXUS0-1 +/* Pick ttyFC3. This could be one of FLEXUS3-4. It can't be FLEXUS0-1 * UART0-1; those have already been assigned to ttyFC0, 1, or 2. One of * FLEXUS2-4 could also be the console. */ -#if defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED) -# define TTYFC3_DEV g_flexus2port /* FLEXUS2 is ttyFC3 */ -# define FLEXUS2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED) +#if defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED) # define TTYFC3_DEV g_flexus3port /* FLEXUS3 is ttyFC3 */ # define FLEXUS3_ASSIGNED 1 #elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(FLEXUS4_ASSIGNED) @@ -175,17 +166,14 @@ # define FLEXUS4_ASSIGNED 1 #endif -/* Pick ttyFC4. This could be one of USART3-4. It can't be one of +/* Pick ttyFC4. This could be USART4. It can't be one of * USART0-2; those have already been assigned to ttyFC0-3. One of * USART3-4 could also be the console. */ -#if defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) -# define TTYFC4_DEV g_flexus3port /* USART3 is ttyFC4 */ -# define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#if defined(CONFIG_USART4_SERIALDRIVER) && !defined(FLEXUS4_ASSIGNED) # define TTYFC4_DEV g_flexus4port /* USART4 is ttyFC4 */ -# define USART4_ASSIGNED 1 +# define FLEXUS4_ASSIGNED 1 #endif /* The Flexcom modules are driven by the peripheral clock (MCK or MCK2). */ @@ -262,7 +250,7 @@ static char g_flexus0txbuffer[CONFIG_USART0_TXBUFSIZE]; static char g_flexus1rxbuffer[CONFIG_USART1_RXBUFSIZE]; static char g_flexus1txbuffer[CONFIG_USART1_TXBUFSIZE]; #endif -#ifdef CONFIG_USART2_SERIALDRIVER +#ifdef CONFIG_SAMA5_FLEXCOM2_USART static char g_flexus2rxbuffer[CONFIG_USART2_RXBUFSIZE]; static char g_flexus2txbuffer[CONFIG_USART2_TXBUFSIZE]; #endif @@ -343,7 +331,7 @@ static uart_dev_t g_flexus1port = /* This describes the state of the USART2 port. */ -#ifdef CONFIG_USART2_SERIALDRIVER +#ifdef CONFIG_SAMA5_FLEXCOM2_USART static struct flexus_dev_s g_flexus2priv = { .usartbase = SAM_FLEXCOM2_VBASE, diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c index 775f96a56a..0ae7d5a191 100644 --- a/arch/arm/src/sama5/sam_serial.c +++ b/arch/arm/src/sama5/sam_serial.c @@ -151,19 +151,19 @@ # elif defined(CONFIG_SAMA5_UART4) # define TTYS0_DEV g_uart4port /* UART4 is ttyS0 */ # define UART4_ASSIGNED 1 -# elif defined(CONFIG_USART0_SERIALDRIVER) +# elif defined(CONFIG_SAMA5_USART0) # define TTYS0_DEV g_usart0port /* USART0 is ttyS0 */ # define USART0_ASSIGNED 1 -# elif defined(CONFIG_USART1_SERIALDRIVER) +# elif defined(CONFIG_SAMA5_USART1) # define TTYS0_DEV g_usart1port /* USART1 is ttyS0 */ # define USART1_ASSIGNED 1 -# elif defined(CONFIG_USART2_SERIALDRIVER) +# elif defined(CONFIG_SAMA5_USART2) # define TTYS0_DEV g_usart2port /* USART2 is ttyS0 */ # define USART2_ASSIGNED 1 -# elif defined(CONFIG_USART3_SERIALDRIVER) +# elif defined(CONFIG_SAMA5_USART3) # define TTYS0_DEV g_usart3port /* USART3 is ttyS0 */ # define USART3_ASSIGNED 1 -# elif defined(CONFIG_USART4_SERIALDRIVER) +# elif defined(CONFIG_SAMA5_USART4) # define TTYS0_DEV g_usart4port /* USART4 is ttyS0 */ # define USART4_ASSIGNED 4 # endif @@ -188,19 +188,19 @@ #elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED) # define TTYS1_DEV g_uart4port /* UART4 is ttyS1 */ # define UART4_ASSIGNED 1 -#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART0) && !defined(USART0_ASSIGNED) # define TTYS1_DEV g_usart0port /* USART0 is ttyS1 */ # define USART0_ASSIGNED 1 -#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART1) && !defined(USART1_ASSIGNED) # define TTYS1_DEV g_usart1port /* USART1 is ttyS1 */ # define USART1_ASSIGNED 1 -#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART2) && !defined(USART2_ASSIGNED) # define TTYS1_DEV g_usart2port /* USART2 is ttyS1 */ # define USART2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS1_DEV g_usart3port /* USART3 is ttyS1 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS1_DEV g_usart4port /* USART4 is ttyS1 */ # define USART4_ASSIGNED 1 #endif @@ -222,19 +222,19 @@ #elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED) # define TTYS2_DEV g_uart4port /* UART4 is ttyS2 */ # define UART4_ASSIGNED 1 -#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART0) && !defined(USART0_ASSIGNED) # define TTYS2_DEV g_usart0port /* USART0 is ttyS2 */ # define USART0_ASSIGNED 1 -#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART1) && !defined(USART1_ASSIGNED) # define TTYS2_DEV g_usart1port /* USART1 is ttyS2 */ # define USART1_ASSIGNED 1 -#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART2) && !defined(USART2_ASSIGNED) # define TTYS2_DEV g_usart2port /* USART2 is ttyS2 */ # define USART2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS2_DEV g_usart3port /* USART3 is ttyS2 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS2_DEV g_usart4port /* USART4 is ttyS2 */ # define USART4_ASSIGNED 1 #endif @@ -253,19 +253,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_SERIALDRIVER) && !defined(USART0_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART0) && !defined(USART0_ASSIGNED) # define TTYS3_DEV g_usart0port /* USART0 is ttyS3 */ # define USART0_ASSIGNED 1 -#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART1) && !defined(USART1_ASSIGNED) # define TTYS3_DEV g_usart1port /* USART1 is ttyS3 */ # define USART1_ASSIGNED 1 -#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART2) && !defined(USART2_ASSIGNED) # define TTYS3_DEV g_usart2port /* USART2 is ttyS3 */ # define USART2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS3_DEV g_usart3port /* USART3 is ttyS3 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS3_DEV g_usart4port /* USART4 is ttyS3 */ # define USART4_ASSIGNED 1 #endif @@ -281,19 +281,19 @@ #elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED) # define TTYS4_DEV g_uart4port /* UART4 is ttyS4 */ # define UART4_ASSIGNED 1 -#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART0) && !defined(USART0_ASSIGNED) # define TTYS4_DEV g_usart0port /* USART0 is ttyS4 */ # define USART0_ASSIGNED 1 -#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART1) && !defined(USART1_ASSIGNED) # define TTYS4_DEV g_usart1port /* USART1 is ttyS4 */ # define USART1_ASSIGNED 1 -#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART2) && !defined(USART2_ASSIGNED) # define TTYS4_DEV g_usart2port /* USART2 is ttyS4 */ # define USART2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS4_DEV g_usart3port /* USART3 is ttyS4 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS4_DEV g_usart4port /* USART4 is ttyS4 */ # define USART4_ASSIGNED 1 #endif @@ -306,19 +306,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_SERIALDRIVER) && !defined(USART0_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART0) && !defined(USART0_ASSIGNED) # define TTYS5_DEV g_usart0port /* USART0 is ttyS5 */ # define USART0_ASSIGNED 1 -#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART1) && !defined(USART1_ASSIGNED) # define TTYS5_DEV g_usart1port /* USART1 is ttyS5 */ # define USART1_ASSIGNED 1 -#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART2) && !defined(USART2_ASSIGNED) # define TTYS5_DEV g_usart2port /* USART2 is ttyS5 */ # define USART2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS5_DEV g_usart3port /* USART3 is ttyS5 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS5_DEV g_usart4port /* USART4 is ttyS5 */ # define USART4_ASSIGNED 1 #endif @@ -328,19 +328,19 @@ * could also be the console. */ -#if defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED) +#if defined(CONFIG_SAMA5_USART0) && !defined(USART0_ASSIGNED) # define TTYS6_DEV g_usart0port /* USART0 is ttyS6 */ # define USART0_ASSIGNED 1 -#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART1) && !defined(USART1_ASSIGNED) # define TTYS6_DEV g_usart1port /* USART1 is ttyS6 */ # define USART1_ASSIGNED 1 -#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART2) && !defined(USART2_ASSIGNED) # define TTYS6_DEV g_usart2port /* USART2 is ttyS6 */ # define USART2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS6_DEV g_usart3port /* USART3 is ttyS6 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS6_DEV g_usart4port /* USART4 is ttyS6 */ # define USART4_ASSIGNED 1 #endif @@ -350,16 +350,16 @@ * USART1-4 could also be the console. */ -#if defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED) +#if defined(CONFIG_SAMA5_USART1) && !defined(USART1_ASSIGNED) # define TTYS7_DEV g_usart1port /* USART1 is ttyS7 */ # define USART1_ASSIGNED 1 -#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART2) && !defined(USART2_ASSIGNED) # define TTYS7_DEV g_usart2port /* USART2 is ttyS7 */ # define USART2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS7_DEV g_usart3port /* USART3 is ttyS7 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS7_DEV g_usart4port /* USART4 is ttyS7 */ # define USART4_ASSIGNED 1 #endif @@ -369,13 +369,13 @@ * USART2-4 could also be the console. */ -#if defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED) +#if defined(CONFIG_SAMA5_USART2) && !defined(USART2_ASSIGNED) # define TTYS8_DEV g_usart2port /* USART2 is ttyS8 */ # define USART2_ASSIGNED 1 -#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS8_DEV g_usart3port /* USART3 is ttyS8 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS8_DEV g_usart4port /* USART4 is ttyS8 */ # define USART4_ASSIGNED 1 #endif @@ -385,10 +385,10 @@ * USART3-4 could also be the console. */ -#if defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED) +#if defined(CONFIG_SAMA5_USART3) && !defined(USART3_ASSIGNED) # define TTYS9_DEV g_usart3port /* USART3 is ttyS9 */ # define USART3_ASSIGNED 1 -#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED) +#elif defined(CONFIG_SAMA5_USART4) && !defined(USART4_ASSIGNED) # define TTYS9_DEV g_usart4port /* USART4 is ttyS9 */ # define USART4_ASSIGNED 1 #endif @@ -702,7 +702,7 @@ static uart_dev_t g_uart4port = /* This describes the state of the USART0 port. */ -#ifdef CONFIG_USART0_SERIALDRIVER +#ifdef CONFIG_SAMA5_USART0 static struct up_dev_s g_usart0priv = { .usartbase = SAM_USART0_VBASE, @@ -735,7 +735,7 @@ static uart_dev_t g_usart0port = /* This describes the state of the USART1 port. */ -#ifdef CONFIG_USART1_SERIALDRIVER +#ifdef CONFIG_SAMA5_USART1 static struct up_dev_s g_usart1priv = { .usartbase = SAM_USART1_VBASE, @@ -768,7 +768,7 @@ static uart_dev_t g_usart1port = /* This describes the state of the USART2 port. */ -#ifdef CONFIG_USART2_SERIALDRIVER +#ifdef CONFIG_SAMA5_USART2 static struct up_dev_s g_usart2priv = { .usartbase = SAM_USART2_VBASE, @@ -801,7 +801,7 @@ static uart_dev_t g_usart2port = /* This describes the state of the USART3 port. */ -#ifdef CONFIG_USART3_SERIALDRIVER +#ifdef CONFIG_SAMA5_USART3 static struct up_dev_s g_usart3priv = { .usartbase = SAM_USART3_VBASE, @@ -834,7 +834,7 @@ static uart_dev_t g_usart3port = /* This describes the state of the USART4 port. */ -#ifdef CONFIG_USART4_SERIALDRIVER +#ifdef CONFIG_SAMA5_USART4 static struct up_dev_s g_usart4priv = { .usartbase = SAM_USART4_VBASE, diff --git a/arch/arm/src/sama5/sam_serialinit.c b/arch/arm/src/sama5/sam_serialinit.c index fc8f5a9428..b6744bdc6c 100644 --- a/arch/arm/src/sama5/sam_serialinit.c +++ b/arch/arm/src/sama5/sam_serialinit.c @@ -83,7 +83,7 @@ void arm_serialinit(void) uart_serialinit(); #endif -#ifdef SAMA5_HAVE_FLEXCOM_USART +#ifdef CONFIG_SAMA5_FLEXCOM_USART /* Register Flexcom USART drivers */ flexus_serialinit();