diff --git a/configs/sama5d2-xult/README.txt b/configs/sama5d2-xult/README.txt index c16599ac2e..37aa565fab 100644 --- a/configs/sama5d2-xult/README.txt +++ b/configs/sama5d2-xult/README.txt @@ -701,6 +701,9 @@ Serial Console 14 UART_TX PB28 FLEXCOM0 ---- ------- ---- -------- + By default, the standard UART on Arduino connector (J21, FLEXCOM4) is + enabled in all of these configurations unless otherwise noted. + SAMA5D2-XULT Configuration Options ================================= diff --git a/configs/sama5d2-xult/include/board_384mhz.h b/configs/sama5d2-xult/include/board_384mhz.h index fcb68dc4f4..177e22b54c 100644 --- a/configs/sama5d2-xult/include/board_384mhz.h +++ b/configs/sama5d2-xult/include/board_384mhz.h @@ -172,6 +172,7 @@ #define BOARD_PIT_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) #define BOARD_USART_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) +#define BOARD_FLEXCOM_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) /* HSMCI clocking * diff --git a/configs/sama5d2-xult/include/board_396mhz.h b/configs/sama5d2-xult/include/board_396mhz.h index b62709bc9c..01673d4992 100644 --- a/configs/sama5d2-xult/include/board_396mhz.h +++ b/configs/sama5d2-xult/include/board_396mhz.h @@ -130,6 +130,7 @@ #define BOARD_PIT_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) #define BOARD_USART_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) +#define BOARD_FLEXCOM_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) #if defined(CONFIG_SAMA5_EHCI) || defined(CONFIG_SAMA5_OHCI) || \ defined(CONFIG_SAMA5_UDPHS) diff --git a/configs/sama5d2-xult/include/board_528mhz.h b/configs/sama5d2-xult/include/board_528mhz.h index 8190677d6d..bc7ef83e6a 100644 --- a/configs/sama5d2-xult/include/board_528mhz.h +++ b/configs/sama5d2-xult/include/board_528mhz.h @@ -129,6 +129,7 @@ #define BOARD_PIT_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) #define BOARD_USART_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) +#define BOARD_FLEXCOM_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) #if defined(CONFIG_SAMA5_EHCI) || defined(CONFIG_SAMA5_OHCI) || \ defined(CONFIG_SAMA5_UDPHS) diff --git a/configs/sama5d2-xult/include/board_sdram.h b/configs/sama5d2-xult/include/board_sdram.h index 6d42c8adab..550914e616 100644 --- a/configs/sama5d2-xult/include/board_sdram.h +++ b/configs/sama5d2-xult/include/board_sdram.h @@ -70,6 +70,7 @@ #define BOARD_PIT_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) #define BOARD_USART_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) +#define BOARD_FLEXCOM_FREQUENCY (BOARD_MCK_FREQUENCY >> 1) #if defined(CONFIG_SAMA5_EHCI) || defined(CONFIG_SAMA5_OHCI) || \ defined(CONFIG_SAMA5_UDPHS) diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig index 8f51ec5587..a14ead46aa 100644 --- a/configs/sama5d2-xult/nsh/defconfig +++ b/configs/sama5d2-xult/nsh/defconfig @@ -158,7 +158,7 @@ CONFIG_SAMA5_HAVE_FLEXCOM0=y CONFIG_SAMA5_HAVE_FLEXCOM1=y CONFIG_SAMA5_HAVE_FLEXCOM2=y CONFIG_SAMA5_HAVE_FLEXCOM3=y -# CONFIG_SAMA5_HAVE_FLEXCOM4 is not set +CONFIG_SAMA5_HAVE_FLEXCOM4=y CONFIG_SAMA5_HAVE_CAN0=y CONFIG_SAMA5_HAVE_CAN1=y # CONFIG_SAMA5_HAVE_DMA is not set @@ -181,8 +181,8 @@ CONFIG_SAMA5_HAVE_TC1=y CONFIG_SAMA5_HAVE_TRUSTZONE=y # CONFIG_SAMA5_HAVE_TWI3 is not set # CONFIG_SAMA5_HAVE_VDEC is not set -# CONFIG_SAMA5_FLEXCOM is not set -# CONFIG_SAMA5_FLEXCOM_USART is not set +CONFIG_SAMA5_FLEXCOM=y +CONFIG_SAMA5_FLEXCOM_USART=y # CONFIG_SAMA5_FLEXCOM_SPI is not set # CONFIG_SAMA5_FLEXCOM_TWI is not set CONFIG_ARCH_CHIP_SAMA5D2=y @@ -220,8 +220,8 @@ CONFIG_SAMA5_RTC=y # CONFIG_SAMA5_SMD is not set # CONFIG_SAMA5_SAIC is not set CONFIG_SAMA5_RXLP=y -CONFIG_SAMA5_UART0=y -CONFIG_SAMA5_UART1=y +# CONFIG_SAMA5_UART0 is not set +# CONFIG_SAMA5_UART1 is not set # CONFIG_SAMA5_UART2 is not set # CONFIG_SAMA5_UART3 is not set # CONFIG_SAMA5_UART4 is not set @@ -229,6 +229,7 @@ CONFIG_SAMA5_UART1=y # CONFIG_SAMA5_FLEXCOM1 is not set # CONFIG_SAMA5_FLEXCOM2 is not set # CONFIG_SAMA5_FLEXCOM3 is not set +CONFIG_SAMA5_FLEXCOM4=y # CONFIG_SAMA5_TWI0 is not set # CONFIG_SAMA5_TWI1 is not set # CONFIG_SAMA5_TWI2 is not set @@ -263,6 +264,12 @@ CONFIG_SAMA5_PIO_IRQ=y # CONFIG_SAMA5_PIOC_IRQ is not set # CONFIG_SAMA5_PIOD_IRQ is not set +# +# Flexcom Configuration +# +CONFIG_SAMA5_FLEXCOM4_USART=y +# CONFIG_SAMA5_FLEXCOM4_SPI is not set + # # USB High Speed Host Controller driver (HCD) options # @@ -540,8 +547,8 @@ CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set # CONFIG_16550_UART is not set # CONFIG_ARCH_HAVE_UART is not set -CONFIG_ARCH_HAVE_UART0=y -CONFIG_ARCH_HAVE_UART1=y +# CONFIG_ARCH_HAVE_UART0 is not set +# CONFIG_ARCH_HAVE_UART1 is not set # CONFIG_ARCH_HAVE_UART2 is not set # CONFIG_ARCH_HAVE_UART3 is not set # CONFIG_ARCH_HAVE_UART4 is not set @@ -555,7 +562,7 @@ CONFIG_ARCH_HAVE_UART1=y # CONFIG_ARCH_HAVE_USART1 is not set # CONFIG_ARCH_HAVE_USART2 is not set # CONFIG_ARCH_HAVE_USART3 is not set -# CONFIG_ARCH_HAVE_USART4 is not set +CONFIG_ARCH_HAVE_USART4=y # CONFIG_ARCH_HAVE_USART5 is not set # CONFIG_ARCH_HAVE_USART6 is not set # CONFIG_ARCH_HAVE_USART7 is not set @@ -565,40 +572,30 @@ CONFIG_ARCH_HAVE_UART1=y # # USART Configuration # +CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y -CONFIG_UART0_SERIAL_CONSOLE=y +# CONFIG_UART0_SERIAL_CONSOLE is not set # CONFIG_UART1_SERIAL_CONSOLE is not set +CONFIG_USART4_SERIAL_CONSOLE=y # CONFIG_OTHER_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set # -# UART0 Configuration +# USART4 Configuration # -CONFIG_UART0_RXBUFSIZE=256 -CONFIG_UART0_TXBUFSIZE=256 -CONFIG_UART0_BAUD=115200 -CONFIG_UART0_BITS=8 -CONFIG_UART0_PARITY=0 -CONFIG_UART0_2STOP=0 -# CONFIG_UART0_IFLOWCONTROL is not set -# CONFIG_UART0_OFLOWCONTROL is not set - -# -# UART1 Configuration -# -CONFIG_UART1_RXBUFSIZE=256 -CONFIG_UART1_TXBUFSIZE=256 -CONFIG_UART1_BAUD=115200 -CONFIG_UART1_BITS=8 -CONFIG_UART1_PARITY=0 -CONFIG_UART1_2STOP=0 -# CONFIG_UART1_IFLOWCONTROL is not set -# CONFIG_UART1_OFLOWCONTROL is not set +CONFIG_USART4_RXBUFSIZE=256 +CONFIG_USART4_TXBUFSIZE=256 +CONFIG_USART4_BAUD=115200 +CONFIG_USART4_BITS=8 +CONFIG_USART4_PARITY=0 +CONFIG_USART4_2STOP=0 +# CONFIG_USART4_IFLOWCONTROL is not set +# CONFIG_USART4_OFLOWCONTROL is not set # CONFIG_USBDEV is not set CONFIG_USBHOST=y CONFIG_USBHOST_NPREALLOC=4