Initial fixes for Z8Encore debug

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

2 files changed, 25 insertions, 25 deletions

diff --git a/nuttx/configs/z8encore000zco/ostest/ostest.linkcmd b/nuttx/configs/z8encore000zco/ostest/ostest.linkcmd
index 4c291a67e..befb1ac71 100755
--- a/nuttx/configs/z8encore000zco/ostest/ostest.linkcmd
+++ b/nuttx/configs/z8encore000zco/ostest/ostest.linkcmd
@@ -61,8 +61,7 @@ define _low_nearbss = base of NEAR_BSS
 define _len_nearbss = length of NEAR_BSS
 define _low_farbss = base of FAR_BSS
 define _len_farbss = length of FAR_BSS
-define _far_heaptop = highaddr of EDATA
-define _far_stack = highaddr of EDATA
+define _far_stacktop = highaddr of EDATA
 define _near_stack = highaddr of RDATA
 define _far_heapbot = top of EDATA
 define _near_heaptop = highaddr of RDATA
diff --git a/nuttx/configs/z8encore000zco/ostest/ostest.zfpproj b/nuttx/configs/z8encore000zco/ostest/ostest.zfpproj
index 0c65b6ec7..d46a19859 100644
--- a/nuttx/configs/z8encore000zco/ostest/ostest.zfpproj
+++ b/nuttx/configs/z8encore000zco/ostest/ostest.zfpproj
@@ -1,8 +1,9 @@
 <project type="Standard" project-type="Standard" configuration="Debug" created-by="{{build_number}}" modified-by="b:4.10:06121401">

-<cpu>Z8F6423</cpu>

+<cpu>Z8F6403</cpu>

 

 <!-- file information -->

 <files>

+<file filter-key="">.\zsldevinit.asm</file>

 <file filter-key="flash">..\..\..\nuttx.hex</file>

 </files>

 

@@ -12,7 +13,7 @@
 <tools>

 <tool name="Assembler">

 <options>

-<option name="define" type="string" change-action="assemble">_Z8F6423=1,_Z8ENCORE_F642X=1</option>

+<option name="define" type="string" change-action="assemble">_Z8F6403=1,_Z8ENCORE_640_FAMILY=1,_Z8ENCORE_F640X=1</option>

 <option name="include" type="string" change-action="assemble"></option>

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

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

@@ -20,7 +21,7 @@
 <option name="pagelen" type="integer" change-action="none">56</option>

 <option name="pagewidth" type="integer" change-action="none">80</option>

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

-<option name="revaa" type="boolean" change-action="rebuild">false</option>

+<option name="revaa" type="boolean" change-action="rebuild">true</option>

 <option name="sdiopt" type="boolean" change-action="assemble">true</option>

 </options>

 </tool>

@@ -28,7 +29,7 @@
 <options>

 <option name="codegen" type="string" change-action="none">UserDefined</option>

 <option name="const" type="string" change-action="compile">RAM</option>

-<option name="define" type="string" change-action="compile">_Z8F6423,_Z16F_SERIES,_Z8ENCORE_F642X</option>

+<option name="define" type="string" change-action="compile">_Z8F6403,_Z16F_SERIES,_Z8ENCORE_640_FAMILY,_Z8ENCORE_F640X</option>

 <option name="genprintf" type="boolean" change-action="compile">true</option>

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

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

@@ -38,7 +39,7 @@
 <option name="optlink" type="boolean" change-action="compile">false</option>

 <option name="promote" type="boolean" change-action="compile">true</option>

 <option name="regvar" type="string" change-action="compile">Normal</option>

-<option name="regvarcache" type="string" change-action="none">false</option>

+<option name="regvarcache" type="string" change-action="none">Normal</option>

 <option name="reduceopt" type="boolean" change-action="compile">false</option>

 <option name="stdinc" type="string" change-action="compile"></option>

 <option name="usrinc" type="string" change-action="compile"></option>

@@ -47,8 +48,8 @@
 </tool>

 <tool name="Debugger">

 <options>

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

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

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

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

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

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

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

@@ -85,7 +86,7 @@
 </tool>

 <tool name="Librarian">

 <options>

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

+<option name="outfile" type="string" change-action="build">.\ostest.lib</option>

 </options>

 </tool>

 <tool name="Linker">

@@ -108,21 +109,21 @@
 <option name="quiet" type="boolean" change-action="none">false</option>

 <option name="rdata" type="string" change-action="build">20-FF</option>

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

-<option name="rom" type="string" change-action="build">000000-007FFF</option>

+<option name="rom" type="string" change-action="build">0-FFF</option>

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

-<option name="startuptype" type="string" change-action="build">1</option>

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

 <option name="startuplnkcmds" type="boolean" change-action="build">true</option>

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

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

 <option name="usecrun" type="boolean" change-action="build">true</option>

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

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

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

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

 </options>

 </tool>

 <tool name="Middleware">

 <options>

-<option name="usezsl" type="boolean" change-action="rebuild">false</option>

+<option name="usezsl" type="boolean" change-action="rebuild">true</option>

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

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

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

@@ -134,7 +135,7 @@
 <tools>

 <tool name="Assembler">

 <options>

-<option name="define" type="string" change-action="assemble">_Z8F6423=1,_Z16F_SERIES=1,_Z8ENCORE_F642X=1</option>

+<option name="define" type="string" change-action="assemble">_Z8F6403=1,_Z16F_SERIES=1,_Z8ENCORE_640_FAMILY=1,_Z8ENCORE_F640X=1</option>

 <option name="include" type="string" change-action="assemble"></option>

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

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

@@ -150,17 +151,17 @@
 <options>

 <option name="codegen" type="string" change-action="none">UserDefined</option>

 <option name="const" type="string" change-action="compile">RAM</option>

-<option name="define" type="string" change-action="compile">_Z8F6423,_Z16F_SERIES,_Z8ENCORE_F642X</option>

+<option name="define" type="string" change-action="compile">_Z8F6403,_Z16F_SERIES,_Z8ENCORE_640_FAMILY,_Z8ENCORE_F640X</option>

 <option name="genprintf" type="boolean" change-action="compile">true</option>

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

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

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

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

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

 <option name="model" type="string" change-action="compile">S</option>

 <option name="optlink" type="boolean" change-action="compile">false</option>

 <option name="promote" type="boolean" change-action="compile">true</option>

-<option name="regvar" type="string" change-action="compile">true</option>

-<option name="regvarcache" type="string" change-action="none">false</option>

+<option name="regvar" type="string" change-action="compile">Normal</option>

+<option name="regvarcache" type="string" change-action="none">Normal</option>

 <option name="reduceopt" type="boolean" change-action="compile">false</option>

 <option name="stdinc" type="string" change-action="compile"></option>

 <option name="usrinc" type="string" change-action="compile"></option>

@@ -170,7 +171,7 @@
 <tool name="Debugger">

 <options>

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

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

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

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

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

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

@@ -199,7 +200,7 @@
 <tool name="General">

 <options>

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

-<option name="debug" type="boolean" change-action="assemble">false</option>

+<option name="debug" type="boolean" change-action="assemble">true</option>

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

 <option name="igcase" type="boolean" change-action="assemble">false</option>

 <option name="outputdir" type="string" change-action="compile">.</option>

@@ -230,21 +231,21 @@
 <option name="quiet" type="boolean" change-action="none">false</option>

 <option name="rdata" type="string" change-action="build">20-FF</option>

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

-<option name="rom" type="string" change-action="build">000000-007FFF</option>

+<option name="rom" type="string" change-action="build">0-FFF</option>

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

-<option name="startuptype" type="string" change-action="build">1</option>

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

 <option name="startuplnkcmds" type="boolean" change-action="build">true</option>

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

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

 <option name="usecrun" type="boolean" change-action="build">true</option>

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

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

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

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

 </options>

 </tool>

 <tool name="Middleware">

 <options>

-<option name="usezsl" type="boolean" change-action="rebuild">false</option>

+<option name="usezsl" type="boolean" change-action="rebuild">true</option>

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

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

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