From a93f2c9cd2181e65e7e64bc92b9309ff1698fa1d Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 16 Feb 2008 00:48:39 +0000
Subject: [PATCH] Add support for Z8F6403 (currently disabled)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@692 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/z80/include/z8/irq.h   | 24 +++++++++++++-----------
 arch/z80/src/Makefile.zdsii | 13 +++++++++++--
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/arch/z80/include/z8/irq.h b/arch/z80/include/z8/irq.h
index 049c8b84cd..fec1da0bfd 100644
--- a/arch/z80/include/z8/irq.h
+++ b/arch/z80/include/z8/irq.h
@@ -54,20 +54,22 @@
  * hence, cannot include ez8.h.  The logic is fragmentary at present.
  */
 
-#if defined(_Z8ENCORE_F642X) || defined(_Z8ENCORE_64K_SERIES)
-# define ENCORE_VECTORS 1
-#endif
+#ifndef ENCORE_VECTORS
+#  if defined(_Z8ENCORE_F642X) || defined(_Z8ENCORE_64K_SERIES)
+#    define ENCORE_VECTORS 1
+#  endif
 
-#if defined(_Z8ENCORE_F640X) || defined(_Z8ENCORE_640_FAMILY)
-# define ENCORE_VECTORS 1
-#endif
+#  if defined(_Z8ENCORE_F640X) || defined(_Z8ENCORE_640_FAMILY)
+#    define ENCORE_VECTORS 1
+#  endif
 
-#if defined(_Z8ENCORE_F08X) || defined(_Z8ENCORE_8K_SERIES)
-# define ENCORE_VECTORS 1
-#endif
+#  if defined(_Z8ENCORE_F08X) || defined(_Z8ENCORE_8K_SERIES)
+#    define ENCORE_VECTORS 1
+#  endif
 
-#if defined(_Z8ENCORE_4K_SERIES)
-# define ENCORE_VECTORS 1
+#  if defined(_Z8ENCORE_4K_SERIES)
+#    define ENCORE_VECTORS 1
+#  endif
 #endif
 
 /* ez8 Interrupt Numbers */
diff --git a/arch/z80/src/Makefile.zdsii b/arch/z80/src/Makefile.zdsii
index bc44ae78b4..df563f394e 100644
--- a/arch/z80/src/Makefile.zdsii
+++ b/arch/z80/src/Makefile.zdsii
@@ -93,11 +93,20 @@ nuttx.linkcmd: $(LINKCMDTEMPLATE)
 		echo "  \"`cygpath -w $(TOPDIR)/$${lib}`\", \\" >>nuttx.linkcmd; \
 	done ; )
 	@echo "  \"${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}\", \\"  >>nuttx.linkcmd
-\	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/fpdumyLD$(LIBEXT)}\", \\"  >>nuttx.linkcmd
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/chelprevaaD$(LIBEXT)}\", \\"  >>nuttx.linkcmd
+	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/crtrevaaLDD$(LIBEXT)}\", \\"  >>nuttx.linkcmd
+	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/fprevaaLDD$(LIBEXT)}\", \\"  >>nuttx.linkcmd
+	@echo "  \"${shell cygpath -w $(ZDSZILOGLIBDIR)/csiorevaaLDD$(LIBEXT)}\", \\"  >>nuttx.linkcmd
+	@echo "  \"${shell cygpath -w $(ZDSZILOGLIBDIR)/zsldevinitdummy$(LIBEXT)}\""  >>nuttx.linkcmd
+endif
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
+	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/fpdumyLD$(LIBEXT)}\", \\"  >>nuttx.linkcmd
 	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/chelpD$(LIBEXT)}\", \\"  >>nuttx.linkcmd
 	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/csioLDD$(LIBEXT)}\", \\"  >>nuttx.linkcmd
 	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/zsldevinitdummy.lib$(LIBEXT)}\" \\"  >>nuttx.linkcmd
- 
+endif
+
 nuttx$(EXEEXT): $(HEAD_AOBJ) board/libboard$(LIBEXT) nuttx.linkcmd
 	@echo "LD:  nuttx.hex"
 	@$(LD) $(LDFLAGS)