diff options
Diffstat (limited to 'nuttx/configs')
22 files changed, 450 insertions, 330 deletions
diff --git a/nuttx/configs/ez80f910200kitg/ostest/Make.defs b/nuttx/configs/ez80f910200kitg/ostest/Make.defs index b7b4e23785..0914bc17aa 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/Make.defs +++ b/nuttx/configs/ez80f910200kitg/ostest/Make.defs @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200kitg/src/Makefile b/nuttx/configs/ez80f910200kitg/src/Makefile index 34ac4ba9cc..8a9d94e47a 100644 --- a/nuttx/configs/ez80f910200kitg/src/Makefile +++ b/nuttx/configs/ez80f910200kitg/src/Makefile @@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/configs/ez80f910200zco/dhcpd/Make.defs b/nuttx/configs/ez80f910200zco/dhcpd/Make.defs index 17ac71f07b..59f32fb457 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/Make.defs +++ b/nuttx/configs/ez80f910200zco/dhcpd/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/dhcpd/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/dhcpd/setenv.sh b/nuttx/configs/ez80f910200zco/dhcpd/setenv.sh index 3d1c4aecbc..75e873a7fc 100755 --- a/nuttx/configs/ez80f910200zco/dhcpd/setenv.sh +++ b/nuttx/configs/ez80f910200zco/dhcpd/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/dhcpd/setenv.sh # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/httpd/Make.defs b/nuttx/configs/ez80f910200zco/httpd/Make.defs index 399d3a4c25..615939026c 100644 --- a/nuttx/configs/ez80f910200zco/httpd/Make.defs +++ b/nuttx/configs/ez80f910200zco/httpd/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/httpd/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/httpd/setenv.sh b/nuttx/configs/ez80f910200zco/httpd/setenv.sh index 3d1c4aecbc..75e873a7fc 100755 --- a/nuttx/configs/ez80f910200zco/httpd/setenv.sh +++ b/nuttx/configs/ez80f910200zco/httpd/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/dhcpd/setenv.sh # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/nettest/Make.defs b/nuttx/configs/ez80f910200zco/nettest/Make.defs index 3044e8ffdb..ea309af75a 100644 --- a/nuttx/configs/ez80f910200zco/nettest/Make.defs +++ b/nuttx/configs/ez80f910200zco/nettest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/nettest/Make.defs # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/nettest/setenv.sh b/nuttx/configs/ez80f910200zco/nettest/setenv.sh index 86823697cb..8a03824086 100755 --- a/nuttx/configs/ez80f910200zco/nettest/setenv.sh +++ b/nuttx/configs/ez80f910200zco/nettest/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/nettest/setenv.sh # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/nsh/Make.defs b/nuttx/configs/ez80f910200zco/nsh/Make.defs index 469baeb1aa..91c900b33f 100644 --- a/nuttx/configs/ez80f910200zco/nsh/Make.defs +++ b/nuttx/configs/ez80f910200zco/nsh/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/nst/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/nsh/setenv.sh b/nuttx/configs/ez80f910200zco/nsh/setenv.sh index 37bc6e3aa7..8bfe02b2f4 100755 --- a/nuttx/configs/ez80f910200zco/nsh/setenv.sh +++ b/nuttx/configs/ez80f910200zco/nsh/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/nst/setenv.sh # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/ostest/Make.defs b/nuttx/configs/ez80f910200zco/ostest/Make.defs index c06dfdebe4..5cc8356129 100644 --- a/nuttx/configs/ez80f910200zco/ostest/Make.defs +++ b/nuttx/configs/ez80f910200zco/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/ostest/Make.defs # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,101 +38,111 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # 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"} +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_ARCH_CHIP_EZ80F91),y) -ARCHCPU = eZ80F91 -ARCHCPUDEF = _EZ80F91 -ARCHFAMILY = _EZ80ACCLAIM! +ARCHCPU = eZ80F91 +ARCHCPUDEF = _EZ80F91 +ARCHFAMILY = _EZ80ACCLAIM! endif ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") - ARCHASMOPTIMIZATION = -debug -NOsdiopt + ARCHASMOPTIMIZATION = -debug -NOsdiopt else - ARCHASMOPTIMIZATION = -nodebug -NOsdiopt + ARCHASMOPTIMIZATION = -nodebug -NOsdiopt endif -ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase -ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet -ARCHASMWARNINGS = -warn -ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ -ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' -EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)' -AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \ - $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) +ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase +ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet +ARCHASMWARNINGS = -warn +ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ +ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' +EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)' +AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \ + $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) # Compiler definitions ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") - ARCHOPTIMIZATION = -debug -reduceopt + ARCHOPTIMIZATION = -debug -reduceopt else - ARCHOPTIMIZATION = -nodebug -optsize + ARCHOPTIMIZATION = -nodebug -optsize endif -ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \ - -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)" -ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm -ARCHPICFLAGS = -ARCHWARNINGS = -warn -ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) -ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' -ARCHUSRINCLUDES = -usrinc:'.' -ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) -CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \ - $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) - -CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ -CPPINCLUDES = -I$(TOPDIR)/include -CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) +ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \ + -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)" +ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm +ARCHPICFLAGS = +ARCHWARNINGS = -warn +ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) +ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' +ARCHUSRINCLUDES = -usrinc:'.' +ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) +CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \ + $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) + +CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ +CPPINCLUDES = -I$(TOPDIR)/include +CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) # Librarian definitions -ARFLAGS = -quiet -warn +ARFLAGS = -quiet -warn # Linker definitions -LINKCMDTEMPLATE = $(TOPDIR)/configs/ez80f910200zco/ostest/ostest.linkcmd +LINKCMDTEMPLATE = $(TOPDIR)/configs/ez80f910200zco/ostest/ostest.linkcmd # Tool names/pathes -CROSSDEV = -CC = $(ZDSBINDIR)/ez80cc.exe -CPP = gcc -E -LD = $(ZDSBINDIR)/ez80link.exe -AS = $(ZDSBINDIR)/ez80asm.exe -AR = $(ZDSBINDIR)/ez80lib.exe +CROSSDEV = +CC = $(ZDSBINDIR)/ez80cc.exe +CPP = gcc -E +LD = $(ZDSBINDIR)/ez80link.exe +AS = $(ZDSBINDIR)/ez80asm.exe +AR = $(ZDSBINDIR)/ez80lib.exe # File extensions -ASMEXT = .asm -OBJEXT = .obj -LIBEXT = .lib -EXEEXT = .lod -HEXEXT = .hex +ASMEXT = .asm +OBJEXT = .obj +LIBEXT = .lib +EXEEXT = .lod +HEXEXT = .hex # These are the macros that will be used in the NuttX make system # to compile and assembly source files and to insert the resulting @@ -140,49 +150,49 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) -MKDEP = $(TOPDIR)/tools/mknulldeps.sh +MKDEP = $(TOPDIR)/tools/mknulldeps.sh # ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies -DIRLINK = $(TOPDIR)/tools/winlink.sh -DIRUNLINK = $(TOPDIR)/tools/unlink.sh +DIRLINK = $(TOPDIR)/tools/winlink.sh +DIRUNLINK = $(TOPDIR)/tools/unlink.sh # Linux/Cygwin host tool definitions -HOSTCC = gcc -HOSTINCLUDES = -I. -HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe -HOSTLDFLAGS = +HOSTCC = gcc +HOSTINCLUDES = -I. +HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe +HOSTLDFLAGS = diff --git a/nuttx/configs/ez80f910200zco/ostest/setenv.sh b/nuttx/configs/ez80f910200zco/ostest/setenv.sh index 028eb6ad47..6150434efc 100755 --- a/nuttx/configs/ez80f910200zco/ostest/setenv.sh +++ b/nuttx/configs/ez80f910200zco/ostest/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/ostest/setenv.sh # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/poll/Make.defs b/nuttx/configs/ez80f910200zco/poll/Make.defs index fa21c72065..2cd6fa5d38 100644 --- a/nuttx/configs/ez80f910200zco/poll/Make.defs +++ b/nuttx/configs/ez80f910200zco/poll/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/poll/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/poll/setenv.sh b/nuttx/configs/ez80f910200zco/poll/setenv.sh index 38252f8f65..1628f105b3 100755 --- a/nuttx/configs/ez80f910200zco/poll/setenv.sh +++ b/nuttx/configs/ez80f910200zco/poll/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/poll/setenv.sh # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/src/Makefile b/nuttx/configs/ez80f910200zco/src/Makefile index fcafd6177c..85489fe91a 100644 --- a/nuttx/configs/ez80f910200zco/src/Makefile +++ b/nuttx/configs/ez80f910200zco/src/Makefile @@ -74,7 +74,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/configs/z16f2800100zcog/ostest/Make.defs b/nuttx/configs/z16f2800100zcog/ostest/Make.defs index 7f86dd29fa..79fa655bb5 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/Make.defs +++ b/nuttx/configs/z16f2800100zcog/ostest/Make.defs @@ -38,23 +38,32 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZNeo-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_ZNEO_4.11.1 +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZNeo-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -133,35 +142,35 @@ EXEEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/z16f2800100zcog/pashello/Make.defs b/nuttx/configs/z16f2800100zcog/pashello/Make.defs index 92a67fa652..d7b93d659d 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/Make.defs +++ b/nuttx/configs/z16f2800100zcog/pashello/Make.defs @@ -38,18 +38,27 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZNeo-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_ZNEO_4.11.1 +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZNeo-II compiler -WINTOOL := y WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} @@ -149,13 +158,13 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif diff --git a/nuttx/configs/z16f2800100zcog/src/Makefile b/nuttx/configs/z16f2800100zcog/src/Makefile index 2de29d8ce4..43695f7482 100644 --- a/nuttx/configs/z16f2800100zcog/src/Makefile +++ b/nuttx/configs/z16f2800100zcog/src/Makefile @@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/configs/z8encore000zco/ostest/Make.defs b/nuttx/configs/z8encore000zco/ostest/Make.defs index 23185e2dd0..fba1018645 100644 --- a/nuttx/configs/z8encore000zco/ostest/Make.defs +++ b/nuttx/configs/z8encore000zco/ostest/Make.defs @@ -38,29 +38,45 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_Z8Encore!_4.10.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_Z8Encore!_4.10.1 + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog +ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F642X +endif +ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F640X +endif + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) -ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X endif ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) -ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X +endif + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog endif -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSDEVINCDIR := ${shell cygpath -w $(ZDSDEVINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSDEVINCDIR := ${shell cygpath -w "$(ZDSDEVINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -159,35 +175,35 @@ EXEEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/z8encore000zco/src/Makefile b/nuttx/configs/z8encore000zco/src/Makefile index eee0728502..a40b6f42c1 100644 --- a/nuttx/configs/z8encore000zco/src/Makefile +++ b/nuttx/configs/z8encore000zco/src/Makefile @@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/configs/z8f64200100kit/ostest/Make.defs b/nuttx/configs/z8f64200100kit/ostest/Make.defs index 1ee00c72c0..4fa6af2ec2 100644 --- a/nuttx/configs/z8f64200100kit/ostest/Make.defs +++ b/nuttx/configs/z8f64200100kit/ostest/Make.defs @@ -38,29 +38,45 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_Z8Encore!_4.10.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_Z8Encore!_4.10.1 + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog +ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F642X +endif +ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F640X +endif + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) -ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X endif ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) -ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X +endif + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog endif -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSDEVINCDIR := ${shell cygpath -w $(ZDSDEVINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSDEVINCDIR := ${shell cygpath -w "$(ZDSDEVINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -159,35 +175,35 @@ EXEEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/z8f64200100kit/src/Makefile b/nuttx/configs/z8f64200100kit/src/Makefile index 2cd0ed45f3..a8b618b6f5 100644 --- a/nuttx/configs/z8f64200100kit/src/Makefile +++ b/nuttx/configs/z8f64200100kit/src/Makefile @@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend |