summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-02-16 00:48:39 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-02-16 00:48:39 +0000
commitd9938a26fd2e22d0b146c08f7a0c41b0feae0bec (patch)
tree0acc1ed09b3331961e3ab8cd47a30d30d7bec6db /nuttx/arch
parent3898fe1e91c2c6fedd0ab1a551a58b6e0f294f41 (diff)
downloadpx4-nuttx-d9938a26fd2e22d0b146c08f7a0c41b0feae0bec.tar.gz
px4-nuttx-d9938a26fd2e22d0b146c08f7a0c41b0feae0bec.tar.bz2
px4-nuttx-d9938a26fd2e22d0b146c08f7a0c41b0feae0bec.zip
Add support for Z8F6403 (currently disabled)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@692 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/z80/include/z8/irq.h30
-rw-r--r--nuttx/arch/z80/src/Makefile.zdsii13
2 files changed, 27 insertions, 16 deletions
diff --git a/nuttx/arch/z80/include/z8/irq.h b/nuttx/arch/z80/include/z8/irq.h
index 049c8b84c..fec1da0bf 100644
--- a/nuttx/arch/z80/include/z8/irq.h
+++ b/nuttx/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
-
-#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_4K_SERIES)
-# define ENCORE_VECTORS 1
+#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_F08X) || defined(_Z8ENCORE_8K_SERIES)
+# define ENCORE_VECTORS 1
+# endif
+
+# if defined(_Z8ENCORE_4K_SERIES)
+# define ENCORE_VECTORS 1
+# endif
#endif
/* ez8 Interrupt Numbers */
diff --git a/nuttx/arch/z80/src/Makefile.zdsii b/nuttx/arch/z80/src/Makefile.zdsii
index bc44ae78b..df563f394 100644
--- a/nuttx/arch/z80/src/Makefile.zdsii
+++ b/nuttx/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)