diff options
-rw-r--r-- | apps/nshlib/nsh_usbdev.c | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam_serial.c | 5 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam_start.c | 1 |
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" /**************************************************************************** |