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 | |
| 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')
| -rwxr-xr-x | nuttx/Documentation/README.html | 5 | ||||
| -rwxr-xr-x | nuttx/arch/mips/src/pic32mx/pic32mx-config.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-lowconsole.c | 12 | ||||
| -rw-r--r-- | nuttx/configs/sure-pic32mx/src/up_leds.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/sure-pic32mx/src/up_nsh.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/sure-pic32mx/src/up_spi.c | 2 |
6 files changed, 13 insertions, 12 deletions
diff --git a/nuttx/Documentation/README.html b/nuttx/Documentation/README.html index a6d42ccda..aeb587dad 100755 --- a/nuttx/Documentation/README.html +++ b/nuttx/Documentation/README.html @@ -22,7 +22,7 @@ <ul><pre> . | - nuttx - | | + | |- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/README.txt?view=log"><b>README.txt</b></a> | |- arch/ | | | | | |- arm @@ -186,8 +186,9 @@ | |- syscall/ | | `- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/syscall/README.txt?view=log"><b><i>README.txt</i></b></a> | `- tools/ - | `- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/tols/README.txt?view=log"><b><i>README.txt</i></b></a> + | `- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/nuttx/tools/README.txt?view=log"><b><i>README.txt</i></b></a> `- apps/ + |- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/apps/README.txt?view=log"><b>README.txt</b></a> |- interpreters/ | `- <a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/trunk/apps/interpreters/README.txt?view=log"><b><i>README.txt</i></b></a> |- netutils/ 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 diff --git a/nuttx/configs/sure-pic32mx/src/up_leds.c b/nuttx/configs/sure-pic32mx/src/up_leds.c index a885fa645..5177eef6a 100644 --- a/nuttx/configs/sure-pic32mx/src/up_leds.c +++ b/nuttx/configs/sure-pic32mx/src/up_leds.c @@ -50,7 +50,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "pic32mx_internal.h" +#include "pic32mx-internal.h" #include "sure-internal.h" #ifdef CONFIG_ARCH_LEDS diff --git a/nuttx/configs/sure-pic32mx/src/up_nsh.c b/nuttx/configs/sure-pic32mx/src/up_nsh.c index d83cfea4c..9f2498ace 100644 --- a/nuttx/configs/sure-pic32mx/src/up_nsh.c +++ b/nuttx/configs/sure-pic32mx/src/up_nsh.c @@ -49,7 +49,7 @@ #include <nuttx/mmcsd.h> #include <nuttx/usb/usbhost.h> -#include "pic32mx_internal.h" +#include "pic32mx-internal.h" #include "sure-internal.h" /**************************************************************************** diff --git a/nuttx/configs/sure-pic32mx/src/up_spi.c b/nuttx/configs/sure-pic32mx/src/up_spi.c index 1fbab931e..5d03dcb2a 100644 --- a/nuttx/configs/sure-pic32mx/src/up_spi.c +++ b/nuttx/configs/sure-pic32mx/src/up_spi.c @@ -49,7 +49,7 @@ #include "up_arch.h" #include "chip.h" -#include "pic32mx_internal.h" +#include "pic32mx-internal.h" #include "sure-internal.h" #if defined(CONFIG_PIC32MX_SPI2) |