diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-03 17:14:27 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-03 17:14:27 +0000 |
commit | b39fea767b7398f2818bbdc8410bd0a0c51c8b68 (patch) | |
tree | 2a0f9548537bdecf5fee2ad9a38d1d60823f68c7 /nuttx/arch/mips/src/pic32mx | |
parent | 476b5911151770db0f8087f26dad194985e27d3d (diff) | |
download | px4-nuttx-b39fea767b7398f2818bbdc8410bd0a0c51c8b68.tar.gz px4-nuttx-b39fea767b7398f2818bbdc8410bd0a0c51c8b68.tar.bz2 px4-nuttx-b39fea767b7398f2818bbdc8410bd0a0c51c8b68.zip |
Change for clean compilation of Sure PIC32MX configuration
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3742 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/mips/src/pic32mx')
-rwxr-xr-x | nuttx/arch/mips/src/pic32mx/pic32mx-config.h | 2 | ||||
-rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-lowconsole.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-config.h b/nuttx/arch/mips/src/pic32mx/pic32mx-config.h index 870775cfd..fcf4f3e5a 100755 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-config.h +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-config.h @@ -511,7 +511,7 @@ /* Are any UARTs enabled? */
#undef HAVE_UART_DEVICE
-#if defined(CONFIG_PIC32MX_UART1) || defined(CONFIG_PIC32MX_UART1)
+#if defined(CONFIG_PIC32MX_UART1) || defined(CONFIG_PIC32MX_UART2)
# define HAVE_UART_DEVICE 1
#endif
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-lowconsole.c b/nuttx/arch/mips/src/pic32mx/pic32mx-lowconsole.c index b3286715d..5498e2235 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-lowconsole.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-lowconsole.c @@ -63,12 +63,12 @@ # define PIC32MX_CONSOLE_BITS CONFIG_UART1_BITS # define PIC32MX_CONSOLE_PARITY CONFIG_UART1_PARITY # define PIC32MX_CONSOLE_2STOP CONFIG_UART1_2STOP -#elif defined(CONFIG_UART_SERIAL_CONSOLE) -# define PIC32MX_CONSOLE_BASE PIC32MX_UART_K1BASE -# define PIC32MX_CONSOLE_BAUD CONFIG_UART_BAUD -# define PIC32MX_CONSOLE_BITS CONFIG_UART_BITS -# define PIC32MX_CONSOLE_PARITY CONFIG_UART_PARITY -# define PIC32MX_CONSOLE_2STOP CONFIG_UART_2STOP +#elif defined(CONFIG_UART2_SERIAL_CONSOLE) +# define PIC32MX_CONSOLE_BASE PIC32MX_UART2_K1BASE +# define PIC32MX_CONSOLE_BAUD CONFIG_UART2_BAUD +# define PIC32MX_CONSOLE_BITS CONFIG_UART2_BITS +# define PIC32MX_CONSOLE_PARITY CONFIG_UART2_PARITY +# define PIC32MX_CONSOLE_2STOP CONFIG_UART2_2STOP #else # error "No CONFIG_UARTn_SERIAL_CONSOLE Setting" #endif |