From 0fc6545aef687f4c7d7de3489110005c62554182 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 1 Oct 2010 01:07:04 +0000
Subject: [PATCH] Update ZNEO to use ZDS-II 4.11.1
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2956 42af7a65-404d-4744-a932-0658087f49c3
---
TODO | 8 ++------
configs/z16f2800100zcog/README.txt | 15 ++++++++++++---
configs/z16f2800100zcog/ostest/Make.defs | 4 ++--
configs/z16f2800100zcog/ostest/setenv.sh | 6 +++---
configs/z16f2800100zcog/pashello/Make.defs | 4 ++--
configs/z16f2800100zcog/pashello/setenv.sh | 8 ++++----
6 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/TODO b/TODO
index f74e98527b..e1fed73e3a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated September 13, 2010)
+NuttX TODO List (Last updated September 30, 2010)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
(5) Task/Scheduler (sched/)
@@ -34,7 +34,7 @@ NuttX TODO List (Last updated September 13, 2010)
(2) Hitachi/Renesas SH-1 (arch/sh/src/sh1)
(4) Renesas M16C/26 (arch/sh/src/m16c)
(8) z80/z8/ez80 (arch/z80/)
- (9) z16 (arch/z16/)
+ (8) z16 (arch/z16/)
(1) mc68hc1x (arch/hc)
o Task/Scheduler (sched/)
@@ -1167,10 +1167,6 @@ o z16 (arch/z16)
Status: Open
Priority: Low
- Description: Upgrade to the ZDS-II ZNEO 4.11.1 toolchain
- Status: Open
- Priority: Low
-
Description: The file drivers/mmcsd/mmcsd_sdio.c generates an internal compiler
error like:
diff --git a/configs/z16f2800100zcog/README.txt b/configs/z16f2800100zcog/README.txt
index 9c7fc762ac..3eb6f59081 100644
--- a/configs/z16f2800100zcog/README.txt
+++ b/configs/z16f2800100zcog/README.txt
@@ -1,6 +1,8 @@
README.txt
^^^^^^^^^^
+This is the README file for the NuttX port to the ZiLog ZNEO MCU.
+
ZDS-II Compiler Versions
^^^^^^^^^^^^^^^^^^^^^^^^
@@ -23,10 +25,17 @@ ZDS-II Compiler Versions
- The Pascal add-on interpreter includes a large switch statement and
exposes another compiler problem. This is reported as incident 81459.
-If you use any version of ZDS-II other than 4.11.0 or if you install ZDS-II
+4.11.1
+ As of this writing (30 September 2010), the latest release of ZDS-II for the
+ ZNEO is 4.11.1. It is unknown if this release includes fixes for incidents
+ 81400 and 81459 or not. It is unknown if the code will run without -reduceopt
+ either. (Basically, it compiles with 4.11.1, but is untested with that version).
+
+If you use any version of ZDS-II other than 4.11.1 or if you install ZDS-II
at any location other than the default location, you will have to modify
two files: (1) configs/z16f2800100zcog/*/setenv.sh and (2)
-configs/z16f2800100zcog/*/Make.defs.
+configs/z16f2800100zcog/*/Make.defs. Simply edit these two files, changing
+4.11.1 to whatever.
Configuration Subdirectories
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -41,7 +50,7 @@ following steps:
cd <nuttx-top-directory>/tools
./configure.sh z16f2800100zcog/<sub-directory>
- cd <nuttx-top-directgory>
+ cd <nuttx-top-directory>
make
Where <sub-directory> is the specific board configuration that you
diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs
index be82296e58..5bafe55532 100644
--- a/configs/z16f2800100zcog/ostest/Make.defs
+++ b/configs/z16f2800100zcog/ostest/Make.defs
@@ -1,7 +1,7 @@
############################################################################
# configs/z16f2800100zcog/ostest/Make.defs
#
-# Copyright (C) 2008 Gregory Nutt. All rights reserved.
+# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
# These are the directories where the ZNeo-II toolchain is installed
-ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.0
+ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog
diff --git a/configs/z16f2800100zcog/ostest/setenv.sh b/configs/z16f2800100zcog/ostest/setenv.sh
index c68caf2d45..5a7bf2779a 100755
--- a/configs/z16f2800100zcog/ostest/setenv.sh
+++ b/configs/z16f2800100zcog/ostest/setenv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# configs/z16f2800100zcog/ostest/setenv.sh
#
-# Copyright (C) 2008 Gregory Nutt. All rights reserved.
+# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
@@ -42,9 +42,9 @@ fi
# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
# attempts to set the PATH variable do not have the desired effect.
# Instead, alias are provided for all of the ZDS-II command line tools.
-# Version 4.11.0 installed in the default location is assumed here.
+# Version 4.11.1 installed in the default location is assumed here.
#
-ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.0/bin"
+ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1/bin"
alias zneoasm="${ZDSBINDIR}/zneoasm.exe"
alias zneocc="${ZDSBINDIR}/zneocc.exe"
alias zneolib="${ZDSBINDIR}/zneolib.exe"
diff --git a/configs/z16f2800100zcog/pashello/Make.defs b/configs/z16f2800100zcog/pashello/Make.defs
index 19fa125e5e..266eb519ba 100755
--- a/configs/z16f2800100zcog/pashello/Make.defs
+++ b/configs/z16f2800100zcog/pashello/Make.defs
@@ -1,7 +1,7 @@
############################################################################
# configs/z16f2800100zcog/pashello/Make.defs
#
-# Copyright (C) 2008 Gregory Nutt. All rights reserved.
+# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
# These are the directories where the ZNeo-II toolchain is installed
-ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.0
+ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog
diff --git a/configs/z16f2800100zcog/pashello/setenv.sh b/configs/z16f2800100zcog/pashello/setenv.sh
index 40846da4b6..982461b246 100755
--- a/configs/z16f2800100zcog/pashello/setenv.sh
+++ b/configs/z16f2800100zcog/pashello/setenv.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# z16f2800100zcog/setenv.sh
#
-# Copyright (C) 2008 Gregory Nutt. All rights reserved.
+# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
@@ -42,10 +42,10 @@ fi
# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
# attempts to set the PATH variable do not have the desired effect.
# Instead, alias are provided for all of the ZDS-II command line tools.
-# Version 4.11.0 installed in the default location is assumed here.
+# Version 4.11.1 installed in the default location is assumed here.
#
-ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.0/bin"
+ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1/bin"
alias zneoasm="${ZDSBINDIR}/zneoasm.exe"
alias zneocc="${ZDSBINDIR}/zneocc.exe"
alias zneolib="${ZDSBINDIR}/zneolib.exe"
-alias zneolink="${ZDSBINDIR}/zneolink.exe"
\ No newline at end of file
+alias zneolink="${ZDSBINDIR}/zneolink.exe"
--
GitLab