ez80f910200zco/ostest now uses Kconfig

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5390 42af7a65-404d-4744-a932-0658087f49c3

ChangeLog

@@ -3689,4 +3689,6 @@
 	* arch/arm/src/stm32/stm32f20xx_rcc.c and stm32f40xx_rcc.c: Added option
 	  CONFIG_STM32_FLASH_PREFETCH.  FLASH prefetch will now only be enabled
 	  if this option is selected.
+	* confgs/ez80f910200zco/ostest:  Now used Kconfig/mconfig configuration
+	  tool.
 

arch/z80/src/ez80/Kconfig

@@ -87,7 +87,8 @@ config EZ80_MDCDIV
 	int "SCLK Divider"
 	default 0
 	---help---
-		The value to use for the divider to derive the MII MDC clock from SCLK.  Options are 1->4; 2->6; 3->8; 4->10; 5->14; 6->20; and 7->28
+		The value to use for the divider to derive the MII MDC clock from SCLK.  Options
+		are 1->4; 2->6; 3->8; 4->10; 5->14; 6->20; and 7->28
 
 config EZ80_TXPOLLTIMERMS
 	int "Tx Poll Milliseconds"
@@ -102,4 +103,14 @@ config ARCH_MCFILTER
 		Enables multicast MAC address filtering (not fully implemented)
 
 endif
+
+config ARCH_TIMERHOOK
+	bool "Timer Hook"
+	default n
+	---help---
+		Select this option to enabled a direct call-out from the ez80 timer interrupt
+		handler.  If this is enabled, the ez80 timer interrupt interrupt will call a
+		user provided function called up_timerhook().  At present, this timer hook is
+		only used for driving the segment LED on board certain ez80 boards.
+
 endif

configs/ez80f910200zco/README.txt

@@ -93,6 +93,50 @@ ostest
     This builds the examples/ostest application for execution from FLASH.
     See examples/README.txt for information about ostest.
 
+- ostest
+    This builds the examples/ostest application for execution from FLASH.
+    See examples/README.txt for information about ostest.
+
+    NOTES:
+
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
+
+       a. Build and install the mconf tool.  See nuttx/README.txt and
+          misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. By default, this configuration assumes that you are using the
+       Cygwin environment on Windows.  An option is to use the native
+       CMD.exe window build as described in the top-level README.txt
+       file.  To set up that configuration:
+
+       -CONFIG_WINDOWS_CYGWIN=y
+       +CONFIG_WINDOWS_NATIVE=y
+
+       And after configuring, make sure that CONFIG_APPS_DIR uses
+       the back slash character.  For example:
+
+        CONFIG_APPS_DIR="..\apps"
+
+      NOTES:
+      
+      a. If you need to change the toolchain path used in Make.defs, you
+         will need to use the short 8.3 filenames to avoid spaces.  On my
+         PC, C:\PROGRA~1\ is is C:\Program Files\ and C:\PROGRA~2\ is
+         C:\Program Files (x86)\
+      b. You can't use setenv.sh in the native Windows environment.  Try
+         scripts/setenv.bat instead.
+      c. At present, the native Windows build fails at the final link stages.
+         The failure is due to problems in arch/z80/src/nuttx/linkcmd that
+         is autogenerated by arch/z80/src/Makefile.zdsii.  The basic program
+         is the spurious spaces and and carrirage returns are generated at
+         the end of the lines after a line continuation (\ ^M).  If these
+         trailing bad characters are manually eliminated, then the build
+         will succeed on the next try.
+
 nsh
     This configuratino builds the NuttShell (NSH).  That code can be
     found in examples/nsh.  For more information see:  examples/nsh/README.txt

configs/ez80f910200zco/dhcpd/Make.defs

@@ -92,8 +92,7 @@ ARCHASMWARNINGS 	= -warn
 ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -112,8 +111,7 @@ ARCHDEFINES		= -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include
@@ -176,7 +174,6 @@ define ARCHIVE
 	done
 endef
 endif
-endif
 
 define CLEAN
 	$(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst

configs/ez80f910200zco/dhcpd/setenv.sh

@@ -33,20 +33,31 @@
 #
 # Check how we were executed
 #
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-#
+WD=`pwd`
-# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
+if [ ! -x "setenv.sh" ]; then
-# attempts to set the PATH variable do not have the desired effect.
+  echo "This script must be executed from the top-level NuttX build directory"
-# Instead, alias are provided for all of the ZDS-II command line tools.
+  exit 1
-# Version 5.1.1 installed in the default location is assumed here.
+fi
-#
-ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
-alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
-alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
-alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
-alias ez80link="${ZDSBINDIR}/ez80link.exe"
 
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+#
+# This is the Cygwin path to location where the XDS-II tools were installed
+#
+TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
+
+#
+# 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="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"

configs/ez80f910200zco/httpd/Make.defs

@@ -92,8 +92,7 @@ ARCHASMWARNINGS 	= -warn
 ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -112,8 +111,7 @@ ARCHDEFINES		= -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include

configs/ez80f910200zco/httpd/setenv.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/ez80f910200zco/dhcpd/setenv.sh
+# configs/ez80f910200zco/htppd/setenv.sh
 #
 #   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,20 +33,31 @@
 #
 # Check how we were executed
 #
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-#
+WD=`pwd`
-# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
+if [ ! -x "setenv.sh" ]; then
-# attempts to set the PATH variable do not have the desired effect.
+  echo "This script must be executed from the top-level NuttX build directory"
-# Instead, alias are provided for all of the ZDS-II command line tools.
+  exit 1
-# Version 5.1.1 installed in the default location is assumed here.
+fi
-#
-ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
-alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
-alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
-alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
-alias ez80link="${ZDSBINDIR}/ez80link.exe"
 
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+#
+# This is the Cygwin path to location where the XDS-II tools were installed
+#
+TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
+
+#
+# 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="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"

configs/ez80f910200zco/nettest/Make.defs

@@ -92,8 +92,7 @@ ARCHASMWARNINGS 	= -warn
 ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -112,8 +111,7 @@ ARCHDEFINES		= -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include

configs/ez80f910200zco/nettest/setenv.sh

@@ -33,20 +33,31 @@
 #
 # Check how we were executed
 #
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-#
+WD=`pwd`
-# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
+if [ ! -x "setenv.sh" ]; then
-# attempts to set the PATH variable do not have the desired effect.
+  echo "This script must be executed from the top-level NuttX build directory"
-# Instead, alias are provided for all of the ZDS-II command line tools.
+  exit 1
-# Version 5.1.1 installed in the default location is assumed here.
+fi
-#
-ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
-alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
-alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
-alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
-alias ez80link="${ZDSBINDIR}/ez80link.exe"
 
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+#
+# This is the Cygwin path to location where the XDS-II tools were installed
+#
+TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
+
+#
+# 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="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"

configs/ez80f910200zco/nsh/Make.defs

@@ -92,8 +92,7 @@ ARCHASMWARNINGS 	= -warn
 ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -112,8 +111,7 @@ ARCHDEFINES		= -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include

configs/ez80f910200zco/nsh/setenv.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/ez80f910200zco/nst/setenv.sh
+# configs/ez80f910200zco/nsh/setenv.sh
 #
 #   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,20 +33,31 @@
 #
 # Check how we were executed
 #
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-#
+WD=`pwd`
-# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
+if [ ! -x "setenv.sh" ]; then
-# attempts to set the PATH variable do not have the desired effect.
+  echo "This script must be executed from the top-level NuttX build directory"
-# Instead, alias are provided for all of the ZDS-II command line tools.
+  exit 1
-# Version 5.1.1 installed in the default location is assumed here.
+fi
-#
-ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
-alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
-alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
-alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
-alias ez80link="${ZDSBINDIR}/ez80link.exe"
 
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+#
+# This is the Cygwin path to location where the XDS-II tools were installed
+#
+TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
+
+#
+# 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="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"

configs/ez80f910200zco/ostest/Make.defs

@@ -33,51 +33,67 @@
 #
 ############################################################################
 
-include ${TOPDIR}/.config
+include $(TOPDIR)/.config
-include ${TOPDIR}/tools/Config.mk
+include $(TOPDIR)/tools/Config.mk
 
 # These are the directories where the ZDS-II toolchain is installed
 
 ZDSVERSION := 5.1.1
-ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  ZDSBINDIR := $(ZDSINSTALLDIR)\bin
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
-  ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
+  INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
-  ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
+  ZDSBINDIR := $(INSTALLDIR)\bin
-  ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
+  ZDSSTDINCDIR := $(INSTALLDIR)\include\std
-  ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
+  ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
+  ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
+  ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
+
+  # CFLAGs
+
+  ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
+  EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
+  ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
+  ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
+  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std
   ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
   ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
   ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
+
+  # These are the same directories but with the directory separator
+  # character swapped as needed by the ZDS-II compiler
+
+  WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
+  WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
+  WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
+  WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
+  WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
+
+  # Escaped versions
+
+  ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
+  EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
+  EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
+
+  # CFLAGs
+
+  ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+  EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
+  ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+  ARCHUSRINCLUDES = -usrinc:'.'
 endif
 
-# These are the same directories but with the directory separator
-# character swapped as needed by the ZDS-II compiler
-
-WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
-WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
-WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
-WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
-WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
-
-# Escaped versions
-
-ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
-EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
-EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
-
 # Assembler definitions
 
 ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
-ARCHCPU = eZ80F91
+  ARCHCPU = eZ80F91
-ARCHCPUDEF = _EZ80F91
+  ARCHCPUDEF = _EZ80F91
-ARCHFAMILY = _EZ80ACCLAIM!
+  ARCHFAMILY = _EZ80ACCLAIM!
 endif
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
@@ -90,10 +106,7 @@ ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase
 ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS = -warn
 ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
-ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
-		 $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -109,14 +122,11 @@ ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
 ARCHPICFLAGS =
 ARCHWARNINGS = -warn
 ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
-ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
-ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-		  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
-CPPINCLUDES = -I$(TOPDIR)/include
+CPPINCLUDES = -I$(TOPDIR)$(DELIM)include
 CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES)
 
 # Librarian definitions
@@ -125,16 +135,16 @@ ARFLAGS = -quiet -warn
 
 # Linker definitions
 
-LINKCMDTEMPLATE = $(TOPDIR)/configs/ez80f910200zco/ostest/ostest.linkcmd
+LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)ez80f910200zco$(DELIM)ostest$(DELIM)ostest.linkcmd
 
 # Tool names/pathes
 
 CROSSDEV =
-CC = $(ZDSBINDIR)/ez80cc.exe
+CC = ez80cc.exe
 CPP = gcc -E
-LD = $(ZDSBINDIR)/ez80link.exe
+LD = ez80link.exe
-AS = $(ZDSBINDIR)/ez80asm.exe
+AS = ez80asm.exe
-AR = $(ZDSBINDIR)/ez80lib.exe
+AR = ez80lib.exe
 
 # File extensions
 
@@ -148,51 +158,89 @@ HEXEXT = .hex
 # to compile and assembly source files and to insert the resulting
 # object files into an archive
 
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+
+define PREPROCESS
+	@echo CPP: $1->$2
+	$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	$(Q) "$(CC)" $(CFLAGS)  ${shell echo $1 | sed -e "s/\//\\/g"}
+endef
+
+define ASSEMBLE
+	$(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
+endef
+
+define ARCHIVE
+	echo AR: $2
+	$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+endef
+
+define CLEAN
+	$(Q) if exist *.obj (del /f /q *.obj)
+	$(Q) if exist *.src (del /f /q *.src)
+	$(Q) if exist *.lib (del /f /q *.lib)
+	$(Q) if exist *.hex (del /f /q *.hex)
+	$(Q) if exist *.lod (del /f /q *.lod)
+	$(Q) if exist *.lst (del /f /q *.lst)
+endef
+
+else
+
 define PREPROCESS
 	@echo "CPP: $1->$2"
 	$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
 endef
 
 define COMPILE
-	@#echo "CC: $1"
 	$(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
 endef
 
 define ASSEMBLE
-	@#echo "AS: $1"
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef
 
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-define ARCHIVE
-	echo "AR: $2";
-	$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
-endef
-else
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
 		"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
 	done
 endef
-endif
 
 define CLEAN
 	$(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
 endef
+endif
 
-# This is the tool to use for dependencies (i.e., none)
+# Windows native host tool definitions
 
-MKDEP = $(TOPDIR)/tools/mknulldeps.sh
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  HOSTCC = mingw32-gcc.exe
+  HOSTINCLUDES = -I.
+  HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
+  HOSTLDFLAGS =
+  HOSTEXEEXT = .exe
 
-# ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies
+  # Windows-native host tools
 
-DIRLINK = $(TOPDIR)/tools/winlink.sh
+  MKDEP = $(TOPDIR)\tools\mkdeps.exe --winnative
-DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+else
 
 # Linux/Cygwin host tool definitions
 
-HOSTCC = gcc
+  HOSTCC = gcc
-HOSTINCLUDES = -I.
+  HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe
+  HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS =
+  HOSTLDFLAGS =
+
+  # This is the tool to use for dependencies (i.e., none)
+
+  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh
+
+  # ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies
+
+  DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)winlink.sh
+  DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
+endif

configs/ez80f910200zco/ostest/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/ez80f910200zco/ostest/appconfig
-#
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/ostest
-

configs/ez80f910200zco/ostest/setenv.sh

@@ -33,20 +33,31 @@
 #
 # Check how we were executed
 #
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-#
+WD=`pwd`
-# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
+if [ ! -x "setenv.sh" ]; then
-# attempts to set the PATH variable do not have the desired effect.
+  echo "This script must be executed from the top-level NuttX build directory"
-# Instead, alias are provided for all of the ZDS-II command line tools.
+  exit 1
-# Version 5.1.1 installed in the default location is assumed here.
+fi
-#
-ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
-alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
-alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
-alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
-alias ez80link="${ZDSBINDIR}/ez80link.exe"
 
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+#
+# This is the Cygwin path to location where the XDS-II tools were installed
+#
+TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
+
+#
+# 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="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"

configs/ez80f910200zco/poll/Make.defs

@@ -92,8 +92,7 @@ ARCHASMWARNINGS 	= -warn
 ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -112,8 +111,7 @@ ARCHDEFINES		= -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include

configs/ez80f910200zco/poll/setenv.sh

@@ -33,20 +33,31 @@
 #
 # Check how we were executed
 #
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-#
+WD=`pwd`
-# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
+if [ ! -x "setenv.sh" ]; then
-# attempts to set the PATH variable do not have the desired effect.
+  echo "This script must be executed from the top-level NuttX build directory"
-# Instead, alias are provided for all of the ZDS-II command line tools.
+  exit 1
-# Version 5.1.1 installed in the default location is assumed here.
+fi
-#
-ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
-alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
-alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
-alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
-alias ez80link="${ZDSBINDIR}/ez80link.exe"
 
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+#
+# This is the Cygwin path to location where the XDS-II tools were installed
+#
+TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
+
+#
+# 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="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"

configs/z16f2800100zcog/ostest/Make.defs

@@ -82,10 +82,9 @@ endif
 ARCHASMCPUFLAGS = -cpu:Z16F2811AL -NOigcase
 ARCHASMLIST = -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS = -warn
-ARCHASMDEFINES		= -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1 \ 				  -define:__ASSEMBLY__
+ARCHASMDEFINES = -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -100,13 +99,11 @@ ARCHCPUFLAGS		= -chartype:S -model:L -NOmodsect -cpu:Z16F2811AL -NOgenprint \
 ARCHLIST = -keeplst -NOlist -NOlistinc -NOkeepasm
 ARCHPICFLAGS =
 ARCHWARNINGS = -warn
-ARCHDEFINES		= -define:_Z16F2811AL -define:_Z16K_SERIES \
+ARCHDEFINES = -define:_Z16F2811AL -define:_Z16K_SERIES -define:_Z16F_SERIES
-			  -define:_Z16F_SERIES
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D_Z16F2811AL -D_Z16K_SERIES -D_Z16F_SERIES -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include

configs/z16f2800100zcog/pashello/Make.defs

@@ -82,10 +82,9 @@ endif
 ARCHASMCPUFLAGS = -cpu:Z16F2811AL -NOigcase
 ARCHASMLIST = -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS = -warn
-ARCHASMDEFINES		= -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1 \ 				  -define:__ASSEMBLY__
+ARCHASMDEFINES = -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -100,13 +99,11 @@ ARCHCPUFLAGS		= -chartype:S -model:L -NOmodsect -cpu:Z16F2811AL -NOgenprint \
 ARCHLIST = -keeplst -NOlist -NOlistinc -NOkeepasm
 ARCHPICFLAGS =
 ARCHWARNINGS = -warn
-ARCHDEFINES		= -define:_Z16F2811AL -define:_Z16K_SERIES \
+ARCHDEFINES = -define:_Z16F2811AL -define:_Z16K_SERIES -define:_Z16F_SERIES
-			  -define:_Z16F_SERIES
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D_Z16F2811AL -D_Z16K_SERIES -D_Z16F_SERIES -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include

configs/z8encore000zco/ostest/Make.defs

@@ -115,11 +115,10 @@ endif
 ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase $(ARCHREVAA)
 ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS = -warn
-ARCHASMDEFINES		= -define:$(ARCHCPUDEF)=1 -define:$(ARCHSERIESDEF)=1 -define:$(ARCHFAMILYDEF)=1 \ 				  -define:__ASSEMBLY__
+ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHSERIESDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -138,8 +137,7 @@ ARCHDEFINES		= -define:$(ARCHFAMILYDEF) -define:$(ARCHCPUDEF) -define:$(ARCHSERI
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSDEVINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D$(ARCHSERIESDEF) -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include

configs/z8f64200100kit/ostest/Make.defs

@@ -115,11 +115,10 @@ endif
 ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase $(ARCHREVAA)
 ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS = -warn
-ARCHASMDEFINES		= -define:$(ARCHCPUDEF)=1 -define:$(ARCHSERIESDEF)=1 -define:$(ARCHFAMILYDEF)=1 \ 				  -define:__ASSEMBLY__
+ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHSERIESDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
 ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
@@ -138,8 +137,7 @@ ARCHDEFINES		= -define:$(ARCHFAMILYDEF) -define:$(ARCHCPUDEF) -define:$(ARCHSERI
 ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSDEVINCDIR)'
 ARCHUSRINCLUDES = -usrinc:'.'
 ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
 CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D$(ARCHSERIESDEF) -D__ASSEMBLY__
 CPPINCLUDES = -I$(TOPDIR)/include