summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/ChangeLog.txt2
-rw-r--r--nuttx/ChangeLog4
-rw-r--r--nuttx/configs/z16f2800100zcog/scripts/setenv.bat50
-rw-r--r--nuttx/configs/z8encore000zco/ostest/Make.defs59
-rw-r--r--nuttx/configs/z8encore000zco/src/Makefile2
-rw-r--r--nuttx/configs/z8f64200100kit/ostest/Make.defs59
-rw-r--r--nuttx/configs/z8f64200100kit/src/Makefile2
7 files changed, 116 insertions, 62 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 0b4f58e77..29a54461a 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -424,3 +424,5 @@
* apps/examples/relays/Makefile: Reduced stack requirement (Darcy Gong).
* apps/nshlib and apps/netutils/dhcpc: Extend the NSH ifconfig command plus
various DHCPC improvements(Darcy Gong).
+ * apps/nshlib/nsh_apps.c: Fix compilation errors whenCONFIG_NSH_DISABLEBG=y.
+ From Freddie Chopin.
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 97b5b74a0..e0ca6c8dc 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3708,3 +3708,7 @@
Denis Cariki.
* z8encore000zco/ostest and z8f64200100kit/ostest: Converted to use Kconfig/
mconf configuration tool.
+ * arch/arm/src/armv7-m/up_exception.S: missing curly braces for push/pop
+ From Freddie Chopin.
+ * z8encore000zco/ostest and z8f64200100kit/ostest: Can now be modified to
+ support the Windows native builds (see corresponding README.txt files).
diff --git a/nuttx/configs/z16f2800100zcog/scripts/setenv.bat b/nuttx/configs/z16f2800100zcog/scripts/setenv.bat
new file mode 100644
index 000000000..4ee67c97e
--- /dev/null
+++ b/nuttx/configs/z16f2800100zcog/scripts/setenv.bat
@@ -0,0 +1,50 @@
+@echo off
+
+rem configs/z16f2800100zcog/scripts/setenv.bat
+rem
+rem Copyright (C) 2012 Gregory Nutt. All rights reserved.
+rem Author: Gregory Nutt <gnutt@nuttx.org>
+rem
+rem Redistribution and use in source and binary forms, with or without
+rem modification, are permitted provided that the following conditions
+rem are met:
+rem
+rem 1. Redistributions of source code must retain the above copyright
+rem notice, this list of conditions and the following disclaimer.
+rem 2. Redistributions in binary form must reproduce the above copyright
+rem notice, this list of conditions and the following disclaimer in
+rem the documentation and/or other materials provided with the
+rem distribution.
+rem 3. Neither the name NuttX nor the names of its contributors may be
+rem used to endorse or promote products derived from this software
+rem without specific prior written permission.
+rem
+rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+rem "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+rem LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+rem FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+rem COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+rem INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+rem BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+rem OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+rem AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+rem LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+rem ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+rem POSSIBILITY OF SUCH DAMAGE.
+
+rem This is the location where I installed in the MinGW compiler. With
+rem this configuration, it is recommended that you do NOT install the
+rem MSYS tools; they conflict with the GNUWin32 tools. See
+rem http://www.mingw.org/ for further info.
+
+set PATH=C:\MinGW\bin;%PATH%
+
+rem This is the location where I installed the ZDS-II toolchain.
+
+set PATH=C:\Program Files (x86)\ZiLOG\ZDSII_ZNEO_5.0.1\bin;%PATH%
+
+rem This is the location where I installed the GNUWin32 tools. See
+rem http://gnuwin32.sourceforge.net/.
+
+set PATH=C:\gnuwin32\bin;%PATH%
+echo %PATH%
diff --git a/nuttx/configs/z8encore000zco/ostest/Make.defs b/nuttx/configs/z8encore000zco/ostest/Make.defs
index bbb9a9ddc..9ce005260 100644
--- a/nuttx/configs/z8encore000zco/ostest/Make.defs
+++ b/nuttx/configs/z8encore000zco/ostest/Make.defs
@@ -45,66 +45,66 @@ include $(TOPDIR)/tools/Config.mk
#
# Your PC may be configured differently.
-ZDSVERSION := 5.0.0
+ZDSVERSION = 5.0.0
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
+ ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
- ZDSBINDIR := $(INSTALLDIR)\bin
- ZDSSTDINCDIR := $(INSTALLDIR)\include\std
- ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
+ ZDSBINDIR = $(INSTALLDIR)\bin
+ ZDSSTDINCDIR = $(INSTALLDIR)\include\std
+ ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog
ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
- ZDSDEVINCDIR := $(INSTALLDIR)\Z8Encore_F642X
+ ZDSDEVINCDIR = $(INSTALLDIR)\Z8Encore_F642X
endif
ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
- ZDSDEVINCDIR := $(INSTALLDIR)\Z8Encore_F640X
+ ZDSDEVINCDIR = $(INSTALLDIR)\Z8Encore_F640X
endif
- ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
- ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
+ ZDSSTDLIBDIR = $(INSTALLDIR)\lib\std
+ ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
# CFLAGs
ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
- ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
+ ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR);$(ZDSDEVINCDIR)
ARCHUSRINCLUDES = -usrinc:.
else
- WINTOOL := y
- ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
+ WINTOOL = y
+ ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
- ZDSBINDIR := $(INSTALLDIR)/bin
- ZDSSTDINCDIR := $(INSTALLDIR)/include/std
- ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
+ 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
+ ZDSSTDLIBDIR = $(INSTALLDIR)/lib/std
+ ZDSZILOGLIBDIR = $(INSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
- 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
- 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"}
# CFLAGs
ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
- ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+ ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSDEVINCDIR)'
ARCHUSRINCLUDES = -usrinc:'.'
endif
@@ -156,7 +156,6 @@ ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
ARCHPICFLAGS =
ARCHWARNINGS = -warn
ARCHDEFINES = -define:$(ARCHFAMILYDEF) -define:$(ARCHCPUDEF) -define:$(ARCHSERIESDEF)
-ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSDEVINCDIR)'
ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
diff --git a/nuttx/configs/z8encore000zco/src/Makefile b/nuttx/configs/z8encore000zco/src/Makefile
index 21117dd53..30a4a6285 100644
--- a/nuttx/configs/z8encore000zco/src/Makefile
+++ b/nuttx/configs/z8encore000zco/src/Makefile
@@ -39,7 +39,7 @@ SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- USRINCLUDES = -usrinc:'.;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common'
+ USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common"
else
WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
diff --git a/nuttx/configs/z8f64200100kit/ostest/Make.defs b/nuttx/configs/z8f64200100kit/ostest/Make.defs
index 8b58a7346..85cb5c401 100644
--- a/nuttx/configs/z8f64200100kit/ostest/Make.defs
+++ b/nuttx/configs/z8f64200100kit/ostest/Make.defs
@@ -45,66 +45,66 @@ include $(TOPDIR)/tools/Config.mk
#
# Your PC may be configured differently.
-ZDSVERSION := 5.0.0
+ZDSVERSION = 5.0.0
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
+ ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
- ZDSBINDIR := $(INSTALLDIR)\bin
- ZDSSTDINCDIR := $(INSTALLDIR)\include\std
- ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
+ ZDSBINDIR = $(INSTALLDIR)\bin
+ ZDSSTDINCDIR = $(INSTALLDIR)\include\std
+ ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog
ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
- ZDSDEVINCDIR := $(INSTALLDIR)\Z8Encore_F642X
+ ZDSDEVINCDIR = $(INSTALLDIR)\Z8Encore_F642X
endif
ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
- ZDSDEVINCDIR := $(INSTALLDIR)\Z8Encore_F640X
+ ZDSDEVINCDIR = $(INSTALLDIR)\Z8Encore_F640X
endif
- ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
- ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
+ ZDSSTDLIBDIR = $(INSTALLDIR)\lib\std
+ ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
# CFLAGs
ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
- ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
+ ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR);$(ZDSDEVINCDIR)
ARCHUSRINCLUDES = -usrinc:.
else
- WINTOOL := y
- ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
+ WINTOOL = y
+ ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
- ZDSBINDIR := $(INSTALLDIR)/bin
- ZDSSTDINCDIR := $(INSTALLDIR)/include/std
- ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
+ 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
+ ZDSSTDLIBDIR = $(INSTALLDIR)/lib/std
+ ZDSZILOGLIBDIR = $(INSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
- 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
- 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"}
# CFLAGs
ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
- ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+ ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSDEVINCDIR)'
ARCHUSRINCLUDES = -usrinc:'.'
endif
@@ -156,7 +156,6 @@ ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
ARCHPICFLAGS =
ARCHWARNINGS = -warn
ARCHDEFINES = -define:$(ARCHFAMILYDEF) -define:$(ARCHCPUDEF) -define:$(ARCHSERIESDEF)
-ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSDEVINCDIR)'
ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
diff --git a/nuttx/configs/z8f64200100kit/src/Makefile b/nuttx/configs/z8f64200100kit/src/Makefile
index c9b7a6dc2..21087e6b8 100644
--- a/nuttx/configs/z8f64200100kit/src/Makefile
+++ b/nuttx/configs/z8f64200100kit/src/Makefile
@@ -39,7 +39,7 @@ SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- USRINCLUDES = -usrinc:'.;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common'
+ USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common"
else
WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 23:48:28 +0000