The olimex-efm32g880f128-stk now defaults to use LEUART1 as the serial console. Also fixes lots of compile bugs from the original LEUART checkin

3 files changed, 34 insertions, 22 deletions

diff --git a/nuttx/configs/olimex-efm32g880f128-stk/README.txt b/nuttx/configs/olimex-efm32g880f128-stk/README.txt
index e043fe9c6..f21bdb5db 100644
--- a/nuttx/configs/olimex-efm32g880f128-stk/README.txt
+++ b/nuttx/configs/olimex-efm32g880f128-stk/README.txt
@@ -110,8 +110,8 @@ Serial Console
 
    Default Serial Console
    ----------------------
-   UART0 is configured as the default serial console at 115200 8N1
-   on pins PE0 and PE1.
+   LEUART1 is configured as the default serial console at 2400 8N1
+   on pins PC6 and PC7.
 
 Configurations
 ==============
@@ -133,7 +133,7 @@ Configurations
   nsh:
   ---
     Configures the NuttShell (nsh) located at apps/examples/nsh.  The
-    Configuration enables the serial interfaces on UART0.  Support for
+    Configuration enables the serial interfaces on LEUART1.  Support for
     builtin applications is enabled, but in the base configuration no
     builtin applications are selected (see NOTES below).
 
diff --git a/nuttx/configs/olimex-efm32g880f128-stk/include/board.h b/nuttx/configs/olimex-efm32g880f128-stk/include/board.h
index e1f1f68b2..d8c70fe98 100644
--- a/nuttx/configs/olimex-efm32g880f128-stk/include/board.h
+++ b/nuttx/configs/olimex-efm32g880f128-stk/include/board.h
@@ -207,12 +207,20 @@
 /* Pin routing **************************************************************/
 /* UART0:
  *
- *   U0_RX #1 PE1  **AVAILABLE at TP130**
- *   U0_TX #1 PE0  **AVAILABLE at TP129**
+ *   U0_RX #1 PE1  **AVAILABLE at EXT-19**
+ *   U0_TX #1 PE0  **AVAILABLE at EXT-18**
  */
 
 #define BOARD_UART0_ROUTE_LOCATION _USART_ROUTE_LOCATION_LOC1
 
+/* LEUART1:
+ *
+ *   LEU1_RX #0 PC7  LEU1_RX to DB-9 connector
+ *   LEU1_TX #0 PC6  LEU1_TX to DB-9 connector
+ */
+
+#define BOARD_LEUART1_ROUTE_LOCATION _LEUART_ROUTE_LOCATION_LOC0
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
diff --git a/nuttx/configs/olimex-efm32g880f128-stk/nsh/defconfig b/nuttx/configs/olimex-efm32g880f128-stk/nsh/defconfig
index 298495ed9..065e7ffab 100644
--- a/nuttx/configs/olimex-efm32g880f128-stk/nsh/defconfig
+++ b/nuttx/configs/olimex-efm32g880f128-stk/nsh/defconfig
@@ -138,15 +138,29 @@ CONFIG_EFM32_HAVE_USART2=y
 CONFIG_EFM32_HAVE_UART0=y
 # CONFIG_EFM32_HAVE_UART1 is not set
 CONFIG_EFM32_HAVE_LEUART1=y
-CONFIG_EFM32_UART=y
+# CONFIG_EFM32_USART is not set
+# CONFIG_EFM32_UART is not set
+CONFIG_EFM32_LEUART=y
 # CONFIG_EFM32_USART0 is not set
 # CONFIG_EFM32_USART1 is not set
 # CONFIG_EFM32_USART2 is not set
-CONFIG_EFM32_UART0=y
+# CONFIG_EFM32_UART0 is not set
 # CONFIG_EFM32_UART1 is not set
 # CONFIG_EFM32_LEUART0 is not set
-# CONFIG_EFM32_LEUART1 is not set
+CONFIG_EFM32_LEUART1=y
 CONFIG_EFM32_GPIO_IRQ=y
+CONFIG_LEUART1_SERIAL_CONSOLE=y
+# CONFIG_NO_LEUART_SERIAL_CONSOLE is not set
+
+#
+# LEUART1 Configuration
+#
+CONFIG_LEUART1_RXBUFSIZE=64
+CONFIG_LEUART1_TXBUFSIZE=64
+CONFIG_LEUART1_BAUD=2400
+CONFIG_LEUART1_BITS=8
+CONFIG_LEUART1_PARITY=0
+CONFIG_LEUART1_2STOP=0
 
 #
 # Architecture Options
@@ -362,7 +376,7 @@ 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_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
@@ -382,26 +396,16 @@ CONFIG_ARCH_HAVE_UART0=y
 # CONFIG_ARCH_HAVE_USART6 is not set
 # CONFIG_ARCH_HAVE_USART7 is not set
 # CONFIG_ARCH_HAVE_USART8 is not set
+CONFIG_ARCH_HAVE_OTHER_UART=y
 
 #
 # USART Configuration
 #
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
-CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_UART0_SERIAL_CONSOLE is not set
+CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
-
-#
-# UART0 Configuration
-#
-CONFIG_UART0_RXBUFSIZE=64
-CONFIG_UART0_TXBUFSIZE=64
-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
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set