update

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

4 files changed, 11 insertions, 10 deletions

diff --git a/nuttx/configs/ez80f910200zco/ostest/Make.defs b/nuttx/configs/ez80f910200zco/ostest/Make.defs
index f829c40ac..37940a3a8 100644
--- a/nuttx/configs/ez80f910200zco/ostest/Make.defs
+++ b/nuttx/configs/ez80f910200zco/ostest/Make.defs
@@ -37,7 +37,8 @@ include ${TOPDIR}/.config
 
 # These are the directories where the ZDS-II toolchain is installed
 
-ZDSINSTALLDIR		:= C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.0
+ZDSVERSION		:= 4.11.1
+ZDSINSTALLDIR		:= C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
 ZDSBINDIR		:= $(ZDSINSTALLDIR)/bin
 ZDSSTDINCDIR		:= $(ZDSINSTALLDIR)/include/std
 ZDSZILOGINCDIR		:= $(ZDSINSTALLDIR)/include/zilog
diff --git a/nuttx/configs/ez80f910200zco/ostest/ostest.linkcmd b/nuttx/configs/ez80f910200zco/ostest/ostest.linkcmd
index 89b90e75e..82600ec54 100755
--- a/nuttx/configs/ez80f910200zco/ostest/ostest.linkcmd
+++ b/nuttx/configs/ez80f910200zco/ostest/ostest.linkcmd
@@ -83,10 +83,10 @@ DEFINE __FLASH_ADDR_U_INIT_PARAM = $00
 
 define _SYS_CLK_FREQ = 50000000
 
-define _OSC_FREQ = 5000000
-define _SYS_CLK_SRC = 1
-define _OSC_FREQ_MULT = 10
-define __PLL_CTL0_INIT_PARAM = $41
+define _OSC_FREQ = 50000000
+define _SYS_CLK_SRC = 0
+define _OSC_FREQ_MULT = 1
+define __PLL_CTL0_INIT_PARAM = $0
 
 /* arch/z80/src/Makefile.zdsii will append target, object and library paths below */
 
diff --git a/nuttx/configs/ez80f910200zco/ostest/ostest.zdsproj b/nuttx/configs/ez80f910200zco/ostest/ostest.zdsproj
index d558a2e5f..157b434eb 100755
--- a/nuttx/configs/ez80f910200zco/ostest/ostest.zdsproj
+++ b/nuttx/configs/ez80f910200zco/ostest/ostest.zdsproj
@@ -1,4 +1,4 @@
-<project type="Executable" project-type="Standard" configuration="Debug" created-by="c:4.11:07071801" modified-by="c:4.11:07071801">

+<project type="Executable" project-type="Standard" configuration="Debug" created-by="c:4.11:07071801" modified-by="c:4.11:08011102">

 <cpu>eZ80F91</cpu>

 

 <!-- file information -->

@@ -42,7 +42,7 @@
 </tool>

 <tool name="Debugger">

 <options>

-<option name="target" type="string" change-action="rebuild">eZ80F91ModDevKit_Flash</option>

+<option name="target" type="string" change-action="rebuild">eZ80DevPlatform_F91_Flash</option>

 <option name="debugtool" type="string" change-action="none">USBSmartCable</option>

 <option name="usepageerase" type="boolean" change-action="none">true</option>

 </options>

@@ -100,13 +100,13 @@
 <option name="xref" type="boolean" change-action="none">true</option>

 <option name="undefisfatal" type="boolean" change-action="none">true</option>

 <option name="warnisfatal" type="boolean" change-action="none">false</option>

-<option name="sort" type="string" change-action="none">NAME</option>

+<option name="sort" type="string" change-action="none">ADDRESS</option>

 <option name="padhex" type="boolean" change-action="build">false</option>

 <option name="fplib" type="string" change-action="build">Real</option>

 <option name="useadddirectives" type="boolean" change-action="build">false</option>

 <option name="linkconfig" type="string" change-action="build">Standard</option>

 <option name="flashinfo" type="string" change-action="build">000000-0001FF</option>

-<option name="ram" type="string" change-action="build">B7E000-B7FFFF</option>

+<option name="ram" type="string" change-action="build">B8000-BfFFFF</option>

 <option name="rom" type="string" change-action="build">000000-03FFFF</option>

 <option name="extio" type="string" change-action="build">000000-00FFFF</option>

 <option name="intio" type="string" change-action="build">000000-0000FF</option>

diff --git a/nuttx/configs/ez80f910200zco/ostest/setenv.sh b/nuttx/configs/ez80f910200zco/ostest/setenv.sh
index 8aa2cd711..ca2206980 100755
--- a/nuttx/configs/ez80f910200zco/ostest/setenv.sh
+++ b/nuttx/configs/ez80f910200zco/ostest/setenv.sh
@@ -44,7 +44,7 @@ fi
 # Instead, alias are provided for all of the ZDS-II command line tools.
 # Version 4.10.1 installed in the default location is assumed here.
 #
-ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.10.1/bin"
+ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin"
 alias ez8asm="${ZDSBINDIR}/ez8asm.exe"
 alias ez8cc="${ZDSBINDIR}/ez8cc.exe"
 alias ez8lib="${ZDSBINDIR}/ez8lib.exe"