From 152103708334ac603195547aec75d80d9aa67e5d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 26 Feb 2020 13:48:37 -0600 Subject: [PATCH] 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 810253ec03..3c4a2b5d7d 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 # # 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 b1503485a8..f9dda14409 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 # # 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