From eaa0b18c180192ad47f4ea7fe1e27df2584897b0 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 23 Oct 2014 08:54:26 -0600
Subject: [PATCH] EFM32:  Add configuration option to use USARTs as SPI

---
 arch/arm/src/efm32/Make.defs      |  2 +-
 arch/arm/src/efm32/efm32_config.h | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/src/efm32/Make.defs b/arch/arm/src/efm32/Make.defs
index 85dff3e972..0045cd724a 100644
--- a/arch/arm/src/efm32/Make.defs
+++ b/arch/arm/src/efm32/Make.defs
@@ -103,7 +103,7 @@ ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 CHIP_CSRCS += efm32_idle.c
 endif
 
-ifeq ($(CONFIG_EFM32_USART),y)
+ifeq ($(CONFIG_EFM32_USART_ISUART),y)
 CHIP_CSRCS += efm32_serial.c
 else
 ifeq ($(CONFIG_EFM32_UART),y)
diff --git a/arch/arm/src/efm32/efm32_config.h b/arch/arm/src/efm32/efm32_config.h
index 7aa14713b4..ef578d22aa 100644
--- a/arch/arm/src/efm32/efm32_config.h
+++ b/arch/arm/src/efm32/efm32_config.h
@@ -66,10 +66,12 @@
 #  undef CONFIG_EFM32_LEUART1
 #endif
 
-#ifndef CONFIG_EFM32_USART
-#  undef CONFIG_EFM32_USART0
-#  undef CONFIG_EFM32_USART1
-#  undef CONFIG_EFM32_USART2
+/* Is there a UART device?  Or an SPI device? */
+
+#ifndef CONFIG_EFM32_USART_ISUART
+#  undef CONFIG_EFM32_USART0_ISUART
+#  undef CONFIG_EFM32_USART1_ISUART
+#  undef CONFIG_EFM32_USART2_ISUART
 #endif
 
 #ifndef CONFIG_EFM32_UART
@@ -77,13 +79,6 @@
 #  undef CONFIG_EFM32_UART1
 #endif
 
-#ifndef CONFIG_EFM32_LEUART
-#  undef CONFIG_EFM32_LEUART0
-#  undef CONFIG_EFM32_LEUART1
-#endif
-
-/* Is there a UART device?  Or an SPI device? */
-
 #ifndef CONFIG_EFM32_USART0
 #  undef CONFIG_EFM32_USART0_ISUART
 #  undef CONFIG_EFM32_USART0_ISSPI
@@ -117,6 +112,11 @@
 
 /* Is there an LEUART device?  */
 
+#ifndef CONFIG_EFM32_LEUART
+#  undef CONFIG_EFM32_LEUART0
+#  undef CONFIG_EFM32_LEUART1
+#endif
+
 #undef HAVE_LEUART_DEVICE
 #if defined(CONFIG_EFM32_LEUART0) ||  defined(CONFIG_EFM32_LEUART1)
 #  define HAVE_LEUART_DEVICE 1