From 9db0ee6bd40f94fe5e11e9f53a5cf32e1f20ba3f Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 20 Nov 2012 19:59:40 +0000 Subject: Change how UARTs are enabled for i.MX, M16C, and ez80 to make them compatible with other chips git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5374 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/lm3s6432-s2e/nsh/defconfig | 6 +++--- nuttx/configs/lm3s6432-s2e/ostest/defconfig | 6 +++--- nuttx/configs/lm3s6432-s2e/src/up_boot.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'nuttx/configs/lm3s6432-s2e') diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig index 9aa8f1db3..704d8ad91 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig +++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig @@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y # # LM3S6432 specific serial device driver settings # -CONFIG_UART0_DISABLE=n -CONFIG_UART1_DISABLE=n -CONFIG_UART2_DISABLE=y +CONFIG_LM3S_UART0=y +CONFIG_LM3S_UART1=y +CONFIG_LM3S_UART2=n CONFIG_UART0_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART2_SERIAL_CONSOLE=n diff --git a/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig index 299cef48c..0be2cfd4c 100644 --- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig +++ b/nuttx/configs/lm3s6432-s2e/ostest/defconfig @@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y # # LM3S6432 specific serial device driver settings # -CONFIG_UART0_DISABLE=n -CONFIG_UART1_DISABLE=n -CONFIG_UART2_DISABLE=y +CONFIG_LM3S_UART0=y +CONFIG_LM3S_UART1=y +CONFIG_LM3S_UART2=n CONFIG_UART0_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART2_SERIAL_CONSOLE=n diff --git a/nuttx/configs/lm3s6432-s2e/src/up_boot.c b/nuttx/configs/lm3s6432-s2e/src/up_boot.c index 3c5787f99..5bb7b670f 100644 --- a/nuttx/configs/lm3s6432-s2e/src/up_boot.c +++ b/nuttx/configs/lm3s6432-s2e/src/up_boot.c @@ -54,7 +54,7 @@ * Definitions ************************************************************************************/ -#if !defined(CONFIG_UART1_DISABLE) && !defined(CONFIG_SSI0_DISABLE) +#if defined(CONFIG_LM3S_UART1) && !defined(CONFIG_SSI0_DISABLE) # error Only one of UART1 and SSI0 can be enabled on this board. #endif -- cgit v1.2.3