From 13e397a02a5333a37fc3fba4715ef80725a9064a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 2 Jan 2015 13:59:30 -0600 Subject: Tiva: Fix typos in conditional compilation --- nuttx/arch/arm/src/tiva/tiva_lowputc.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nuttx/arch/arm/src/tiva/tiva_lowputc.h b/nuttx/arch/arm/src/tiva/tiva_lowputc.h index f1878cacc..348b1865d 100644 --- a/nuttx/arch/arm/src/tiva/tiva_lowputc.h +++ b/nuttx/arch/arm/src/tiva/tiva_lowputc.h @@ -105,7 +105,7 @@ # undef CONFIG_UART6_SERIAL_CONSOLE # undef CONFIG_UART7_SERIAL_CONSOLE # define HAVE_SERIAL_CONSOLE 1 -#elif defined(CONFIG_UART3_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART2) +#elif defined(CONFIG_UART3_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART3) # undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE @@ -114,7 +114,7 @@ # undef CONFIG_UART6_SERIAL_CONSOLE # undef CONFIG_UART7_SERIAL_CONSOLE # define HAVE_SERIAL_CONSOLE 1 -#elif defined(CONFIG_UART4_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART2) +#elif defined(CONFIG_UART4_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART4) # undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE @@ -123,7 +123,7 @@ # undef CONFIG_UART6_SERIAL_CONSOLE # undef CONFIG_UART7_SERIAL_CONSOLE # define HAVE_SERIAL_CONSOLE 1 -#elif defined(CONFIG_UART5_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART2) +#elif defined(CONFIG_UART5_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART5) # undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE @@ -132,7 +132,7 @@ # undef CONFIG_UART6_SERIAL_CONSOLE # undef CONFIG_UART7_SERIAL_CONSOLE # define HAVE_SERIAL_CONSOLE 1 -#elif defined(CONFIG_UART6_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART2) +#elif defined(CONFIG_UART6_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART6) # undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE @@ -141,7 +141,7 @@ # undef CONFIG_UART5_SERIAL_CONSOLE # undef CONFIG_UART7_SERIAL_CONSOLE # define HAVE_SERIAL_CONSOLE 1 -#elif defined(CONFIG_UART7_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART2) +#elif defined(CONFIG_UART7_SERIAL_CONSOLE) && defined(CONFIG_TIVA_UART7) # undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE @@ -163,7 +163,6 @@ # undef HAVE_SERIAL_CONSOLE #endif - /************************************************************************************ * Public Types ************************************************************************************/ -- cgit v1.2.3