boards/arm/samv7/samv71-xult: Set console at usart1

Set default console port to USART1. This allows easy access to serial console by embedded debug CDC-ACM driver. The README is updated with correct information about PB04 use once samv71-xult can only be debugged using SWD mode. This means that it is safe use CDC-ACM as default serial console. Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
2021-09-06 23:14:05 -03:00 · 2021-09-06 23:14:05 -03:00 · 5c1cefd09d
commit 5c1cefd09d
parent 54eabf9616
10 changed files with 30 additions and 33 deletions
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@ -160,6 +160,18 @@ Serial Console
 The SAMV71-XULT has no on-board RS-232 drivers so it will be necessary to
 use either the VCOM or an external RS-232 driver.  Here are some options.

+  - VCOM.  The Virtual Com Port gateway is available on USART1 and it is the
+    default console.  Besides PB04 is by default connected to debug pin TDI,
+    both JTAG port and EDBG can only be used in SWD mode in this board.
+
+    ------ --------
+    SAMV71 SAMV71
+    PIO    Function
+    ------ --------
+    PB04   TXD1
+    PA21   RXD1
+    ------ --------
+
  - Arduino Serial Shield:  One option is to use an Arduino-compatible
    serial shield.  This will use the RXD and TXD signals available at pins
    0 an 1, respectively, of the Arduino "Digital Low" connector.  On the
@ -219,16 +231,6 @@ use either the VCOM or an external RS-232 driver.  Here are some options.
    13   USART_RX PA21   RXD1
    14   USART_TX PB04   TXD1

-  - VCOM.  The Virtual Com Port gateway is available on USART1:
-
-    ------ --------
-    SAMV71 SAMV71
-    PIO    Function
-    ------ --------
-    PB04   TXD1
-    PA21   RXD1
-    ------ --------
-
 Any of these options can be selected as the serial console by:

  1. Enabling the UART/USART peripheral in the
@ -236,11 +238,6 @@ Any of these options can be selected as the serial console by:
  2. Configuring the peripheral in the "Drivers -> Serial Configuration"
     menu.

-NOTE: If USART1 is used (TXD1, RXD1), then PB4 must be reconfigured in the
-SUPC.  Normally, PB4 is TDI.  When it is reconfigured for use with USART1,
-the capability to debug is lost!  If you plan to debug you should most
-certainly not use USART1.
-
 SD Card
 =======

--- a/boards/arm/samv7/samv71-xult/configs/knsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig
@ -67,7 +67,7 @@ CONFIG_SAMV7_HSMCI0=y
 CONFIG_SAMV7_SDRAMC=y
 CONFIG_SAMV7_SDRAMSIZE=2097152
 CONFIG_SAMV7_TWIHS0=y
-CONFIG_SAMV7_UART3=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_WAITPID=y
@ -80,5 +80,5 @@ CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_SYS_RESERVED=9
-CONFIG_UART3_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/samv7/samv71-xult/configs/module/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/module/defconfig
@ -52,7 +52,7 @@ CONFIG_SAMV7_GPIOA_IRQ=y
 CONFIG_SAMV7_GPIOB_IRQ=y
 CONFIG_SAMV7_GPIOD_IRQ=y
 CONFIG_SAMV7_GPIO_IRQ=y
-CONFIG_SAMV7_UART3=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_WAITPID=y
@ -62,5 +62,5 @@ CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_UART3_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
@ -115,7 +115,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_HSMCI0=y
 CONFIG_SAMV7_SPI0=y
-CONFIG_SAMV7_UART3=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_LPWORK=y
@ -126,7 +126,7 @@ CONFIG_SDIO_BLOCKSETUP=y
 CONFIG_START_MONTH=7
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_PING6=y
-CONFIG_UART3_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_IEEE802154=y
--- a/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
@ -74,7 +74,7 @@ CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_HSMCI0=y
 CONFIG_SAMV7_SMC=y
 CONFIG_SAMV7_TWIHS0=y
-CONFIG_SAMV7_USART0=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_WAITPID=y
@ -85,5 +85,5 @@ CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
-CONFIG_USART0_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
@ -90,7 +90,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_HSMCI0=y
 CONFIG_SAMV7_TWIHS0=y
-CONFIG_SAMV7_UART3=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_WAITPID=y
@ -102,5 +102,5 @@ CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_PING=y
-CONFIG_UART3_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/samv7/samv71-xult/configs/nsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig
@ -65,7 +65,7 @@ CONFIG_SAMV7_SDRAMC=y
 CONFIG_SAMV7_SDRAMSIZE=2097152
 CONFIG_SAMV7_TWIHS0=y
 CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=0
-CONFIG_SAMV7_UART3=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_WAITPID=y
@ -77,5 +77,5 @@ CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_RAMTEST=y
-CONFIG_UART3_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
--- a/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
@ -108,7 +108,7 @@ CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_HSMCI0=y
 CONFIG_SAMV7_SMC=y
 CONFIG_SAMV7_TWIHS0=y
-CONFIG_SAMV7_USART0=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
@ -121,6 +121,6 @@ CONFIG_START_DAY=10
 CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_I2CTOOL=y
-CONFIG_USART0_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1526
 CONFIG_USER_ENTRYPOINT="nxwm_main"
--- a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
@ -99,7 +99,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_HSMCI0=y
 CONFIG_SAMV7_TWIHS0=y
-CONFIG_SAMV7_UART3=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_WAITPID=y
@ -110,7 +110,7 @@ CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_PING=y
-CONFIG_UART3_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_VNCSERVER=y
 CONFIG_VNCSERVER_COLORFMT_RGB8=y
--- a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
@ -128,7 +128,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_HSMCI0=y
 CONFIG_SAMV7_TWIHS0=y
-CONFIG_SAMV7_UART3=y
+CONFIG_SAMV7_USART1=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
@ -141,7 +141,7 @@ CONFIG_START_DAY=10
 CONFIG_START_MONTH=3
 CONFIG_START_YEAR=2014
 CONFIG_SYSTEM_PING=y
-CONFIG_UART3_SERIAL_CONSOLE=y
+CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=1526
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_VNCSERVER=y