You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/02/26 20:14:49 UTC
[incubator-nuttx] 04/04: arch/z80/src/Makefile.zdsii*: Correct
libraries for eZ80F92
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 152103708334ac603195547aec75d80d9aa67e5d
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Wed Feb 26 13:48:37 2020 -0600
arch/z80/src/Makefile.zdsii*: Correct libraries for eZ80F92
These makefiles set the the ZiLOG runtime libraries for the eZ80 parts. The setup was, however, conditioned on CONFIG_ARCH_EZ80_EZ80F91 and, so, was not working for the eZ80F92 part (CONFIG_ARCH_EZ80_EZ80F92).
With this change, the z20x board FINALLY builds and links correctly with no errors.
---
arch/z80/src/Makefile.zdsiil | 5 +++--
arch/z80/src/Makefile.zdsiiw | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/z80/src/Makefile.zdsiil b/arch/z80/src/Makefile.zdsiil
index 810253e..3c4a2b5 100644
--- a/arch/z80/src/Makefile.zdsiil
+++ b/arch/z80/src/Makefile.zdsiil
@@ -1,7 +1,8 @@
############################################################################
# arch/z80/src/Makefile.zdsiil
#
-# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
+# Copyright (C) 2008, 2011-2012, 2014, 2020 Gregory Nutt. All rights
+# reserved.
# Author: Gregory Nutt <gn...@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -126,7 +127,7 @@ ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
@echo " \"${shell cygpath -w "$(ZDSZILOGLIBDIR)/csioLDD$(LIBEXT)"}\", \\" >>nuttx.linkcmd
@echo " \"${shell cygpath -w "$(ZDSZILOGLIBDIR)/zsldevinitdummy$(LIBEXT)"}\"" >>nuttx.linkcmd
endif
-ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
+ifeq ($(CONFIG_ARCH_CHIP_EZ80),y) # EZ80F91 and EZ80F92
@echo " \"${shell cygpath -w "$(ZDSSTDLIBDIR)/chelp$(LIBEXT)"}\", \\" >>nuttx.linkcmd
@echo " \"${shell cygpath -w "$(ZDSSTDLIBDIR)/crt$(LIBEXT)"}\", \\" >>nuttx.linkcmd
@echo " \"${shell cygpath -w "$(ZDSSTDLIBDIR)/fplib$(LIBEXT)"}\", \\" >>nuttx.linkcmd
diff --git a/arch/z80/src/Makefile.zdsiiw b/arch/z80/src/Makefile.zdsiiw
index b150348..f9dda14 100644
--- a/arch/z80/src/Makefile.zdsiiw
+++ b/arch/z80/src/Makefile.zdsiiw
@@ -1,7 +1,8 @@
############################################################################
# arch/z80/src/Makefile.zdsiiw
#
-# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
+# Copyright (C) 2008, 2011-2012, 2014, 2020 Gregory Nutt. All rights
+# reserved.
# Author: Gregory Nutt <gn...@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -115,7 +116,7 @@ ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
@echo "$(ZDSZILOGLIBDIR)\csioLDD$(LIBEXT)", \>>nuttx.linkcmd
@echo "$(ZDSZILOGLIBDIR)\zsldevinitdummy$(LIBEXT)">>nuttx.linkcmd
endif
-ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
+ifeq ($(CONFIG_ARCH_CHIP_EZ80),y) # EZ80F91 and EZ80F92
@echo "$(ZDSSTDLIBDIR)\chelp$(LIBEXT)", \>>nuttx.linkcmd
@echo "$(ZDSSTDLIBDIR)\crt$(LIBEXT)", \>>nuttx.linkcmd
@echo "$(ZDSSTDLIBDIR)\fplib$(LIBEXT)", \>>nuttx.linkcmd