Add support for Z8F6403 (currently disabled)

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

1 files changed, 34 insertions, 3 deletions

diff --git a/nuttx/configs/z8encore000zco/ostest/Make.defs b/nuttx/configs/z8encore000zco/ostest/Make.defs
index ad5d6fda8..7318e9e6d 100644
--- a/nuttx/configs/z8encore000zco/ostest/Make.defs
+++ b/nuttx/configs/z8encore000zco/ostest/Make.defs
@@ -41,7 +41,12 @@ ZDSINSTALLDIR		:= C:/Program\ Files/ZiLOG/ZDSII_Z8Encore!_4.10.1
 ZDSBINDIR		:= $(ZDSINSTALLDIR)/bin
 ZDSSTDINCDIR		:= $(ZDSINSTALLDIR)/include/std
 ZDSZILOGINCDIR		:= $(ZDSINSTALLDIR)/include/zilog
-ZDSF46XINCDIR		:= $(ZDSZILOGINCDIR)/Z8Encore_F642X
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
+ZDSDEVINCDIR		:= $(ZDSZILOGINCDIR)/Z8Encore_F642X
+endif
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+ZDSDEVINCDIR		:= $(ZDSZILOGINCDIR)/Z8Encore_F640X
+endif
 ZDSSTDLIBDIR		:= $(ZDSINSTALLDIR)/lib/std
 ZDSZILOGLIBDIR		:= $(ZDSINSTALLDIR)/lib/zilog
 
@@ -51,7 +56,7 @@ ZDSZILOGLIBDIR		:= $(ZDSINSTALLDIR)/lib/zilog
 WTOPDIR 		:= ${shell cygpath -w $(TOPDIR)}
 WZDSSTDINCDIR		:= ${shell cygpath -w $(ZDSSTDINCDIR)}
 WZDSZILOGINCDIR 	:= ${shell cygpath -w $(ZDSZILOGINCDIR)}
-WZDSF46XINCDIR		:= ${shell cygpath -w $(ZDSF46XINCDIR)}
+WZDSDEVINCDIR		:= ${shell cygpath -w $(ZDSDEVINCDIR)}
 WZDSSTDLIBDIR		:= ${shell cygpath -w $(ZDSSTDLIBDIR)}
 WZDSZILOGLIBDIR 	:= ${shell cygpath -w $(ZDSZILOGLIBDIR)}
 
@@ -69,10 +74,20 @@ else
   ARCHASMOPTIMIZATION	= -nodebug -sdiopt
 endif
 
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
 ARCHASMCPUFLAGS 	= -cpu:Z8F6423 -NOigcase -NOrevaa
+endif
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+ARCHASMCPUFLAGS 	= -cpu:Z8F6403 -NOigcase -revaa
+endif
 ARCHASMLIST		= -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS 	= -warn
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
 ARCHASMDEFINES		= -define:_Z8F6423=1 -define:_Z8ENCORE_64K_SERIES=1 -define:_Z8ENCORE_F642X=1 \ 				  -define:__ASSEMBLY__
+endif
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+ARCHASMDEFINES		= -define:_Z8F6403=1 -define:_Z8ENCORE_640_FAMILY=1 -define:_Z8ENCORE_F640X=1 \ 				  -define:__ASSEMBLY__
+endif
 ARCHASMINCLUDES 	= -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES 	= -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
 AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
@@ -86,19 +101,35 @@ else
   ARCHOPTIMIZATION	= -nodebug -regvar
 endif
 
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
 ARCHCPUFLAGS		= -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:Z8F6423 -NOgenprintf \
 			  -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
+endif
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+ARCHCPUFLAGS		= -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:Z8F6403 -NOgenprintf \
+			  -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
+endif
 ARCHLIST		= -keeplst -NOlist -NOlistinc -keepasm
 ARCHPICFLAGS		=
 ARCHWARNINGS		= -warn
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
 ARCHDEFINES		= -define:_Z8ENCORE_F642X -define:_Z8F6423 -define:_Z8ENCORE_64K_SERIES
-ARCHSTDINCLUDES 	= -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSF46XINCDIR)'
+endif
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+ARCHDEFINES		= -define:_Z8ENCORE_F640X -define:_Z8F6403 -define:_Z8ENCORE_640_FAMILY
+endif
+ARCHSTDINCLUDES 	= -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSDEVINCDIR)'
 ARCHUSRINCLUDES 	= -usrinc:'.'
 ARCHINCLUDES		= $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
 CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
 			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES)
 
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
 CPPDEFINES              = -D_Z8ENCORE_F642X -D_Z8F6423 -D_Z8ENCORE_64K_SERIES -D__ASSEMBLY__
+endif
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+CPPDEFINES              = -D_Z8ENCORE_F640X -D_Z8F6403 -D_Z8ENCORE_640_FAMILY -D__ASSEMBLY__
+endif
 CPPINCLUDES             = -I$(TOPDIR)/include
 CPPFLAGS                = $(CPPDEFINES) $(CPPINCLUDES)