diff --git a/configs/sam4l-xplained/README.txt b/configs/sam4l-xplained/README.txt index ca5ecf2f9e8..ea97942f7a8 100644 --- a/configs/sam4l-xplained/README.txt +++ b/configs/sam4l-xplained/README.txt @@ -15,6 +15,7 @@ Contents - NuttX OABI "buildroot" Toolchain - NXFLAT Toolchain - LEDs + - Virtual COM Port - SAM4L Xplained Pro-specific Configuration Options - Configurations @@ -242,6 +243,17 @@ LEDs apparently, running normmally. If LED0 is flashing at approximately 2Hz, then a fatal error has been detected and the system has halted. +Virtual COM Port +^^^^^^^^^^^^^^^^ + + The SAM4L Xplained Pro contains an Embedded Debugger (EDBG) that can be + used to program and debug the ATSAM4LC4C using Serial Wire Debug (SWD). + The Embedded debugger also include a Virtual Com port interface over + USART1. Virtual COM port connections: + + PC26 USART1 RXD + PC27 USART1 TXD + SAM4L Xplained Pro-specific Configuration Options ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/configs/sam4l-xplained/include/board.h b/configs/sam4l-xplained/include/board.h index 3c8cb82e3c6..cb70aff0413 100644 --- a/configs/sam4l-xplained/include/board.h +++ b/configs/sam4l-xplained/include/board.h @@ -156,6 +156,19 @@ #define BUTTON_SW0_BIT (1 << BUTTON_SW0) +/* Alternate Function Disambiguation ************************************************/ +/* The SAM4L Xplained Pro contains an Embedded Debugger (EDBG) that can be + * used to program and debug the ATSAM4LC4C using Serial Wire Debug (SWD). + * The Embedded debugger also include a Virtual Com port interface over + * USART1. Virtual COM port connections: + * + * PC26 USART1 RXD + * PC27 USART1 TXD + */ + +#define GPIO_USART1_RXD GPIO_USART1_RXD_2 +#define GPIO_USART1_TXD GPIO_USART1_TXD_2 + /************************************************************************************ * Public Data ************************************************************************************/ diff --git a/configs/sam4l-xplained/ostest/defconfig b/configs/sam4l-xplained/ostest/defconfig index e10037477ed..3cab5109b3d 100644 --- a/configs/sam4l-xplained/ostest/defconfig +++ b/configs/sam4l-xplained/ostest/defconfig @@ -80,6 +80,7 @@ CONFIG_ARCH_CORTEXM4=y CONFIG_ARCH_FAMILY="armv7-m" CONFIG_ARCH_CHIP="sam34" # CONFIG_ARMV7M_USEBASEPRI is not set +# CONFIG_ARCH_HAVE_FPU is not set CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_MPU is not set @@ -128,9 +129,9 @@ CONFIG_ARCH_CHIP_SAM4L=y # CONFIG_SAM34_DMA is not set # CONFIG_SAM34_NAND is not set # CONFIG_SAM34_HSMCI is not set -CONFIG_SAM34_UART=y +# CONFIG_SAM34_UART is not set # CONFIG_SAM34_USART0 is not set -# CONFIG_SAM34_USART1 is not set +CONFIG_SAM34_USART1=y # CONFIG_SAM34_USART2 is not set # CONFIG_SAM34_USART3 is not set # CONFIG_SAM34_SPI is not set @@ -138,6 +139,7 @@ CONFIG_SAM34_UART=y # # AT91SAM3 UART Configuration # +CONFIG_USART1_ISUART=y # # AT91SAM3 GPIO Interrupt Configuration @@ -297,20 +299,20 @@ CONFIG_DEV_NULL=y CONFIG_SERIAL=y CONFIG_DEV_LOWCONSOLE=y # CONFIG_16550_UART is not set -CONFIG_ARCH_HAVE_UART=y +CONFIG_ARCH_HAVE_USART1=y CONFIG_MCU_SERIAL=y -CONFIG_UART_SERIAL_CONSOLE=y +CONFIG_USART1_SERIAL_CONSOLE=y # CONFIG_NO_SERIAL_CONSOLE is not set # -# UART Configuration +# USART1 Configuration # -CONFIG_UART_RXBUFSIZE=256 -CONFIG_UART_TXBUFSIZE=256 -CONFIG_UART_BAUD=115200 -CONFIG_UART_BITS=8 -CONFIG_UART_PARITY=0 -CONFIG_UART_2STOP=0 +CONFIG_USART1_RXBUFSIZE=256 +CONFIG_USART1_TXBUFSIZE=256 +CONFIG_USART1_BAUD=115200 +CONFIG_USART1_BITS=8 +CONFIG_USART1_PARITY=0 +CONFIG_USART1_2STOP=0 # CONFIG_USBDEV is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set