diff --git a/TODO b/TODO
index 2b66ebe8b8d..5d019a579ce 100644
--- a/TODO
+++ b/TODO
@@ -2160,7 +2160,7 @@ o File system / Generic drivers (fs/, drivers/)
                (using pctl() instead sysctl()).  My objective was to be able
                to control the number of available file descriptors on a task-
                by-task basis.  The complexity due to the partitioning of
-               descriptor space in a range for file descriptors and a range
+               descriptor space into a range for file descriptors and a range
                for socket descriptors made this feature nearly impossible to
                implement.
   Status:      Open
diff --git a/configs/sama5d2-xult/README.txt b/configs/sama5d2-xult/README.txt
index efd803f5c7c..39cfd7be2c7 100644
--- a/configs/sama5d2-xult/README.txt
+++ b/configs/sama5d2-xult/README.txt
@@ -803,15 +803,10 @@ Configurations
 
     NOTES:
 
-    1. This configuration uses the FLEXCOM4 for the serial console.
-       REVISIT:  This was intended to support an Arduino serial shield,
-       however, I think there are be problems with the FLEXCOM4 pins
-       at the at the Arduino connector.
-
-       It might be better to switch to USART1 (PD3 and PD4) which is
-       available at the "DBGU" RS-232 connector (J24).  This is easily
-       changed by reconfiguring to (1) enable a different serial
-       peripheral, and (2) selecting that serial peripheral as the
+    1. This configuration uses the UART1 (PD2 and PD3) for the serial
+       console.  USART1 is available at the "DBGU" RS-232 connector (J24).
+       This is easily changed by reconfiguring to (1) enable a different
+       serial peripheral, and (2) selecting that serial peripheral as the
        console device.
 
     2. By default, this configuration is set up to build on Windows
diff --git a/configs/sama5d2-xult/include/board.h b/configs/sama5d2-xult/include/board.h
index f995882efdb..03e748314d0 100644
--- a/configs/sama5d2-xult/include/board.h
+++ b/configs/sama5d2-xult/include/board.h
@@ -206,6 +206,9 @@
  *   ---- ------------------------ -------------
  */
 
+#define PIO_UART1_RXD     PIO_UART1_RXD_1
+#define PIO_UART1_TXD     PIO_UART1_TXD_1
+
 /* Standard UART on Arduino connector (J21) is FLEXCOM4.
  *
  *   ---- ------- -------------
@@ -236,7 +239,7 @@
 #define PIO_FLEXCOM3_IO0  PIO_FLEXCOM3_IO0_2
 #define PIO_FLEXCOM3_IO1  PIO_FLEXCOM3_IO1_2
 
-/* UARTs available of EXT1
+/* UARTs available on EXT1
  *
  *   ---- ------- -------------
  *   EXT1 BOARD      SAMA5D2
@@ -247,7 +250,7 @@
  *   ---- ------- ---- --------
  */
 
-/* UARTs available of EXT2
+/* UARTs available on EXT2
  *
  *   ---- ------- -------------
  *   EXT2 BOARD      SAMA5D2
diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index 679fd822561..079f475ea2b 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -55,11 +55,11 @@ CONFIG_SAMA5_BOOT_SDRAM=y
 CONFIG_SAMA5_DDRCS_HEAP_END=0x2fa00000
 CONFIG_SAMA5_DDRCS_RESERVE=y
 CONFIG_SAMA5_EHCI=y
-CONFIG_SAMA5_FLEXCOM4=y
 CONFIG_SAMA5_OHCI=y
 CONFIG_SAMA5_PIO_IRQ=y
 CONFIG_SAMA5_RTC=y
 CONFIG_SAMA5_TRNG=y
+CONFIG_SAMA5_UART1=y
 CONFIG_SAMA5_UHPHS=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=192
@@ -68,7 +68,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NXPLAYER=y
-CONFIG_USART4_SERIAL_CONSOLE=y
+CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBHOST_HIDKBD=y
 CONFIG_USBHOST_MSC=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/net/socket/net_dupsd2.c b/net/socket/net_dupsd2.c
index f4bfe795fb9..d89524feee2 100644
--- a/net/socket/net_dupsd2.c
+++ b/net/socket/net_dupsd2.c
@@ -112,5 +112,5 @@ errout:
   return ret;
 }
 
-#endif /* CONFIG_NET && CONFIG_NSOCKET_DESCRPTORS > 0 */
+#endif /* CONFIG_NET && CONFIG_NSOCKET_DESCRIPTORS > 0 */