summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-03-26 16:31:26 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-03-26 16:31:26 -0600
commit62057880ff8fa0150248d7e3123b4371311860ae (patch)
tree9a535a3ac02f5e6bc901b9d946fd5aebac7ba2f1
parent1ea8b621e1653a151d2c4046dac40a5dc5c5a9f8 (diff)
downloadnuttx-62057880ff8fa0150248d7e3123b4371311860ae.tar.gz
nuttx-62057880ff8fa0150248d7e3123b4371311860ae.tar.bz2
nuttx-62057880ff8fa0150248d7e3123b4371311860ae.zip
Eliminate some warnings
-rw-r--r--apps/nshlib/nsh_usbdev.c4
-rw-r--r--nuttx/arch/arm/src/sam34/sam_serial.c5
-rw-r--r--nuttx/arch/arm/src/sam34/sam_start.c1
3 files changed, 9 insertions, 1 deletions
diff --git a/apps/nshlib/nsh_usbdev.c b/apps/nshlib/nsh_usbdev.c
index 75f60835f..ed6b928c2 100644
--- a/apps/nshlib/nsh_usbdev.c
+++ b/apps/nshlib/nsh_usbdev.c
@@ -329,6 +329,8 @@ int nsh_consolemain(int argc, char *argv[])
#else
ret = usbdev_serialinitialize(CONFIG_NSH_USBDEV_MINOR);
#endif
+
+ (void)ret; /* Eliminate warning if not used */
DEBUGASSERT(ret == OK);
#endif
@@ -353,6 +355,8 @@ int nsh_consolemain(int argc, char *argv[])
*/
ret = nsh_waitusbready();
+
+ (void)ret; /* Eliminate warning if not used */
DEBUGASSERT(ret == OK);
/* Execute the session */
diff --git a/nuttx/arch/arm/src/sam34/sam_serial.c b/nuttx/arch/arm/src/sam34/sam_serial.c
index c1e209082..6ffa53542 100644
--- a/nuttx/arch/arm/src/sam34/sam_serial.c
+++ b/nuttx/arch/arm/src/sam34/sam_serial.c
@@ -152,7 +152,10 @@
# undef CONFIG_USART2_SERIAL_CONSOLE
# define HAVE_CONSOLE 1
#else
-# warning "No valid CONFIG_USARTn_SERIAL_CONSOLE Setting"
+# ifndef CONFIG_NO_SERIAL_CONSOLE
+# warning "No valid CONFIG_USARTn_SERIAL_CONSOLE Setting"
+# endif
+
# undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE
# undef CONFIG_USART0_SERIAL_CONSOLE
diff --git a/nuttx/arch/arm/src/sam34/sam_start.c b/nuttx/arch/arm/src/sam34/sam_start.c
index 501c386dd..d0f855585 100644
--- a/nuttx/arch/arm/src/sam34/sam_start.c
+++ b/nuttx/arch/arm/src/sam34/sam_start.c
@@ -51,6 +51,7 @@
#include "sam_clockconfig.h"
#include "sam_lowputc.h"
+#include "sam_cmcc.h"
#include "sam_userspace.h"
/****************************************************************************