Verify that z8 targets still build (under Cygwin)

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

3 files changed, 65 insertions, 7 deletions

diff --git a/nuttx/configs/z8f64200100kit/README.txt b/nuttx/configs/z8f64200100kit/README.txt
index afe647565..1bb70ebb7 100644
--- a/nuttx/configs/z8f64200100kit/README.txt
+++ b/nuttx/configs/z8f64200100kit/README.txt
@@ -23,12 +23,23 @@ ZDS-II Compiler Versions
  
    /* Set up global variables */
 
-4.9.5
+Version 4.9.5
   This is the latest tool version listed on the ZiLOG site for the Z8F6403.
   However, it uses different compiler command line arguments.
 
+Version 5.0.0
+
+  On November 18, 2012, all of the z8 configurations were converted to use 5.0.0,
+  but have not been verified on a running target.
+
+  Paths were also updated that are specific to a 32-bit toolchain running on
+  a 64 bit windows platform.  Change to a different toolchain, you will need
+  to modify the versioning in Make.defs and setenv.sh; if you want to build
+  on a different platform, you will need to change the path in the ZDS binaries
+  in those same files.
+  
 Other Versions
-  If you use any version of ZDS-II other than 4.10.1 or if you install ZDS-II
+  If you use any version of ZDS-II other than 5.0.0 or if you install ZDS-II
   at any location other than the default location, you will have to modify
   two files:  (1) configs/z8f64200100kit/*/setenv.sh and (2)
   configs/z8f64200100kit/*/Make.defs.
@@ -57,4 +68,44 @@ available:
     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.
+
 Check out any README.txt files in these <sub-directory>s.
diff --git a/nuttx/configs/z8f64200100kit/ostest/Make.defs b/nuttx/configs/z8f64200100kit/ostest/Make.defs
index 570fd0f1b..8b58a7346 100644
--- a/nuttx/configs/z8f64200100kit/ostest/Make.defs
+++ b/nuttx/configs/z8f64200100kit/ostest/Make.defs
@@ -36,7 +36,14 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 
-# These are the directories where the ZDS-II toolchain is installed
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
 
 ZDSVERSION := 5.0.0
 
@@ -63,7 +70,7 @@ endif
   ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
-  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std
@@ -179,7 +186,7 @@ AR = ez8lib.exe
 ASMEXT = .asm
 OBJEXT = .obj
 LIBEXT = .lib
-EXEXT = .hex
+EXEEXT = .hex
 
 # These are the macros that will be used in the NuttX make system
 # to compile and assembly source files and to insert the resulting
diff --git a/nuttx/configs/z8f64200100kit/ostest/setenv.sh b/nuttx/configs/z8f64200100kit/ostest/setenv.sh
index 1a135a7d6..b06ae60f9 100755
--- a/nuttx/configs/z8f64200100kit/ostest/setenv.sh
+++ b/nuttx/configs/z8f64200100kit/ostest/setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# configs/ez80f910200kitg/ostest/setenv.sh
+# configs/z8f64200100kit/ostest/setenv.sh
 #
-#   Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without