From 07fa2b5735c6039aed14e9040c57354403ceef0c Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 9 Jan 2008 14:20:31 +0000
Subject: [PATCH] Changes for ZNeo compile

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@539 42af7a65-404d-4744-a932-0658087f49c3
---
 configs/z16f2800100zcog/Make.defs | 20 +++++++++++++-------
 configs/z16f2800100zcog/defconfig |  8 ++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/configs/z16f2800100zcog/Make.defs b/configs/z16f2800100zcog/Make.defs
index ee7a692cefd..3b11c96d008 100644
--- a/configs/z16f2800100zcog/Make.defs
+++ b/configs/z16f2800100zcog/Make.defs
@@ -37,10 +37,10 @@ include ${TOPDIR}/.config
 
 # These are the directories where the ZNeo-II toolchain is installed
 
-ZDSINSTALLDIR		= C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.10.2
-ZDSBINDIR		= $(ZDSINSTALLDIR)/bin
-ZDSSTDINCDIR		= $(ZDSINSTALLDIR)/include/std
-ZDSZILOGINCDIR		= $(ZDSINSTALLDIR)/include/zilog
+ZDSINSTALLDIR		:= C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.10.2
+ZDSBINDIR		:= $(ZDSINSTALLDIR)/bin
+ZDSSTDINCDIR		:= $(ZDSINSTALLDIR)/include/std
+ZDSZILOGINCDIR		:= $(ZDSINSTALLDIR)/include/zilog
 
 # These are the same directories but with the directory separator
 # character swapped as needed by the ZNeo-II compiler
@@ -49,6 +49,12 @@ WTOPDIR			:= ${shell cygpath -w $(TOPDIR)}
 WZDSSTDINCDIR		:= ${shell cygpath -w $(ZDSSTDINCDIR)}
 WZDSZILOGINCDIR		:= ${shell cygpath -w $(ZDSZILOGINCDIR)}
 
+# Escaped versions
+
+ETOPDIR			:= ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
+EZDSSTDINCDIR		:= ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
+EZDSZILOGINCDIR		:= ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
+
 # Assembler definitions
 
 ifeq ("${CONFIG_DEBUG}","y")
@@ -61,7 +67,7 @@ ARCHASMCPUFLAGS		= -cpu:Z16F2811AL -NOigcase
 ARCHASMLIST		= -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS		= -warn
 ARCHASMDEFINES		= -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1 \ 				  -define:__ASSEMBLY__
-ARCHASMINCLUDES		= -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+ARCHASMINCLUDES		= -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
 AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
 			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
@@ -121,8 +127,8 @@ define ASSEMBLE
 endef
 
 define ARCHIVE
-	@echo "AR: $2"; \
-	@$(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; }
+	echo "AR: $2"; \
+	$(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; }
 endef
 
 # This is the tool to use for dependencies (i.e., none)
diff --git a/configs/z16f2800100zcog/defconfig b/configs/z16f2800100zcog/defconfig
index da6ecf5039b..7b6c85b31d4 100644
--- a/configs/z16f2800100zcog/defconfig
+++ b/configs/z16f2800100zcog/defconfig
@@ -40,6 +40,10 @@
 # CONFIG_ARCH_Z16 - Set if processor is Z16
 # CONFIG_ARCH_CHIP - Identifies the specific chip
 # CONFIG_ARCH_CHIP_Z16F - Set if this the Z16F
+# CONFIG_ARCH_CHIP_Z16F2810 - Identifies chip variant
+# CONFIG_ARCH_CHIP_Z16F2811
+# CONFIG_ARCH_CHIP_Z16F3211
+# CONFIG_ARCH_CHIP_Z16F6411
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
 #   the board that supports the particular chip or SoC.
 # CONFIG_ARCH_BOARD_name - for use in C code
@@ -49,6 +53,10 @@ CONFIG_ARCH=z16
 CONFIG_ARCH_Z16=y
 CONFIG_ARCH_CHIP=z16f
 CONFIG_ARCH_CHIP_Z16F=y
+CONFIG_ARCH_CHIP_Z16F2810=n
+CONFIG_ARCH_CHIP_Z16F2811=y
+CONFIG_ARCH_CHIP_Z16F3211=n
+CONFIG_ARCH_CHIP_Z16F6411=n
 CONFIG_ARCH_BOARD=z16f2800100zcog
 CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y
 CONFIG_DRAM_SIZE=65536