Fix Z8F6403 compile issues

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

1 files changed, 25 insertions, 31 deletions

diff --git a/nuttx/configs/z8encore000zco/ostest/Make.defs b/nuttx/configs/z8encore000zco/ostest/Make.defs
index 7318e9e6d..1efab1b0f 100644
--- a/nuttx/configs/z8encore000zco/ostest/Make.defs
+++ b/nuttx/configs/z8encore000zco/ostest/Make.defs
@@ -68,26 +68,36 @@ EZDSZILOGINCDIR 	:= ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
 
 # Assembler definitions
 
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
+ARCHFAMILYDEF		= _Z8ENCORE_F642X
+ARCHSERIESDEF		= _Z8ENCORE_64K_SERIES
+ARCHREVAA		= -NOrevaa
+ifeq ($(CONFIG_ARCH_CHIP_Z8F6423),y)
+ARCHCPU			= Z8F6423
+ARCHCPUDEF		= _Z8F6423
+endif
+endif
+
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+ARCHFAMILYDEF		= _Z8ENCORE_F640X
+ARCHSERIESDEF		= _Z8ENCORE_640_FAMILY
+ARCHREVAA		= -revaa
+ifeq ($(CONFIG_ARCH_CHIP_Z8F6403),y)
+ARCHCPU			= Z8F6403
+ARCHCPUDEF		= _Z8F6403
+endif
+endif
+
 ifeq ("${CONFIG_DEBUG}","y")
   ARCHASMOPTIMIZATION	= -debug -sdiopt
 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
+ARCHASMCPUFLAGS 	= -cpu:$(ARCHCPU) -NOigcase $(ARCHREVAA)
 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
+ARCHASMDEFINES		= -define:$(ARCHCPUDEF)=1 -define:$(ARCHSERIESDEF)=1 -define:$(ARCHFAMILYDEF)=1 \ 				  -define:__ASSEMBLY__
 ARCHASMINCLUDES 	= -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES 	= -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
 AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
@@ -101,35 +111,19 @@ else
   ARCHOPTIMIZATION	= -nodebug -regvar
 endif
 
-ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
-ARCHCPUFLAGS		= -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:Z8F6423 -NOgenprintf \
+ARCHCPUFLAGS		= -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:$(ARCHCPU) $(ARCHREVAA) -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
-endif
-ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
-ARCHDEFINES		= -define:_Z8ENCORE_F640X -define:_Z8F6403 -define:_Z8ENCORE_640_FAMILY
-endif
+ARCHDEFINES		= -define:$(ARCHFAMILYDEF) -define:$(ARCHCPUDEF) -define:$(ARCHSERIESDEF)
 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
+CPPDEFINES              = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D$(ARCHSERIESDEF) -D__ASSEMBLY__
 CPPINCLUDES             = -I$(TOPDIR)/include
 CPPFLAGS                = $(CPPDEFINES) $(CPPINCLUDES)