sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

boards/z80/ez80/z20x: Update CFLAGS and linker scripts.

Browse Source 
arch/z80/src/ez80/Toolchain.defs:  Update some CFLAGS to match CFLAGS from ZDS-II IDE.  Apparently, we must say that the CPU is an eZ80F91 event when compiler for eZ80F92.
boards/z80/ez80/z20x:  Update linker scripts.
This commit is contained in:
Gregory Nutt 2020-02-25 14:38:24 -06:00 committed by Abdelatif Guettouche
parent 930e2788cc
commit a9610e16bd
19 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/z80/src/ez80/Toolchain.defs
View File

@ -111,8 +111,10 @@ ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
ARCHCPUDEF = _EZ80F91 ARCHCPUDEF = _EZ80F91
ARCHFAMILY = _EZ80ACCLAIM! ARCHFAMILY = _EZ80ACCLAIM!
else ifeq ($(CONFIG_ARCH_CHIP_EZ80F92),y) else ifeq ($(CONFIG_ARCH_CHIP_EZ80F92),y)
ARCHCPU = eZ80F92 #ARCHCPU = eZ80F92
ARCHCPUDEF = _EZ80F92 #ARCHCPUDEF = _EZ80F92
ARCHCPU = eZ80F91
ARCHCPUDEF = _EZ80F91
ARCHFAMILY = _EZ80ACCLAIM! ARCHFAMILY = _EZ80ACCLAIM!
endif endif
@ -122,14 +124,15 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
ARCHASMOPTIMIZATION = -debug -NOsdiopt ARCHASMOPTIMIZATION = -debug -NOsdiopt
ARCHOPTIMIZATION = -debug ARCHOPTIMIZATION = -debug
else else
ARCHASMOPTIMIZATION = -nodebug -NOsdiopt ARCHASMOPTIMIZATION = -nodebug -sdiopt
ARCHOPTIMIZATION = -nodebug ARCHOPTIMIZATION = -NOdebug
endif endif
ifeq ($(CONFIG_DEBUG_NOOPT),y) ifeq ($(CONFIG_DEBUG_NOOPT),y)
ARCHOPTIMIZATION += -reduceopt ARCHOPTIMIZATION += -reduceopt
#else #else
# ARCHOPTIMIZATION += -optsize # ARCHOPTIMIZATION += -promote -NOreduceopt -optsize
ARCHOPTIMIZATION += -promote -NOreduceopt
endif endif
# Tool names/paths. # Tool names/paths.

6
boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
View File

@ -57,7 +57,7 @@ endif
ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase
ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
ARCHASMWARNINGS = -warn ARCHASMWARNINGS = -warn
ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILY)=1 -define:__ASSEMBLY__
AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
# Compiler definitions # Compiler definitions
@ -67,11 +67,11 @@ ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
ARCHPICFLAGS = ARCHPICFLAGS =
ARCHWARNINGS = -warn ARCHWARNINGS = -warn
ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILY)
ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ CPPDEFINES = -D$(ARCHFAMILY) -D$(ARCHCPUDEF) -D__ASSEMBLY__
CPPINCLUDES = -I$(TOPDIR)$(DELIM)include CPPINCLUDES = -I$(TOPDIR)$(DELIM)include
CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES)

6
boards/z80/ez80/ez80f910200zco/scripts/Make.defs
View File

@ -57,7 +57,7 @@ endif
ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase
ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
ARCHASMWARNINGS = -warn ARCHASMWARNINGS = -warn
ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILY)=1 -define:__ASSEMBLY__
AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
# Compiler definitions # Compiler definitions
@ -67,11 +67,11 @@ ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
ARCHPICFLAGS = ARCHPICFLAGS =
ARCHWARNINGS = -warn ARCHWARNINGS = -warn
ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILY)
ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ CPPDEFINES = -D$(ARCHFAMILY) -D$(ARCHCPUDEF) -D__ASSEMBLY__
CPPINCLUDES = -I$(TOPDIR)$(DELIM)include CPPINCLUDES = -I$(TOPDIR)$(DELIM)include
CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES)

6
boards/z80/ez80/makerlisp/scripts/Make.defs
View File

@ -57,7 +57,7 @@ endif
ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase
ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
ARCHASMWARNINGS = -warn ARCHASMWARNINGS = -warn
ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILY)=1 -define:__ASSEMBLY__
AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
# Compiler definitions # Compiler definitions
@ -67,11 +67,11 @@ ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
ARCHPICFLAGS = ARCHPICFLAGS =
ARCHWARNINGS = -warn ARCHWARNINGS = -warn
ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILY)
ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ CPPDEFINES = -D$(ARCHFAMILY) -D$(ARCHCPUDEF) -D__ASSEMBLY__
CPPINCLUDES = -I$(TOPDIR)$(DELIM)include CPPINCLUDES = -I$(TOPDIR)$(DELIM)include
CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES)

10
boards/z80/ez80/z20x/configs/nsh_flash/nsh.zdsproj
View File

@ -107,8 +107,8 @@
<option name="padhex" type="boolean" change-action="build">false</option> <option name="padhex" type="boolean" change-action="build">false</option>
<option name="fplib" type="string" change-action="build">Real</option> <option name="fplib" type="string" change-action="build">Real</option>
<option name="useadddirectives" type="boolean" change-action="build">false</option> <option name="useadddirectives" type="boolean" change-action="build">false</option>
<option name="linkconfig" type="string" change-action="build">CopyToRam</option> <option name="linkconfig" type="string" change-action="build">Standard</option>
<option name="flashinfo" type="string" change-action="build">000000-0001FF</option> <option name="flashinfo" type="string" change-action="build">000000-0000FF</option>
<option name="ram" type="string" change-action="build">040000-0FFFFF</option> <option name="ram" type="string" change-action="build">040000-0FFFFF</option>
<option name="rom" type="string" change-action="build">000000-03FFFF</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="extio" type="string" change-action="build">000000-00FFFF</option>
@ -196,7 +196,7 @@
<option name="debug" type="boolean" change-action="assemble">true</option> <option name="debug" type="boolean" change-action="assemble">true</option>
<option name="debugcache" type="boolean" change-action="none">true</option> <option name="debugcache" type="boolean" change-action="none">true</option>
<option name="igcase" type="boolean" change-action="assemble">false</option> <option name="igcase" type="boolean" change-action="assemble">false</option>
<option name="outputdir" type="string" change-action="compile">..\..\..\nuttx</option> <option name="outputdir" type="string" change-action="compile">..\..\..\nuttx\</option>
</options> </options>
</tool> </tool>
<tool name="Librarian"> <tool name="Librarian">
@ -227,8 +227,8 @@
<option name="padhex" type="boolean" change-action="build">false</option> <option name="padhex" type="boolean" change-action="build">false</option>
<option name="fplib" type="string" change-action="build">Real</option> <option name="fplib" type="string" change-action="build">Real</option>
<option name="useadddirectives" type="boolean" change-action="build">false</option> <option name="useadddirectives" type="boolean" change-action="build">false</option>
<option name="linkconfig" type="string" change-action="build">CopyToRam</option> <option name="linkconfig" type="string" change-action="build">Standard</option>
<option name="flashinfo" type="string" change-action="build">000000-0001FF</option> <option name="flashinfo" type="string" change-action="build">000000-0000FF</option>
<option name="ram" type="string" change-action="build">040000-0BFFFF</option> <option name="ram" type="string" change-action="build">040000-0BFFFF</option>
<option name="rom" type="string" change-action="build">000000-03FFFF</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="extio" type="string" change-action="build">000000-00FFFF</option>

2
boards/z80/ez80/z20x/configs/nsh_flash/nsh_flash.ztgt
View File

@ -20,7 +20,7 @@
<device /> <device />
<externalAddress>200000</externalAddress> <externalAddress>200000</externalAddress>
<externalAutoSelect>false</externalAutoSelect> <externalAutoSelect>false</externalAutoSelect>
<externalRamLower>40000</externalRamLower> <externalRamLower>040000</externalRamLower>
<externalRamUpper>0BFFFF</externalRamUpper> <externalRamUpper>0BFFFF</externalRamUpper>
<manufacturer /> <manufacturer />
<units>1</units> <units>1</units>

12
boards/z80/ez80/z20x/configs/nsh_flash/nsh_ram.ztgt
View File

@ -37,15 +37,15 @@
</CS0> </CS0>
<CS1> <CS1>
<busMode>0</busMode> <busMode>0</busMode>
<controlRegister>8</controlRegister> <controlRegister>0</controlRegister>
<lower>8</lower> <lower>0</lower>
<upper>F</upper> <upper>0</upper>
</CS1> </CS1>
<CS2> <CS2>
<busMode>0</busMode> <busMode>0</busMode>
<controlRegister>28</controlRegister> <controlRegister>0</controlRegister>
<lower>20</lower> <lower>0</lower>
<upper>9F</upper> <upper>0</upper>
</CS2> </CS2>
<CS3> <CS3>
<busMode>0</busMode> <busMode>0</busMode>

2
boards/z80/ez80/z20x/configs/nsh_ram/README.txt
View File

@ -7,7 +7,7 @@ nsh.zfpproj is a simple project that will allow you to use the Smart Flash
Programming. NOTE: As of this writing this project does not work, probably Programming. NOTE: As of this writing this project does not work, probably
due to RAM configuration in the project. Use ZDS-II instead as is described due to RAM configuration in the project. Use ZDS-II instead as is described
in the upper README.txt file in the upper README.txt file
nsh_flash.ztgt is the target file that accompanies the project files. This nsh_ram.ztgt is the target file that accompanies the project files. This
one is identical to boards/scripts/z20x_ram.ztgt. one is identical to boards/scripts/z20x_ram.ztgt.
nsh_ram.ztgt is the target file that accompanies the project files. This nsh_ram.ztgt is the target file that accompanies the project files. This
one is identical to boards/scripts/z20x_flash.ztgt. one is identical to boards/scripts/z20x_flash.ztgt.

14
boards/z80/ez80/z20x/configs/nsh_ram/nsh.zdsproj
View File

@ -1,4 +1,4 @@
<project type="Executable" project-type="Standard" configuration="Release" created-by="d:5.3.0:17021001" modified-by="d:5.3.0:17021001" ZDSII="ZDSII - eZ80Acclaim! 5.3.0 (Build 17041303)"> <project type="Executable" project-type="Standard" configuration="Release" created-by="d:5.3.0:17021001" modified-by="d:5.3.0:19052909" ZDSII="ZDSII - eZ80Acclaim! 5.3.3 (Build 19083001)">
<cpu>eZ80F92</cpu> <cpu>eZ80F92</cpu>
<!-- file information --> <!-- file information -->
@ -107,8 +107,8 @@
<option name="padhex" type="boolean" change-action="build">false</option> <option name="padhex" type="boolean" change-action="build">false</option>
<option name="fplib" type="string" change-action="build">Real</option> <option name="fplib" type="string" change-action="build">Real</option>
<option name="useadddirectives" type="boolean" change-action="build">false</option> <option name="useadddirectives" type="boolean" change-action="build">false</option>
<option name="linkconfig" type="string" change-action="build">CopyToRam</option> <option name="linkconfig" type="string" change-action="build">AllRam</option>
<option name="flashinfo" type="string" change-action="build">000000-0001FF</option> <option name="flashinfo" type="string" change-action="build">000000-0000FF</option>
<option name="ram" type="string" change-action="build">040000-0FFFFF</option> <option name="ram" type="string" change-action="build">040000-0FFFFF</option>
<option name="rom" type="string" change-action="build">000000-03FFFF</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="extio" type="string" change-action="build">000000-00FFFF</option>
@ -196,7 +196,7 @@
<option name="debug" type="boolean" change-action="assemble">true</option> <option name="debug" type="boolean" change-action="assemble">true</option>
<option name="debugcache" type="boolean" change-action="none">true</option> <option name="debugcache" type="boolean" change-action="none">true</option>
<option name="igcase" type="boolean" change-action="assemble">false</option> <option name="igcase" type="boolean" change-action="assemble">false</option>
<option name="outputdir" type="string" change-action="compile">..\..\..\nuttx</option> <option name="outputdir" type="string" change-action="compile">..\..\..\nuttx\</option>
</options> </options>
</tool> </tool>
<tool name="Librarian"> <tool name="Librarian">
@ -227,8 +227,8 @@
<option name="padhex" type="boolean" change-action="build">false</option> <option name="padhex" type="boolean" change-action="build">false</option>
<option name="fplib" type="string" change-action="build">Real</option> <option name="fplib" type="string" change-action="build">Real</option>
<option name="useadddirectives" type="boolean" change-action="build">false</option> <option name="useadddirectives" type="boolean" change-action="build">false</option>
<option name="linkconfig" type="string" change-action="build">CopyToRam</option> <option name="linkconfig" type="string" change-action="build">AllRam</option>
<option name="flashinfo" type="string" change-action="build">000000-0001FF</option> <option name="flashinfo" type="string" change-action="build">000000-0000FF</option>
<option name="ram" type="string" change-action="build">040000-0BFFFF</option> <option name="ram" type="string" change-action="build">040000-0BFFFF</option>
<option name="rom" type="string" change-action="build">000000-03FFFF</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="extio" type="string" change-action="build">000000-00FFFF</option>
@ -258,4 +258,4 @@
<breakpoints> <breakpoints>
</breakpoints> </breakpoints>
</project> </project>

2
boards/z80/ez80/z20x/configs/nsh_ram/nsh_flash.ztgt
View File

@ -20,7 +20,7 @@
<device /> <device />
<externalAddress>200000</externalAddress> <externalAddress>200000</externalAddress>
<externalAutoSelect>false</externalAutoSelect> <externalAutoSelect>false</externalAutoSelect>
<externalRamLower>40000</externalRamLower> <externalRamLower>040000</externalRamLower>
<externalRamUpper>0BFFFF</externalRamUpper> <externalRamUpper>0BFFFF</externalRamUpper>
<manufacturer /> <manufacturer />
<units>1</units> <units>1</units>

12
boards/z80/ez80/z20x/configs/nsh_ram/nsh_ram.ztgt
View File

@ -37,15 +37,15 @@
</CS0> </CS0>
<CS1> <CS1>
<busMode>0</busMode> <busMode>0</busMode>
<controlRegister>8</controlRegister> <controlRegister>0</controlRegister>
<lower>8</lower> <lower>0</lower>
<upper>F</upper> <upper>0</upper>
</CS1> </CS1>
<CS2> <CS2>
<busMode>0</busMode> <busMode>0</busMode>
<controlRegister>28</controlRegister> <controlRegister>0</controlRegister>
<lower>20</lower> <lower>0</lower>
<upper>9F</upper> <upper>0</upper>
</CS2> </CS2>
<CS3> <CS3>
<busMode>0</busMode> <busMode>0</busMode>

8
boards/z80/ez80/z20x/configs/sdboot/.gitignore vendored
View File

@ -1,6 +1,6 @@
nsh.hex sdboot.hex
nsh.map sdboot.map
nsh.lod sdboot.lod
nsh.wsp sdboot.wsp
*.asm *.asm
Debug Debug

14
boards/z80/ez80/z20x/configs/sdboot/sdboot.zdsproj
View File

@ -1,4 +1,4 @@
<project type="Executable" project-type="Standard" configuration="Release" created-by="d:5.3.0:17021001" modified-by="d:5.3.0:17021001" ZDSII="ZDSII - eZ80Acclaim! 5.3.0 (Build 17041303)"> <project type="Executable" project-type="Standard" configuration="Release" created-by="d:5.3.0:17021001" modified-by="d:5.3.0:19052909" ZDSII="ZDSII - eZ80Acclaim! 5.3.3 (Build 19083001)">
<cpu>eZ80F92</cpu> <cpu>eZ80F92</cpu>
<!-- file information --> <!-- file information -->
@ -107,8 +107,8 @@
<option name="padhex" type="boolean" change-action="build">false</option> <option name="padhex" type="boolean" change-action="build">false</option>
<option name="fplib" type="string" change-action="build">Real</option> <option name="fplib" type="string" change-action="build">Real</option>
<option name="useadddirectives" type="boolean" change-action="build">false</option> <option name="useadddirectives" type="boolean" change-action="build">false</option>
<option name="linkconfig" type="string" change-action="build">CopyToRam</option> <option name="linkconfig" type="string" change-action="build">Standard</option>
<option name="flashinfo" type="string" change-action="build">000000-0001FF</option> <option name="flashinfo" type="string" change-action="build">000000-0000FF</option>
<option name="ram" type="string" change-action="build">040000-0FFFFF</option> <option name="ram" type="string" change-action="build">040000-0FFFFF</option>
<option name="rom" type="string" change-action="build">000000-03FFFF</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="extio" type="string" change-action="build">000000-00FFFF</option>
@ -196,7 +196,7 @@
<option name="debug" type="boolean" change-action="assemble">true</option> <option name="debug" type="boolean" change-action="assemble">true</option>
<option name="debugcache" type="boolean" change-action="none">true</option> <option name="debugcache" type="boolean" change-action="none">true</option>
<option name="igcase" type="boolean" change-action="assemble">false</option> <option name="igcase" type="boolean" change-action="assemble">false</option>
<option name="outputdir" type="string" change-action="compile">..\..\..\nuttx</option> <option name="outputdir" type="string" change-action="compile">..\..\..\nuttx\</option>
</options> </options>
</tool> </tool>
<tool name="Librarian"> <tool name="Librarian">
@ -227,8 +227,8 @@
<option name="padhex" type="boolean" change-action="build">false</option> <option name="padhex" type="boolean" change-action="build">false</option>
<option name="fplib" type="string" change-action="build">Real</option> <option name="fplib" type="string" change-action="build">Real</option>
<option name="useadddirectives" type="boolean" change-action="build">false</option> <option name="useadddirectives" type="boolean" change-action="build">false</option>
<option name="linkconfig" type="string" change-action="build">CopyToRam</option> <option name="linkconfig" type="string" change-action="build">Standard</option>
<option name="flashinfo" type="string" change-action="build">000000-0001FF</option> <option name="flashinfo" type="string" change-action="build">000000-0000FF</option>
<option name="ram" type="string" change-action="build">040000-0BFFFF</option> <option name="ram" type="string" change-action="build">040000-0BFFFF</option>
<option name="rom" type="string" change-action="build">000000-03FFFF</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="extio" type="string" change-action="build">000000-00FFFF</option>
@ -258,4 +258,4 @@
<breakpoints> <breakpoints>
</breakpoints> </breakpoints>
</project> </project>

2
boards/z80/ez80/z20x/configs/sdboot/sdboot_flash.ztgt
View File

@ -20,7 +20,7 @@
<device /> <device />
<externalAddress>200000</externalAddress> <externalAddress>200000</externalAddress>
<externalAutoSelect>false</externalAutoSelect> <externalAutoSelect>false</externalAutoSelect>
<externalRamLower>40000</externalRamLower> <externalRamLower>040000</externalRamLower>
<externalRamUpper>0BFFFF</externalRamUpper> <externalRamUpper>0BFFFF</externalRamUpper>
<manufacturer /> <manufacturer />
<units>1</units> <units>1</units>

12
boards/z80/ez80/z20x/configs/sdboot/sdboot_ram.ztgt
View File

@ -37,15 +37,15 @@
</CS0> </CS0>
<CS1> <CS1>
<busMode>0</busMode> <busMode>0</busMode>
<controlRegister>8</controlRegister> <controlRegister>0</controlRegister>
<lower>8</lower> <lower>0</lower>
<upper>F</upper> <upper>0</upper>
</CS1> </CS1>
<CS2> <CS2>
<busMode>0</busMode> <busMode>0</busMode>
<controlRegister>28</controlRegister> <controlRegister>0</controlRegister>
<lower>20</lower> <lower>0</lower>
<upper>9F</upper> <upper>0</upper>
</CS2> </CS2>
<CS3> <CS3>
<busMode>0</busMode> <busMode>0</busMode>

6
boards/z80/ez80/z20x/scripts/Make.defs
View File

@ -42,7 +42,7 @@ endif
ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase
ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
ARCHASMWARNINGS = -warn ARCHASMWARNINGS = -warn
ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILY)=1 -define:__ASSEMBLY__
AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
# Compiler definitions # Compiler definitions
@ -52,11 +52,11 @@ ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
ARCHPICFLAGS = ARCHPICFLAGS =
ARCHWARNINGS = -warn ARCHWARNINGS = -warn
ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILY)
ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ CPPDEFINES = -D$(ARCHFAMILY) -D$(ARCHCPUDEF) -D__ASSEMBLY__
CPPINCLUDES = -I$(TOPDIR)$(DELIM)include CPPINCLUDES = -I$(TOPDIR)$(DELIM)include
CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES)

3
boards/z80/ez80/z20x/scripts/z20x_copytoram.linkcmd
View File

@ -28,9 +28,10 @@ RANGE RAM $040000 : $0BFFFF
RANGE EXTIO $000000 : $00FFFF RANGE EXTIO $000000 : $00FFFF
RANGE INTIO $000000 : $0000FF RANGE INTIO $000000 : $0000FF
CHANGE TEXT is CODE
CHANGE CODE is RAM CHANGE CODE is RAM
CHANGE TEXT is CODE
CHANGE STRSECT is CODE CHANGE STRSECT is CODE
ORDER .RESET,.IVECTS,.STARTUP,CODE,DATA ORDER .RESET,.IVECTS,.STARTUP,CODE,DATA
COPY CODE ROM COPY CODE ROM
COPY DATA ROM COPY DATA ROM

3
boards/z80/ez80/z20x/scripts/z20x_flash.linkcmd
View File

@ -28,8 +28,7 @@ RANGE RAM $040000 : $0BFFFF
RANGE EXTIO $000000 : $00FFFF RANGE EXTIO $000000 : $00FFFF
RANGE INTIO $000000 : $0000FF RANGE INTIO $000000 : $0000FF
CHANGE TEXT is CODE CHANGE STRSECT is ROM
CHANGE STRSECT is CODE
ORDER .RESET,.IVECTS,.STARTUP,CODE,DATA ORDER .RESET,.IVECTS,.STARTUP,CODE,DATA
COPY DATA ROM COPY DATA ROM

1
boards/z80/ez80/z20x/scripts/z20x_ram.linkcmd
View File

@ -33,6 +33,7 @@ CHANGE .STARTUP is RAM
CHANGE TEXT is CODE CHANGE TEXT is CODE
CHANGE CODE is RAM CHANGE CODE is RAM
CHANGE STRSECT is CODE CHANGE STRSECT is CODE
ORDER .RESET,.IVECTS,.STARTUP,CODE,DATA ORDER .RESET,.IVECTS,.STARTUP,CODE,DATA
DEFINE __low_romdata = copy base of DATA DEFINE __low_romdata = copy base of DATA