summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-05-01 09:21:13 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-05-01 09:21:13 -0600
commit1a5060c28be4edffb32eabc2ad422254fcd72bb2 (patch)
tree9bf1a6e1ae07bb2e94af5a32604ff1b8463b0ac3 /apps
parentd9bd2fca774a5c3499f7b3a258aa1506fdea526f (diff)
downloadpx4-nuttx-1a5060c28be4edffb32eabc2ad422254fcd72bb2.tar.gz
px4-nuttx-1a5060c28be4edffb32eabc2ad422254fcd72bb2.tar.bz2
px4-nuttx-1a5060c28be4edffb32eabc2ad422254fcd72bb2.zip
Misc changes for clean built od mikroe-stm32f4 configurations
Diffstat (limited to 'apps')
-rw-r--r--apps/nshlib/nsh.h4
-rw-r--r--apps/system/flash_eraseall/Kconfig2
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h
index 2dee86b87..b842bb70e 100644
--- a/apps/nshlib/nsh.h
+++ b/apps/nshlib/nsh.h
@@ -50,6 +50,10 @@
#include <unistd.h>
#include <errno.h>
+#ifdef CONFIG_NSH_STRERROR
+# include <string.h>
+#endif
+
#include <nuttx/usb/usbdev_trace.h>
/****************************************************************************
diff --git a/apps/system/flash_eraseall/Kconfig b/apps/system/flash_eraseall/Kconfig
index 16c6e5c13..032df07bd 100644
--- a/apps/system/flash_eraseall/Kconfig
+++ b/apps/system/flash_eraseall/Kconfig
@@ -6,7 +6,7 @@
config SYSTEM_FLASH_ERASEALL
bool "FLASH eraseall tool"
default n
- depends on MTD && NSH_BUILTIN_APPS & !NUTTX_KERNEL
+ depends on MTD && NSH_BUILTIN_APPS && !NUTTX_KERNEL
---help---
Enable support for the FLASH eraseall tool.