4 files changed, 25 insertions, 20 deletions
diff --git a/nuttx/configs/ez80f910200kitg/ostest/Make.defs b/nuttx/configs/ez80f910200kitg/ostest/Make.defs
index 9f787ef1b..607a5adb7 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/Make.defs
+++ b/nuttx/configs/ez80f910200kitg/ostest/Make.defs
@@ -33,8 +33,8 @@
 #
 ############################################################################
 
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
+include $(TOPDIR)/.config
+include $(TOPDIR)/tools/Config.mk
 
 # These are the directories where the ZDS-II toolchain is installed
 
@@ -140,21 +140,11 @@ LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)ez80f910200kitg$(DELIM)ostest$
 # Tool names/pathes
 
 CROSSDEV =
+CC = ez80cc.exe
 CPP = gcc -E
-
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  # PATH varialble should be set
-  CC = ez80cc.exe
-  LD = ez80link.exe
-  AS = ez80asm.exe
-  AR = ez80lib.exe
-else
-  # Cygwin PATH variable is not sufficient
-  CC = "$(ZDSBINDIR)$(DELIM)ez80cc.exe"
-  LD = "$(ZDSBINDIR)$(DELIM)ez80link.exe"
-  AS = "$(ZDSBINDIR)$(DELIM)ez80asm.exe"
-  AR = "$(ZDSBINDIR)$(DELIM)ez80lib.exe"
-endif
+LD = ez80link.exe
+AS = ez80asm.exe
+AR = ez80lib.exe
 
 # File extensions
 
@@ -205,11 +195,11 @@ define PREPROCESS
 endef
 
 define COMPILE
-	$(Q) "$(CC)" $(CFLAGS)  ${shell echo $1 | sed -e "s/\//\\/g"}
+	$(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
 endef
 
 define ASSEMBLE
-	$(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
+	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef
 
 define ARCHIVE
diff --git a/nuttx/configs/ez80f910200kitg/ostest/setenv.sh b/nuttx/configs/ez80f910200kitg/ostest/setenv.sh
index ce3ea8b53..42003ccb6 100755
--- a/nuttx/configs/ez80f910200kitg/ostest/setenv.sh
+++ b/nuttx/configs/ez80f910200kitg/ostest/setenv.sh
@@ -54,7 +54,10 @@ fi
 TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
 
 #
-# Add the path to the toolchain to the PATH varialble
+# Add the path to the toolchain to the PATH varialble.  NOTE that /bin and /usr/bin
+# preceded the toolchain bin directory.  This is because the ZDSII bin directory
+# includes binaries like make.exe that will interfere with the normal build process
+# if we do not give priority to the versions at /bin and /usr/bin.
 #
-export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+export PATH="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 echo "PATH : ${PATH}"
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
index 98871a47d..93677479f 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
+++ b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs
@@ -37,6 +37,12 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
 
+ifeq ($(CONFIG_STM32_DFU),y)
+  LDSCRIPT = ld.script.dfu
+else
+  LDSCRIPT = ld.script
+endif
+
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
   DIRLINK = $(TOPDIR)/tools/winlink.sh
diff --git a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
index 75f0ed881..7a27f7755 100644
--- a/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
+++ b/nuttx/configs/olimex-stm32-p107/ostest/Make.defs
@@ -37,6 +37,12 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
 
+ifeq ($(CONFIG_STM32_DFU),y)
+  LDSCRIPT = ld.script.dfu
+else
+  LDSCRIPT = ld.script
+endif
+
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
   DIRLINK = $(TOPDIR)/tools/winlink.sh