From f2139ef0292e944d3758754bf0e615161f1f1720 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 1 May 2013 09:21:13 -0600
Subject: [PATCH] Misc changes for clean built od mikroe-stm32f4 configurations

---
 nshlib/nsh.h                  | 4 ++++
 system/flash_eraseall/Kconfig | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 2dee86b87..b842bb70e 100644
--- a/nshlib/nsh.h
+++ b/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/system/flash_eraseall/Kconfig b/system/flash_eraseall/Kconfig
index 16c6e5c13..032df07bd 100644
--- a/system/flash_eraseall/Kconfig
+++ b/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.