From 8610eced57fce11afb7b50a7d0efdbd3cca8d98b Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Mon, 12 Dec 2016 14:15:50 -1000
Subject: [PATCH] Changes to sim for upstream Nuttx

---
 nuttx-configs/sim/nsh/Make.defs       | 4 ++--
 nuttx-configs/sim/nsh/defconfig       | 4 ++--
 nuttx-configs/sim/nsh/setenv.sh       | 2 +-
 src/drivers/boards/sim/board_config.h | 2 --
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/nuttx-configs/sim/nsh/Make.defs b/nuttx-configs/sim/nsh/Make.defs
index 83402a2397..dbbd7fc39b 100644
--- a/nuttx-configs/sim/nsh/Make.defs
+++ b/nuttx-configs/sim/nsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/sim/nsh/Make.defs
+# nuttx-configs/sim/nsh/Make.defs
 #
 #   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -102,7 +102,7 @@ ifeq ($(CONFIG_SIM_M32),y)
 endif
 
 
-MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
 
 HOSTCC			= gcc
 HOSTINCLUDES		= -I.
diff --git a/nuttx-configs/sim/nsh/defconfig b/nuttx-configs/sim/nsh/defconfig
index 391b3f03a6..67c71dbe8e 100644
--- a/nuttx-configs/sim/nsh/defconfig
+++ b/nuttx-configs/sim/nsh/defconfig
@@ -38,7 +38,7 @@ CONFIG_HOST_LINUX=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_DEBUG_SYMBOLS=y
 
 #
@@ -162,7 +162,7 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 CONFIG_MAX_TASKS=64
 CONFIG_MAX_TASK_ARGS=4
 CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=32
+CONFIG_NFILE_DESCRIPTORS=51
 CONFIG_NFILE_STREAMS=16
 CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=32
diff --git a/nuttx-configs/sim/nsh/setenv.sh b/nuttx-configs/sim/nsh/setenv.sh
index c629c5a1ec..7ddca6647d 100755
--- a/nuttx-configs/sim/nsh/setenv.sh
+++ b/nuttx-configs/sim/nsh/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# sim/nsh/setenv.sh
+# nuttx-configs/sim/nsh/setenv.sh
 #
 #   Copyright (C) 2008 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/src/drivers/boards/sim/board_config.h b/src/drivers/boards/sim/board_config.h
index 6413bb780b..e28c61237d 100644
--- a/src/drivers/boards/sim/board_config.h
+++ b/src/drivers/boards/sim/board_config.h
@@ -1,5 +1,3 @@
-#define UDID_START		0x1FFF7A10
-
 /*
  * I2C busses
  */