diff options
Diffstat (limited to 'nuttx')
34 files changed, 1816 insertions, 189 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index b48fbfd962..eb4f4b4ed8 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3603,4 +3603,8 @@ directory. * arch/*/src/Makefile: Now uses only the libraries in lib/ Replace bash fragments that test for board/Makefile. - + * Makefile.win: The beginnings of a Windows-native build. This is just + the begining and not yet ready for prime time use. + * configs/stm32f4discovery/winbuild: This is a version of the standard + NuttX OS test, but configured to build natively on Windows. Its only + real purpose is to very the native Windows build logic. diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win new file mode 100644 index 0000000000..d4157a3c49 --- /dev/null +++ b/nuttx/Makefile.win @@ -0,0 +1,739 @@ +############################################################################ +# Makefile.win +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +TOPDIR := ${shell echo %CD%} +-include $(TOPDIR)\.config +-include $(TOPDIR)\tools\Config.mk +-include $(TOPDIR)\Make.defs + +# Control build verbosity + +ifeq ($(V),1) +export Q := +else +export Q := @ +endif + +# This define is passed as EXTRADEFINES for kernel-mode builds. It is also passed +# during PASS1 (but not PASS2) context and depend targets. + +KDEFINE = -D__KERNEL__ + +# Process architecture and board-specific directories + +ARCH_DIR = arch\$(CONFIG_ARCH) +ARCH_SRC = $(ARCH_DIR)\src +ARCH_INC = $(ARCH_DIR)\include +BOARD_DIR = configs\$(CONFIG_ARCH_BOARD) + +# Add-on directories. These may or may not be in place in the +# NuttX source tree (they must be specifically installed) +# +# CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file. +# The default value of CONFIG_APPS_DIR is ..\apps. Ultimately, the application +# will be built if APPDIR is defined. APPDIR will be defined if a directory containing +# a Makefile is found at the path provided by CONFIG_APPS_DIR + +ifeq ($(CONFIG_APPS_DIR),) +CONFIG_APPS_DIR = ..\apps +endif +APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)\Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi} + +# All add-on directories. +# +# NUTTX_ADDONS is the list of directories built into the NuttX kernel. +# USER_ADDONS is the list of directories that will be built into the user application + +NUTTX_ADDONS := +USER_ADDONS := + +ifeq ($(CONFIG_NUTTX_KERNEL),y) +USER_ADDONS += $(APPDIR) +else +NUTTX_ADDONS += $(APPDIR) +endif + +# Lists of build directories. +# +# FSDIRS depend on file descriptor support; NONFSDIRS do not (except for parts +# of FSDIRS). We will exclude FSDIRS from the build if file descriptor +# support is disabled +# CONTEXTDIRS include directories that have special, one-time pre-build +# requirements. Normally this includes things like auto-generation of +# configuration specific files or creation of configurable symbolic links +# USERDIRS - When NuttX is build is a monolithic kernel, this provides the +# list of directories that must be built +# OTHERDIRS - These are directories that are not built but probably should +# be cleaned to prevent garbarge from collecting in them when changing +# configurations. + +NONFSDIRS = sched $(ARCH_SRC) $(NUTTX_ADDONS) +FSDIRS = fs drivers binfmt +CONTEXTDIRS = $(APPDIR) +USERDIRS = +OTHERDIRS = lib + +ifeq ($(CONFIG_NUTTX_KERNEL),y) + +NONFSDIRS += syscall +CONTEXTDIRS += syscall +USERDIRS += syscall libc mm $(USER_ADDONS) +ifeq ($(CONFIG_HAVE_CXX),y) +USERDIRS += libxx +endif + +else + +NONFSDIRS += libc mm +OTHERDIRS += syscall $(USER_ADDONS) +ifeq ($(CONFIG_HAVE_CXX),y) +NONFSDIRS += libxx +else +OTHERDIRS += libxx +endif + +endif + +ifeq ($(CONFIG_NX),y) +NONFSDIRS += graphics +CONTEXTDIRS += graphics +else +OTHERDIRS += graphics +endif + +# CLEANDIRS are the directories that will clean in. These are +# all directories that we know about. +# KERNDEPDIRS are the directories in which we will build target dependencies. +# If NuttX and applications are built separately (CONFIG_NUTTX_KERNEL), +# then this holds only the directories containing kernel files. +# USERDEPDIRS. If NuttX and applications are built separately (CONFIG_NUTTX_KERNEL), +# then this holds only the directories containing user files. + +CLEANDIRS = $(NONFSDIRS) $(FSDIRS) $(USERDIRS) $(OTHERDIRS) +KERNDEPDIRS = $(NONFSDIRS) +USERDEPDIRS = $(USERDIRS) + +# Add file system directories to KERNDEPDIRS (they are already in CLEANDIRS) + +ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) +ifeq ($(CONFIG_NET),y) +ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) +KERNDEPDIRS += fs +endif +KERNDEPDIRS += drivers +endif +else +KERNDEPDIRS += $(FSDIRS) +endif + +# Add networking directories to KERNDEPDIRS and CLEANDIRS + +ifeq ($(CONFIG_NET),y) +KERNDEPDIRS += net +endif +CLEANDIRS += net + +# +# Extra objects used in the final link. +# +# Pass 1 1ncremental (relative) link objects should be put into the +# processor-specific source directory (where other link objects will +# be created). If the pass1 obect is an archive, it could go anywhere. + +ifeq ($(CONFIG_BUILD_2PASS),y) +EXTRA_OBJS += $(CONFIG_PASS1_OBJECT) +endif + +# NUTTXLIBS is the list of NuttX libraries that is passed to the +# processor-specific Makefile to build the final NuttX target. +# Libraries in FSDIRS are excluded if file descriptor support +# is disabled. +# USERLIBS is the list of libraries used to build the final user-space +# application + +NUTTXLIBS = lib\libsched$(LIBEXT) lib\libarch$(LIBEXT) +USERLIBS = + +# Add libraries for syscall support. The C library will be needed by +# both the kernel- and user-space builds. For now, the memory manager (mm) +# is placed in user space (only). + +ifeq ($(CONFIG_NUTTX_KERNEL),y) +NUTTXLIBS += lib\libstubs$(LIBEXT) lib\libkc$(LIBEXT) +USERLIBS += lib\libproxies$(LIBEXT) lib\libuc$(LIBEXT) lib\libmm$(LIBEXT) +else +NUTTXLIBS += lib\libmm$(LIBEXT) lib\libc$(LIBEXT) +endif + +# Add libraries for C++ support. CXX, CXXFLAGS, and COMPILEXX must +# be defined in Make.defs for this to work! + +ifeq ($(CONFIG_HAVE_CXX),y) +ifeq ($(CONFIG_NUTTX_KERNEL),y) +USERLIBS += lib\libcxx$(LIBEXT) +else +NUTTXLIBS += lib\libcxx$(LIBEXT) +endif +endif + +# Add library for application support. + +ifneq ($(APPDIR),) +ifeq ($(CONFIG_NUTTX_KERNEL),y) +USERLIBS += lib\libapps$(LIBEXT) +else +NUTTXLIBS += lib\libapps$(LIBEXT) +endif +endif + +# Add libraries for network support + +ifeq ($(CONFIG_NET),y) +NUTTXLIBS += lib\libnet$(LIBEXT) +endif + +# Add libraries for file system support + +ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) +ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) +NUTTXLIBS += lib\libfs$(LIBEXT) +endif +ifeq ($(CONFIG_NET),y) +NUTTXLIBS += lib\libdrivers$(LIBEXT) +endif +else +NUTTXLIBS += lib\libfs$(LIBEXT) lib\libdrivers$(LIBEXT) lib\libbinfmt$(LIBEXT) +endif + +# Add libraries for the NX graphics sub-system + +ifeq ($(CONFIG_NX),y) +NUTTXLIBS += lib\libgraphics$(LIBEXT) +endif + +# LINKLIBS derives from NUTTXLIBS and is simply the same list with the subdirectory removed + +LINKLIBS = $(patsubst lib\%,%,$(NUTTXLIBS)) + +# This is the name of the final target (relative to the top level directorty) + +BIN = nuttx$(EXEEXT) + +all: $(BIN) +.PHONY: context clean_context check_context export subdir_clean clean subdir_distclean distclean apps_clean apps_distclean + +# Target used to copy include\nuttx\math.h. If CONFIG_ARCH_MATH_H is +# defined, then there is an architecture specific math.h header file +# that will be included indirectly from include\math.h. But first, we +# have to copy math.h from include\nuttx\. to include\. Logic within +# include\nuttx\math.h will hand the redirection to the architecture- +# specific math.h header file. +# +# If the CONFIG_LIBM is defined, the Rhombus libm will be built at libc\math. +# Definitions and prototypes for the Rhombus libm are also contained in +# include\nuttx\math.h and so the file must also be copied in that case. +# +# If neither CONFIG_ARCH_MATH_H nor CONFIG_LIBM is defined, then no math.h +# header file will be provided. You would want that behavior if (1) you +# don't use libm, or (2) you want to use the math.h and libm provided +# within your toolchain. + +ifeq ($(CONFIG_ARCH_MATH_H),y) +NEED_MATH_H = y +else +ifeq ($(CONFIG_LIBM),y) +NEED_MATH_H = y +endif +endif + +ifeq ($(NEED_MATH_H),y) +include\math.h: include\nuttx\math.h + $(Q) cp -f include\nuttx\math.h include\math.h +else +include\math.h: +endif + +# The float.h header file defines the properties of your floating point +# implementation. It would always be best to use your toolchain's float.h +# header file but if none is avaiable, a default float.h header file will +# provided if this option is selected. However there is no assurance that +# the settings in this float.h are actually correct for your platform! + +ifeq ($(CONFIG_ARCH_FLOAT_H),y) +include\float.h: include\nuttx\float.h + $(Q) cp -f include\nuttx\float.h include\float.h +else +include\float.h: +endif + +# Target used to copy include\nuttx\stdarg.h. If CONFIG_ARCH_STDARG_H is +# defined, then there is an architecture specific stdarg.h header file +# that will be included indirectly from include\stdarg.h. But first, we +# have to copy stdarg.h from include\nuttx\. to include\. + +ifeq ($(CONFIG_ARCH_STDARG_H),y) +include\stdarg.h: include\nuttx\stdarg.h + $(Q) cp -f include\nuttx\stdarg.h include\stdarg.h +else +include\stdarg.h: +endif + +# Targets used to build include\nuttx\version.h. Creation of version.h is +# part of the overall NuttX configuration sequence. Notice that the +# tools\mkversion tool is built and used to create include\nuttx\version.h + +tools\mkversion: + $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkversion + +$(TOPDIR)\.version: + $(Q) if [ ! -f .version ]; then \ + echo "No .version file found, creating one"; \ + tools\version.sh -v 0.0 -b 0 .version; \ + chmod 755 .version; \ + fi + +include\nuttx\version.h: $(TOPDIR)\.version tools\mkversion + $(Q) tools\mkversion $(TOPDIR) > include\nuttx\version.h + +# Targets used to build include\nuttx\config.h. Creation of config.h is +# part of the overall NuttX configuration sequence. Notice that the +# tools\mkconfig tool is built and used to create include\nuttx\config.h + +tools\mkconfig: + $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkconfig + +include\nuttx\config.h: $(TOPDIR)\.config tools\mkconfig + $(Q) tools\mkconfig $(TOPDIR) > include\nuttx\config.h + +# dirlinks, and helpers +# +# Directories links. Most of establishing the NuttX configuration involves +# setting up symbolic links with 'generic' directory names to specific, +# configured directories. +# +# Link the apps/include directory to include\apps + +include\apps: Make.defs +ifneq ($(APPDIR),) + @echo "LN: include\apps $(APPDIR)\include" +ifeq ($(CONFIG_WINDOWS_MKLINK),y) + $(Q) /user:administrator mklink /d include\apps $(APPDIR)\include +else + $(Q) xcopy $(APPDIR)\include include\apps /c /q /s /e /y /i + $(Q) echo FAKELNK > include\apps\.fakelnk +endif +endif + +# Link the arch\<arch-name>\include directory to include\arch + +include\arch: Make.defs + @echo "LN: include\arch -> $(TOPDIR)\$(ARCH_DIR)\include" +ifeq ($(CONFIG_WINDOWS_MKLINK),y) + $(Q) /user:administrator mklink /d include\arch $(TOPDIR)\$(ARCH_DIR)\include +else + $(Q) xcopy $(TOPDIR)\$(ARCH_DIR)\include include\arch /c /q /s /e /y /i + $(Q) echo FAKELNK > include\arch\.fakelnk +endif + +# Link the configs\<board-name>\include directory to include\arch\board + +include\arch\board: include\arch Make.defs include\arch + @echo "LN: include\arch\board -> $(TOPDIR)\$(BOARD_DIR)\include" +ifeq ($(CONFIG_WINDOWS_MKLINK),y) + $(Q) /user:administrator mklink /d include\arch\board $(TOPDIR)\$(BOARD_DIR)\include +else + $(Q) xcopy $(TOPDIR)\$(BOARD_DIR)\include include\arch\board /c /q /s /e /y /i + $(Q) echo FAKELNK > include\arch\board\.fakelnk +endif + +# Link the configs\<board-name>\src dir to arch\<arch-name>\src\board + +$(ARCH_SRC)\board: Make.defs + @echo "LN: $(ARCH_SRC)\board -> $(TOPDIR)\$(BOARD_DIR)\src" +ifeq ($(CONFIG_WINDOWS_MKLINK),y) + $(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(TOPDIR)\$(BOARD_DIR)\src +else + $(Q) xcopy $(TOPDIR)\$(BOARD_DIR)\src $(ARCH_SRC)\board /c /q /s /e /y /i + $(Q) echo FAKELNK > $(ARCH_SRC)\board\.fakelnk +endif + +# Link arch\<arch-name>\include\<chip-name> to arch\<arch-name>\include\chip + +$(ARCH_SRC)\chip: Make.defs +ifneq ($(CONFIG_ARCH_CHIP),) + @echo "LN: $(ARCH_SRC)\chip -> $(TOPDIR)\$(ARCH_SRC)\$(CONFIG_ARCH_CHIP)" +ifeq ($(CONFIG_WINDOWS_MKLINK),y) + $(Q) /user:administrator mklink /d $(ARCH_SRC)\chip $(TOPDIR)\$(ARCH_SRC)\$(CONFIG_ARCH_CHIP) +else + $(Q) xcopy $(TOPDIR)\$(ARCH_SRC)\$(CONFIG_ARCH_CHIP) $(ARCH_SRC)\chip /c /q /s /e /y /i + $(Q) echo FAKELNK > $(ARCH_SRC)\chip\.fakelnk +endif +endif + +# Link arch\<arch-name>\src\<chip-name> to arch\<arch-name>\src\chip + +include\arch\chip: include\arch Make.defs +ifneq ($(CONFIG_ARCH_CHIP),) + @echo "LN: include\arch\chip -> $(TOPDIR)\$(ARCH_INC)\$(CONFIG_ARCH_CHIP)" +ifeq ($(CONFIG_WINDOWS_MKLINK),y) + $(Q) /user:administrator mklink /d include\arch\chip $(TOPDIR)\$(ARCH_INC)\$(CONFIG_ARCH_CHIP) +else + $(Q) xcopy $(TOPDIR)\$(ARCH_INC)\$(CONFIG_ARCH_CHIP) include\arch\chip /c /q /s /e /y /i + $(Q) echo FAKELNK > include\arch\chip\.fakelnk +endif +endif + +dirlinks: include\arch include\arch\board include\arch\chip $(ARCH_SRC)\board $(ARCH_SRC)\chip include\apps + +# context +# +# The context target is invoked on each target build to assure that NuttX is +# properly configured. The basic configuration steps include creation of the +# the config.h and version.h header files in the include\nuttx directory and +# the establishment of symbolic links to configured directories. + +context: check_context include\nuttx\config.h include\nuttx\version.h include\math.h include\float.h include\stdarg.h dirlinks + $(Q) for %%G in ($(CONTEXTDIRS)) do ( $(MAKE) -C %%G TOPDIR="$(TOPDIR)" context ) + +# clean_context +# +# This is part of the distclean target. It removes all of the header files +# and symbolic links created by the context target. + +clean_context: + $(Q) rm -f include\nuttx\config.h + $(Q) rm -f include\nuttx\version.h + $(Q) rm -f include\math.h + $(Q) rm -f include\stdarg.h + $(Q) $(DIRUNLINK) include\arch\board + $(Q) $(DIRUNLINK) include\arch\chip + $(Q) $(DIRUNLINK) include\arch + $(Q) $(DIRUNLINK) $(ARCH_SRC)\board + $(Q) $(DIRUNLINK) $(ARCH_SRC)\chip + $(Q) $(DIRUNLINK) include\apps + +# check_context +# +# This target checks if NuttX has been configured. NuttX is configured using +# the script tools\configure.sh. That script will install certain files in +# the top-level NuttX build directory. This target verifies that those +# configuration files have been installed and that NuttX is ready to be built. + +check_context: + if not exist $(TOPDIR)\.config echo "$(TOPDIR)\.config does not exist" + if not exist $(TOPDIR)\Make.defs echo "$(TOPDIR)\Make.defs does not exist" + +# Archive targets. The target build sequency will first create a series of +# libraries, one per configured source file directory. The final NuttX +# execution will then be built from those libraries. The following targets +# built those libraries. +# +# Possible kernel-mode builds + +libc\libkc$(LIBEXT): context + $(Q) $(MAKE) -C libc TOPDIR="$(TOPDIR)" libkc$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libkc$(LIBEXT): libc\libkc$(LIBEXT) + $(Q) install libc\libkc$(LIBEXT) lib\libkc$(LIBEXT) + +sched\libsched$(LIBEXT): context + $(Q) $(MAKE) -C sched TOPDIR="$(TOPDIR)" libsched$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libsched$(LIBEXT): sched\libsched$(LIBEXT) + $(Q) install sched\libsched$(LIBEXT) lib\libsched$(LIBEXT) + +$(ARCH_SRC)\libarch$(LIBEXT): context + $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libarch$(LIBEXT): $(ARCH_SRC)\libarch$(LIBEXT) + $(Q) install $(ARCH_SRC)\libarch$(LIBEXT) lib\libarch$(LIBEXT) + +net\libnet$(LIBEXT): context + $(Q) $(MAKE) -C net TOPDIR="$(TOPDIR)" libnet$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libnet$(LIBEXT): net\libnet$(LIBEXT) + $(Q) install net\libnet$(LIBEXT) lib\libnet$(LIBEXT) + +fs\libfs$(LIBEXT): context + $(Q) $(MAKE) -C fs TOPDIR="$(TOPDIR)" libfs$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libfs$(LIBEXT): fs\libfs$(LIBEXT) + $(Q) install fs\libfs$(LIBEXT) lib\libfs$(LIBEXT) + +drivers\libdrivers$(LIBEXT): context + $(Q) $(MAKE) -C drivers TOPDIR="$(TOPDIR)" libdrivers$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libdrivers$(LIBEXT): drivers\libdrivers$(LIBEXT) + $(Q) install drivers\libdrivers$(LIBEXT) lib\libdrivers$(LIBEXT) + +binfmt\libbinfmt$(LIBEXT): context + $(Q) $(MAKE) -C binfmt TOPDIR="$(TOPDIR)" libbinfmt$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libbinfmt$(LIBEXT): binfmt\libbinfmt$(LIBEXT) + $(Q) install binfmt\libbinfmt$(LIBEXT) lib\libbinfmt$(LIBEXT) + +graphics\libgraphics$(LIBEXT): context + $(Q) $(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libgraphics$(LIBEXT): graphics\libgraphics$(LIBEXT) + $(Q) install graphics\libgraphics$(LIBEXT) lib\libgraphics$(LIBEXT) + +syscall\libstubs$(LIBEXT): context + $(Q) $(MAKE) -C syscall TOPDIR="$(TOPDIR)" libstubs$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libstubs$(LIBEXT): syscall\libstubs$(LIBEXT) + $(Q) install syscall\libstubs$(LIBEXT) lib\libstubs$(LIBEXT) + +# Possible user-mode builds + +libc\libuc$(LIBEXT): context + $(Q) $(MAKE) -C libc TOPDIR="$(TOPDIR)" libuc$(LIBEXT) + +lib\libuc$(LIBEXT): libc\libuc$(LIBEXT) + $(Q) install libc\libuc$(LIBEXT) lib\libuc$(LIBEXT) + +libxx\libcxx$(LIBEXT): context + $(Q) $(MAKE) -C libxx TOPDIR="$(TOPDIR)" libcxx$(LIBEXT) + +lib\libcxx$(LIBEXT): libxx\libcxx$(LIBEXT) + $(Q) install libxx\libcxx$(LIBEXT) lib\libcxx$(LIBEXT) + +mm\libmm$(LIBEXT): context + $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT) EXTRADEFINES=$(KDEFINE) + +lib\libmm$(LIBEXT): mm\libmm$(LIBEXT) + $(Q) install mm\libmm$(LIBEXT) lib\libmm$(LIBEXT) + +$(APPDIR)\libapps$(LIBEXT): context + $(Q) $(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" libapps$(LIBEXT) + +lib\libapps$(LIBEXT): $(APPDIR)\libapps$(LIBEXT) + $(Q) install $(APPDIR)\libapps$(LIBEXT) lib\libapps$(LIBEXT) + +syscall\libproxies$(LIBEXT): context + $(Q) $(MAKE) -C syscall TOPDIR="$(TOPDIR)" libproxies$(LIBEXT) + +lib\libproxies$(LIBEXT): syscall\libproxies$(LIBEXT) + $(Q) install syscall\libproxies$(LIBEXT) lib\libproxies$(LIBEXT) + +# Possible non-kernel builds + +libc\libc$(LIBEXT): context + $(Q) $(MAKE) -C libc TOPDIR="$(TOPDIR)" libc$(LIBEXT) + +lib\libc$(LIBEXT): libc\libc$(LIBEXT) + $(Q) install libc\libc$(LIBEXT) lib\libc$(LIBEXT) + +# pass1 and pass2 +# +# If the 2 pass build option is selected, then this pass1 target is +# configured to built before the pass2 target. This pass1 target may, as an +# example, build an extra link object (CONFIG_PASS1_OBJECT) which may be an +# incremental (relative) link object, but could be a static library (archive); +# some modification to this Makefile would be required if CONFIG_PASS1_OBJECT +# is an archive. Exactly what is performed during pass1 or what it generates +# is unknown to this makefule unless CONFIG_PASS1_OBJECT is defined. + +pass1deps: context pass1dep $(USERLIBS) + +pass1: pass1deps +ifeq ($(CONFIG_BUILD_2PASS),y) + $(Q) if [ -z "$(CONFIG_PASS1_BUILDIR)" ]; then \ + echo "ERROR: CONFIG_PASS1_BUILDIR not defined"; \ + exit 1; \ + fi + $(Q) if [ ! -d "$(CONFIG_PASS1_BUILDIR)" ]; then \ + echo "ERROR: CONFIG_PASS1_BUILDIR does not exist"; \ + exit 1; \ + fi + $(Q) if [ ! -f "$(CONFIG_PASS1_BUILDIR)\Makefile" ]; then \ + echo "ERROR: No Makefile in CONFIG_PASS1_BUILDIR"; \ + exit 1; \ + fi + $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" LINKLIBS="$(LINKLIBS)" USERLIBS="$(USERLIBS)" "$(CONFIG_PASS1_TARGET)" +endif + +pass2deps: context pass2dep $(NUTTXLIBS) + +pass2: pass2deps + $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(LINKLIBS)" EXTRADEFINES=$(KDEFINE) $(BIN) + $(Q) if [ -w \tftpboot ] ; then \ + cp -f $(BIN) \tftpboot\$(BIN).${CONFIG_ARCH}; \ + fi +ifeq ($(CONFIG_RRLOAD_BINARY),y) + @echo "MK: $(BIN).rr" + $(Q) $(TOPDIR)\tools\mkimage.sh --Prefix $(CROSSDEV) $(BIN) $(BIN).rr + $(Q) if [ -w \tftpboot ] ; then \ + cp -f $(BIN).rr \tftpboot\$\(BIN).rr.$(CONFIG_ARCH); \ + fi +endif +ifeq ($(CONFIG_INTELHEX_BINARY),y) + @echo "CP: $(BIN).hex" + $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O ihex $(BIN) $(BIN).hex +endif +ifeq ($(CONFIG_MOTOROLA_SREC),y) + @echo "CP: $(BIN).srec" + $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O srec $(BIN) $(BIN).srec +endif +ifeq ($(CONFIG_RAW_BINARY),y) + @echo "CP: $(BIN).bin" + $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary $(BIN) $(BIN).bin +endif + +# $(BIN) +# +# Create the final NuttX executable in a two pass build process. In the +# normal case, all pass1 and pass2 dependencies are created then pass1 +# and pass2 targets are built. However, in some cases, you may need to build +# pass1 depenencies and pass1 first, then build pass2 dependencies and pass2. +# in that case, execute 'make pass1 pass2' from the command line. + +$(BIN): pass1deps pass2deps pass1 pass2 + +# download +# +# This is a helper target that will rebuild NuttX and download it to the target +# system in one step. The operation of this target depends completely upon +# implementation of the DOWNLOAD command in the user Make.defs file. It will +# generate an error an error if the DOWNLOAD command is not defined. + +download: $(BIN) + $(call DOWNLOAD, $<) + +# pass1dep: Create pass1 build dependencies +# pass2dep: Create pass2 build dependencies + +pass1dep: context + $(Q) for %%G in ($(USERDEPDIRS)) do ( $(MAKE) -C %%G TOPDIR="$(TOPDIR)" depend ) + +pass2dep: context + $(Q) for %%G in ($(KERNDEPDIRS)) do ( $(MAKE) -C %%G TOPDIR="$(TOPDIR)" EXTRADEFINES=$(KDEFINE) depend ) + +# Configuration targets +# +# These targets depend on the kconfig-frontends packages. To use these, you +# must first download and install the kconfig-frontends package from this +# location: http://ymorin.is-a-geek.org/projects/kconfig-frontends. See +# misc\tools\README.txt for additional information. + +config: + $(Q) APPSDIR=${CONFIG_APPS_DIR} conf Kconfig + +oldconfig: + $(Q) APPSDIR=${CONFIG_APPS_DIR} conf --oldconfig Kconfig + +menuconfig: + $(Q) APPSDIR=${CONFIG_APPS_DIR} mconf Kconfig + +# export +# +# The export target will package the NuttX libraries and header files into +# an exportable package. Caveats: (1) These needs some extension for the KERNEL +# build; it needs to receive USERLIBS and create a libuser.a). (2) The logic +# in tools\mkexport.sh only supports GCC and, for example, explicitly assumes +# that the archiver is 'ar' + +export: pass2deps + $(Q) tools\mkexport.sh -w$(WINTOOL) -t "$(TOPDIR)" -l "$(NUTTXLIBS)" + +# General housekeeping targets: dependencies, cleaning, etc. +# +# depend: Create both PASS1 and PASS2 dependencies +# clean: Removes derived object files, archives, executables, and +# temporary files, but retains the configuration and context +# files and directories. +# distclean: Does 'clean' then also removes all configuration and context +# files. This essentially restores the directory structure +# to its original, unconfigured stated. + +depend: pass1dep pass2dep + +subdir_clean: + $(Q) for %%G in ($(CLEANDIRS)) do ( if exist %%G/Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" clean ) + $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" clean + $(Q) $(MAKE) -C mm -f Makefile.test TOPDIR="$(TOPDIR)" clean +ifeq ($(CONFIG_BUILD_2PASS),y) + $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" clean +endif + +clean: subdir_clean + $(Q) rm -f $(BIN) nuttx.* mm_test *.map _SAVED_APPS_config *~ + $(Q) rm -f nuttx-export* + +subdir_distclean: + $(Q) for %%G in ($(CLEANDIRS)) do ( if exist %%G/Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" distclean ) + +distclean: clean subdir_distclean clean_context +ifeq ($(CONFIG_BUILD_2PASS),y) + $(Q) $(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" distclean +endif + $(Q) rm -f Make.defs setenv.sh setenv.bat .config .config.old + +# Application housekeeping targets. The APPDIR variable refers to the user +# application directory. A sample apps\ directory is included with NuttX, +# however, this is not treated as part of NuttX and may be replaced with a +# different application directory. For the most part, the application +# directory is treated like any other build directory in this script. However, +# as a convenience, the following targets are included to support housekeeping +# functions in the user application directory from the NuttX build directory. +# +# apps_clean: Perform the clean operation only in the user application +# directory +# apps_distclean: Perform the distclean operation only in the user application +# directory. Note that the apps\.config file (inf any) is +# preserved so that this is not a "full" distclean but more of a +# configuration "reset." (There willnot be an apps\.config +# file if the configuration was generated via make menuconfig). + +apps_clean: +ifneq ($(APPDIR),) + $(Q) $(MAKE) -C "$(TOPDIR)\$(APPDIR)" TOPDIR="$(TOPDIR)" clean +endif + +apps_distclean: +ifneq ($(APPDIR),) + $(Q) if [ -r "$(TOPDIR)\$(APPDIR)\.config" ]; then \ + cp "$(TOPDIR)\$(APPDIR)\.config" _SAVED_APPS_config || \ + { echo "Copy of $(APPDIR)\.config failed" ; exit 1 ; } \ + else \ + rm -f _SAVED_APPS_config; \ + fi + $(Q) $(MAKE) -C "$(TOPDIR)\$(APPDIR)" TOPDIR="$(TOPDIR)" distclean + $(Q) if [ -r _SAVED_APPS_config ]; then \ + mv _SAVED_APPS_config "$(TOPDIR)\$(APPDIR)\.config" || \ + { echo "Copy of _SAVED_APPS_config failed" ; exit 1 ; } \ + fi +endif + diff --git a/nuttx/README.txt b/nuttx/README.txt index 528b7897e5..737d4d4e29 100644 --- a/nuttx/README.txt +++ b/nuttx/README.txt @@ -18,6 +18,7 @@ README - Building - Re-building - Build Targets and Options + - Native Windows Build o Cygwin Build Problems - Strange Path Problems - Window Native Toolchain Issues @@ -493,6 +494,35 @@ Build Targets and Options useful when adding new boards or tracking down compile time errors and warnings (Contributed by Richard Cochran). +Native Windows Build +-------------------- + + The beginnings of a Windows native build are in place but still not full + usable as of this writing. The windows native build logic is currently + separate and must be started by: + + make -f Makefile.win + + This build: + + - Uses all Windows style paths + - Uses primarily Windows batch commands from cmd.exe, with + - A few extensions from GNUWin32 (or MSYS is you prefer) + + In this build, you cannot use a Cygwin or MSYS shell. Rather the build must + be performed in a Windows CMD shell. Here is a better shell than than the + standard issue, CMD shell: ConEmu which can be downloaded from: + http://code.google.com/p/conemu-maximus5/ + + Build Tools. The build still relies on some Unix-like commands. I use + the GNUWin32 tools that can be downloaded from http://gnuwin32.sourceforge.net/. + The MSYS tools are probably also a option but are likely lower performance + since they are based on Cygwin 1.3. + + Host Compiler: I use the MingGW compiler which can be downloaded from + http://www.mingw.org/. If you are using GNUWin32, then it is recommended + the you not install the optional MSYS components as there may be conflicts. + CYGWIN BUILD PROBLEMS ^^^^^^^^^^^^^^^^^^^^^ diff --git a/nuttx/binfmt/Makefile b/nuttx/binfmt/Makefile index caf57e62fe..68f671ce61 100644 --- a/nuttx/binfmt/Makefile +++ b/nuttx/binfmt/Makefile @@ -81,19 +81,19 @@ $(BIN): $(BINFMT_OBJS) $(call ARCHIVE, $@, "$(BINFMT_OBJS)") .depend: Makefile $(BINFMT_SRCS) - @$(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep + $(Q) touch $@ depend: .depend clean: - @rm -f $(BIN) *~ .*.swp + $(Q) rm -f $(BIN) *~ .*.swp $(call CLEAN) - @( for dir in $(SUBDIRS); do \ + $(Q) ( for dir in $(SUBDIRS); do \ rm -f $${dir}/*~ $${dir}/.*.swp; \ done ; ) distclean: clean - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/configs/ez80f910200kitg/ostest/Make.defs b/nuttx/configs/ez80f910200kitg/ostest/Make.defs index 2ec06aadd3..b7b4e23785 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/Make.defs +++ b/nuttx/configs/ez80f910200kitg/ostest/Make.defs @@ -153,10 +153,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lod *.lst diff --git a/nuttx/configs/ez80f910200zco/dhcpd/Make.defs b/nuttx/configs/ez80f910200zco/dhcpd/Make.defs index 367f60ca7f..17ac71f07b 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/Make.defs +++ b/nuttx/configs/ez80f910200zco/dhcpd/Make.defs @@ -153,10 +153,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lod *.lst diff --git a/nuttx/configs/ez80f910200zco/httpd/Make.defs b/nuttx/configs/ez80f910200zco/httpd/Make.defs index ec5a70ca69..399d3a4c25 100644 --- a/nuttx/configs/ez80f910200zco/httpd/Make.defs +++ b/nuttx/configs/ez80f910200zco/httpd/Make.defs @@ -153,10 +153,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lod *.lst diff --git a/nuttx/configs/ez80f910200zco/nettest/Make.defs b/nuttx/configs/ez80f910200zco/nettest/Make.defs index 04074c1bf7..3044e8ffdb 100644 --- a/nuttx/configs/ez80f910200zco/nettest/Make.defs +++ b/nuttx/configs/ez80f910200zco/nettest/Make.defs @@ -153,10 +153,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lod *.lst diff --git a/nuttx/configs/ez80f910200zco/nsh/Make.defs b/nuttx/configs/ez80f910200zco/nsh/Make.defs index 3f740ac34e..469baeb1aa 100644 --- a/nuttx/configs/ez80f910200zco/nsh/Make.defs +++ b/nuttx/configs/ez80f910200zco/nsh/Make.defs @@ -153,10 +153,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lod *.lst diff --git a/nuttx/configs/ez80f910200zco/ostest/Make.defs b/nuttx/configs/ez80f910200zco/ostest/Make.defs index 7c738c4b31..c06dfdebe4 100644 --- a/nuttx/configs/ez80f910200zco/ostest/Make.defs +++ b/nuttx/configs/ez80f910200zco/ostest/Make.defs @@ -153,10 +153,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lod *.lst diff --git a/nuttx/configs/ez80f910200zco/poll/Make.defs b/nuttx/configs/ez80f910200zco/poll/Make.defs index 65d3ca2f78..fa21c72065 100644 --- a/nuttx/configs/ez80f910200zco/poll/Make.defs +++ b/nuttx/configs/ez80f910200zco/poll/Make.defs @@ -153,10 +153,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lod *.lst diff --git a/nuttx/configs/rgmp/x86/cxxtest/Make.defs b/nuttx/configs/rgmp/x86/cxxtest/Make.defs index 858ecbae1e..9c14dc783f 100644 --- a/nuttx/configs/rgmp/x86/cxxtest/Make.defs +++ b/nuttx/configs/rgmp/x86/cxxtest/Make.defs @@ -36,6 +36,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk RGMPLIBDIR := $(RGMP_INST_DIR)/lib RGMPINCDIR := $(RGMP_INST_DIR)/include @@ -96,35 +97,6 @@ LDFLAGS += -nostdlib EXTRA_LIBS = $(shell $(CC) -print-file-name=libsupc++.a) \ $(shell $(CC) -print-file-name=libgcc_eh.a) -define PREPROCESS - @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 -endef - -define COMPILE - @echo "CC: $1" - @$(CC) -c $(CFLAGS) $1 -o $2 -endef - -define COMPILEXX - @echo "CXX: $1" - @$(CXX) -c $(CXXFLAGS) $1 -o $2 -endef - -define ASSEMBLE - @echo "AS: $1" - @$(CC) -c $(AFLAGS) $1 -o $2 -endef - -define ARCHIVE - echo "AR: $2"; \ - $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } -endef - -define CLEAN - @rm -f *.o *.a -endef - MKDEP = $(TOPDIR)/tools/mkdeps.sh HOSTCC = gcc diff --git a/nuttx/configs/rgmp/x86/helloxx/Make.defs b/nuttx/configs/rgmp/x86/helloxx/Make.defs index d2d0e83ea9..b40db563a0 100644 --- a/nuttx/configs/rgmp/x86/helloxx/Make.defs +++ b/nuttx/configs/rgmp/x86/helloxx/Make.defs @@ -36,6 +36,7 @@ ############################################################################ include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk RGMPLIBDIR := $(RGMP_INST_DIR)/lib RGMPINCDIR := $(RGMP_INST_DIR)/include @@ -94,35 +95,6 @@ LDFLAGS += -nostdlib EXTRA_LIBS = $(shell $(CC) -print-file-name=libsupc++.a) \ $(shell $(CC) -print-file-name=libgcc_eh.a) -define PREPROCESS - @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 -endef - -define COMPILE - @echo "CC: $1" - @$(CC) -c $(CFLAGS) $1 -o $2 -endef - -define COMPILEXX - @echo "CXX: $1" - @$(CXX) -c $(CXXFLAGS) $1 -o $2 -endef - -define ASSEMBLE - @echo "AS: $1" - @$(CC) -c $(AFLAGS) $1 -o $2 -endef - -define ARCHIVE - echo "AR: $2"; \ - $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } -endef - -define CLEAN - @rm -f *.o *.a -endef - MKDEP = $(TOPDIR)/tools/mkdeps.sh HOSTCC = gcc diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index 216ce85cc6..a69f53b0f5 100644 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -1441,3 +1441,37 @@ Where <subdir> is one of the following: The RTC alarm is used to wake up from STOP mode and to transition to STANDBY mode. This used of the RTC alarm could conflict with other uses of the RTC alarm in your application. + + winbuild: + -------- + + This is a version of the apps/example/ostest, but configure to build natively + in the Windows CMD shell. + + NOTES: + + 1. The beginnings of a Windows native build are in place but still not full + usable as of this writing. The windows native build logic is currently + separate and must be started by: + + make -f Makefile.win + + This build: + + - Uses all Windows style paths + - Uses primarily Windows batch commands from cmd.exe, with + - A few extensions from GNUWin32 (or MSYS is you prefer) + + In this build, you cannot use a Cygwin or MSYS shell. Rather the build must + be performed in a Windows CMD shell. Here is a better shell than than the + standard issue, CMD shell: ConEmu which can be downloaded from: + http://code.google.com/p/conemu-maximus5/ + + Build Tools. The build still relies on some Unix-like commands. I use + the GNUWin32 tools that can be downloaded from http://gnuwin32.sourceforge.net/. + The MSYS tools are probably also a option but are likely lower performance + since they are based on Cygwin 1.3. + + Host Compiler: I use the MingGW compiler which can be downloaded from + http://www.mingw.org/. If you are using GNUWin32, then it is recommended + the you not install the optional MSYS components as there may be conflicts. diff --git a/nuttx/configs/stm32f4discovery/winbuild/Make.defs b/nuttx/configs/stm32f4discovery/winbuild/Make.defs new file mode 100644 index 0000000000..0837044548 --- /dev/null +++ b/nuttx/configs/stm32f4discovery/winbuild/Make.defs @@ -0,0 +1,137 @@ +############################################################################ +# configs/stm32f4discovery/winbuild/Make.defs +# +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +include ${TOPDIR}/.config +include ${TOPDIR}/tools/Config.mk + +# Setup for the selected toolchain + +ifeq ($(CONFIG_STM32_CODESOURCERYW),y) + # CodeSourcery under Windows + CROSSDEV = arm-none-eabi- + ARCROSSDEV = arm-none-eabi- + ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft +endif +ifeq ($(CONFIG_STM32_ATOLLIC_LITE),y) + # Atollic toolchain under Windows + CROSSDEV = arm-atollic-eabi- + ARCROSSDEV = +ifeq ($(CONFIG_ARCH_FPU),y) + ARCHCPUFLAGS = -mcpu=cortex-m4 -mthumb -march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard +else + ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft +endif +endif +ifeq ($(CONFIG_STM32_ATOLLIC_PRO),y) + # Atollic toolchain under Windows + CROSSDEV = arm-atollic-eabi- + ARCROSSDEV = arm-atollic-eabi- +ifeq ($(CONFIG_ARCH_FPU),y) + ARCHCPUFLAGS = -mcpu=cortex-m4 -mthumb -march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard +else + ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft +endif +endif +ifeq ($(CONFIG_STM32_DEVKITARM),y) + # devkitARM under Windows + CROSSDEV = arm-eabi- + ARCROSSDEV = arm-eabi- + ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft +endif +ifeq ($(CONFIG_STM32_RAISONANCE),y) + # Raisonance RIDE7 under Windows + CROSSDEV = arm-none-eabi- + ARCROSSDEV = arm-none-eabi- + ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft +endif + +LDSCRIPT = ld.script + +# Windows-native toolchains + +MKDEP = $(TOPDIR)/tools/mknulldeps.sh +ARCHINCLUDES = -I. -isystem $(TOPDIR)/include +ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx +ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + +CC = $(CROSSDEV)gcc.exe +CXX = $(CROSSDEV)g++.exe +CPP = $(CROSSDEV)gcc.exe -E +LD = $(CROSSDEV)ld.exe +AR = $(ARCROSSDEV)ar.exe rcs +NM = $(ARCROSSDEV)nm.exe +OBJCOPY = $(CROSSDEV)objcopy.exe +OBJDUMP = $(CROSSDEV)objdump.exe + +ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} +ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} + +ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") + ARCHOPTIMIZATION = -g +else + ARCHOPTIMIZATION = $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer +endif + +ARCHCFLAGS = -fno-builtin +ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti +ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow +ARCHWARNINGSXX = -Wall -Wshadow +ARCHDEFINES = +ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 + +CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe +CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS) +CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe +CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) +CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) +AFLAGS = $(CFLAGS) -D__ASSEMBLY__ + +NXFLATLDFLAGS1 = -r -d -warn-common +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections +LDNXFLATFLAGS = -e main -s 2048 + +OBJEXT = .o +LIBEXT = .a +EXEEXT = .exe + +LDFLAGS += -nostartfiles -nodefaultlibs +ifeq ($(CONFIG_DEBUG_SYMBOLS),y) + LDFLAGS += -g +endif + +HOSTCC = mingw-gcc.exe +HOSTINCLUDES = -I. +HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe +HOSTLDFLAGS = diff --git a/nuttx/configs/stm32f4discovery/winbuild/defconfig b/nuttx/configs/stm32f4discovery/winbuild/defconfig new file mode 100644 index 0000000000..e52719f256 --- /dev/null +++ b/nuttx/configs/stm32f4discovery/winbuild/defconfig @@ -0,0 +1,584 @@ +# +# Automatically generated file; DO NOT EDIT. +# Nuttx/ Configuration +# +CONFIG_NUTTX_NEWCONFIG=y + +# +# Build Setup +# +# CONFIG_EXPERIMENTAL is not set +# CONFIG_HOST_LINUX is not set +# CONFIG_HOST_OSX is not set +CONFIG_HOST_WINDOWS=y +# CONFIG_HOST_OTHER is not set +CONFIG_WINDOWS_NATIVE=y +# CONFIG_WINDOWS_CYGWIN is not set +# CONFIG_WINDOWS_MSYS is not set +# CONFIG_WINDOWS_OTHER is not set +# CONFIG_WINDOWS_MKLINK is not set + +# +# Build Configuration +# +# CONFIG_APPS_DIR="../apps" +# CONFIG_BUILD_2PASS is not set + +# +# Binary Output Formats +# +# CONFIG_RRLOAD_BINARY is not set +CONFIG_INTELHEX_BINARY=y +# CONFIG_MOTOROLA_SREC is not set +CONFIG_RAW_BINARY=y + +# +# Customize Header Files +# +# CONFIG_ARCH_STDBOOL_H is not set +# CONFIG_ARCH_MATH_H is not set +# CONFIG_ARCH_FLOAT_H is not set +# CONFIG_ARCH_STDARG_H is not set + +# +# Debug Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_SYMBOLS is not set + +# +# System Type +# +# CONFIG_ARCH_8051 is not set +CONFIG_ARCH_ARM=y +# CONFIG_ARCH_AVR is not set +# CONFIG_ARCH_HC is not set +# CONFIG_ARCH_MIPS is not set +# CONFIG_ARCH_RGMP is not set +# CONFIG_ARCH_SH is not set +# CONFIG_ARCH_SIM is not set +# CONFIG_ARCH_X86 is not set +# CONFIG_ARCH_Z16 is not set +# CONFIG_ARCH_Z80 is not set +CONFIG_ARCH="arm" + +# +# ARM Options +# +# CONFIG_ARCH_CHIP_C5471 is not set +# CONFIG_ARCH_CHIP_CALYPSO is not set +# CONFIG_ARCH_CHIP_DM320 is not set +# CONFIG_ARCH_CHIP_IMX is not set +# CONFIG_ARCH_CHIP_KINETIS is not set +# CONFIG_ARCH_CHIP_LM3S is not set +# CONFIG_ARCH_CHIP_LPC17XX is not set +# CONFIG_ARCH_CHIP_LPC214X is not set +# CONFIG_ARCH_CHIP_LPC2378 is not set +# CONFIG_ARCH_CHIP_LPC31XX is not set +# CONFIG_ARCH_CHIP_LPC43XX is not set +# CONFIG_ARCH_CHIP_SAM3U is not set +CONFIG_ARCH_CHIP_STM32=y +# CONFIG_ARCH_CHIP_STR71X is not set +CONFIG_ARCH_CORTEXM4=y +CONFIG_ARCH_FAMILY="armv7-m" +CONFIG_ARCH_CHIP="stm32" +CONFIG_ARCH_HAVE_CMNVECTOR=y +# CONFIG_ARMV7M_CMNVECTOR is not set +# CONFIG_ARCH_FPU is not set +CONFIG_ARCH_HAVE_MPU=y +# CONFIG_ARMV7M_MPU is not set +CONFIG_ARCH_IRQPRIO=y +CONFIG_BOARD_LOOPSPERMSEC=16717 +# CONFIG_ARCH_CALIBRATION is not set +# CONFIG_SERIAL_TERMIOS is not set + +# +# STM32 Configuration Options +# +# CONFIG_ARCH_CHIP_STM32F100C8 is not set +# CONFIG_ARCH_CHIP_STM32F100CB is not set +# CONFIG_ARCH_CHIP_STM32F100R8 is not set +# CONFIG_ARCH_CHIP_STM32F100RB is not set +# CONFIG_ARCH_CHIP_STM32F100RC is not set +# CONFIG_ARCH_CHIP_STM32F100RD is not set +# CONFIG_ARCH_CHIP_STM32F100RE is not set +# CONFIG_ARCH_CHIP_STM32F100V8 is not set +# CONFIG_ARCH_CHIP_STM32F100VB is not set +# CONFIG_ARCH_CHIP_STM32F100VC is not set +# CONFIG_ARCH_CHIP_STM32F100VD is not set +# CONFIG_ARCH_CHIP_STM32F100VE is not set +# CONFIG_ARCH_CHIP_STM32F103RET6 is not set +# CONFIG_ARCH_CHIP_STM32F103VCT6 is not set +# CONFIG_ARCH_CHIP_STM32F103VET6 is not set +# CONFIG_ARCH_CHIP_STM32F103ZET6 is not set +# CONFIG_ARCH_CHIP_STM32F105VBT7 is not set +# CONFIG_ARCH_CHIP_STM32F107VC is not set +# CONFIG_ARCH_CHIP_STM32F207IG is not set +# CONFIG_ARCH_CHIP_STM32F405RG is not set +# CONFIG_ARCH_CHIP_STM32F405VG is not set +# CONFIG_ARCH_CHIP_STM32F405ZG is not set +# CONFIG_ARCH_CHIP_STM32F407VE is not set +CONFIG_ARCH_CHIP_STM32F407VG=y +# CONFIG_ARCH_CHIP_STM32F407ZE is not set +# CONFIG_ARCH_CHIP_STM32F407ZG is not set +# CONFIG_ARCH_CHIP_STM32F407IE is not set +# CONFIG_ARCH_CHIP_STM32F407IG is not set +CONFIG_STM32_STM32F40XX=y +CONFIG_STM32_CODESOURCERYW=y +# CONFIG_STM32_CODESOURCERYL is not set +# CONFIG_STM32_ATOLLIC_LITE is not set +# CONFIG_STM32_ATOLLIC_PRO is not set +# CONFIG_STM32_DEVKITARM is not set +# CONFIG_STM32_RAISONANCE is not set +# CONFIG_STM32_BUILDROOT is not set +# CONFIG_STM32_DFU is not set + +# +# STM32 Peripheral Support +# +# CONFIG_STM32_ADC1 is not set +# CONFIG_STM32_ADC2 is not set +# CONFIG_STM32_ADC3 is not set +# CONFIG_STM32_BKPSRAM is not set +# CONFIG_STM32_CAN1 is not set +# CONFIG_STM32_CAN2 is not set +# CONFIG_STM32_CCMDATARAM is not set +# CONFIG_STM32_CRC is not set +# CONFIG_STM32_CRYP is not set +# CONFIG_STM32_DMA1 is not set +# CONFIG_STM32_DMA2 is not set +# CONFIG_STM32_DAC1 is not set +# CONFIG_STM32_DAC2 is not set +# CONFIG_STM32_DCMI is not set +# CONFIG_STM32_ETHMAC is not set +# CONFIG_STM32_FSMC is not set +# CONFIG_STM32_HASH is not set +# CONFIG_STM32_I2C1 is not set +# CONFIG_STM32_I2C2 is not set +# CONFIG_STM32_I2C3 is not set +# CONFIG_STM32_IWDG is not set +# CONFIG_STM32_OTGFS is not set +# CONFIG_STM32_OTGHS is not set +# CONFIG_STM32_PWR is not set +# CONFIG_STM32_RNG is not set +# CONFIG_STM32_SDIO is not set +# CONFIG_STM32_SPI1 is not set +# CONFIG_STM32_SPI2 is not set +# CONFIG_STM32_SPI3 is not set +CONFIG_STM32_SYSCFG=y +# CONFIG_STM32_TIM1 is not set +# CONFIG_STM32_TIM2 is not set +# CONFIG_STM32_TIM3 is not set +# CONFIG_STM32_TIM4 is not set +# CONFIG_STM32_TIM5 is not set +# CONFIG_STM32_TIM6 is not set +# CONFIG_STM32_TIM7 is not set +# CONFIG_STM32_TIM8 is not set +# CONFIG_STM32_TIM9 is not set +# CONFIG_STM32_TIM10 is not set +# CONFIG_STM32_TIM11 is not set +# CONFIG_STM32_TIM12 is not set +# CONFIG_STM32_TIM13 is not set +# CONFIG_STM32_TIM14 is not set +# CONFIG_STM32_USART1 is not set +CONFIG_STM32_USART2=y +# CONFIG_STM32_USART3 is not set +# CONFIG_STM32_UART4 is not set +# CONFIG_STM32_UART5 is not set +# CONFIG_STM32_USART6 is not set +# CONFIG_STM32_WWDG is not set + +# +# Alternate Pin Mapping +# +# CONFIG_STM32_JTAG_DISABLE is not set +# CONFIG_STM32_JTAG_FULL_ENABLE is not set +# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set +CONFIG_STM32_JTAG_SW_ENABLE=y +# CONFIG_STM32_FORCEPOWER is not set +# CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set +# CONFIG_STM32_CCMEXCLUDE is not set + +# +# USB Host Configuration +# + +# +# Architecture Options +# +# CONFIG_ARCH_NOINTC is not set +# CONFIG_ARCH_DMA is not set +CONFIG_ARCH_STACKDUMP=y + +# +# Board Settings +# +CONFIG_DRAM_START=0x20000000 +CONFIG_DRAM_SIZE=114688 +CONFIG_ARCH_HAVE_INTERRUPTSTACK=y +CONFIG_ARCH_INTERRUPTSTACK=0 + +# +# Boot options +# +# CONFIG_BOOT_RUNFROMEXTSRAM is not set +CONFIG_BOOT_RUNFROMFLASH=y +# CONFIG_BOOT_RUNFROMISRAM is not set +# CONFIG_BOOT_RUNFROMSDRAM is not set +# CONFIG_BOOT_COPYTORAM is not set + +# +# Board Selection +# +CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +# CONFIG_ARCH_BOARD_CUSTOM is not set +CONFIG_ARCH_BOARD="stm32f4discovery" + +# +# Common Board Options +# +CONFIG_ARCH_HAVE_LEDS=y +CONFIG_ARCH_LEDS=y +CONFIG_ARCH_HAVE_BUTTONS=y +# CONFIG_ARCH_BUTTONS is not set +CONFIG_ARCH_HAVE_IRQBUTTONS=y + +# +# Board-Specific Options +# + +# +# RTOS Features +# +CONFIG_MSEC_PER_TICK=10 +CONFIG_RR_INTERVAL=200 +# CONFIG_SCHED_INSTRUMENTATION is not set +CONFIG_TASK_NAME_SIZE=0 +# CONFIG_JULIAN_TIME is not set +CONFIG_START_YEAR=2009 +CONFIG_START_MONTH=9 +CONFIG_START_DAY=21 +CONFIG_DEV_CONSOLE=y +CONFIG_DEV_LOWCONSOLE=y +# CONFIG_MUTEX_TYPES is not set +# CONFIG_PRIORITY_INHERITANCE is not set +# CONFIG_FDCLONE_DISABLE is not set +# CONFIG_FDCLONE_STDIO is not set +CONFIG_SDCLONE_DISABLE=y +# CONFIG_SCHED_WORKQUEUE is not set +# CONFIG_SCHED_WAITPID is not set +# CONFIG_SCHED_ATEXIT is not set +# CONFIG_SCHED_ONEXIT is not set +CONFIG_USER_ENTRYPOINT="ostest_main" +CONFIG_DISABLE_OS_API=y +# CONFIG_DISABLE_CLOCK is not set +# CONFIG_DISABLE_POSIX_TIMERS is not set +# CONFIG_DISABLE_PTHREAD is not set +# CONFIG_DISABLE_SIGNALS is not set +# CONFIG_DISABLE_MQUEUE is not set +CONFIG_DISABLE_MOUNTPOINT=y +CONFIG_DISABLE_ENVIRON=y +CONFIG_DISABLE_POLL=y + +# +# Sizes of configurable things (0 disables) +# +CONFIG_MAX_TASKS=16 +CONFIG_MAX_TASK_ARGS=4 +CONFIG_NPTHREAD_KEYS=4 +CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_STREAMS=8 +CONFIG_NAME_MAX=32 +CONFIG_PREALLOC_MQ_MSGS=4 +CONFIG_MQ_MAXMSGSIZE=32 +CONFIG_MAX_WDOGPARMS=2 +CONFIG_PREALLOC_WDOGS=4 +CONFIG_PREALLOC_TIMERS=4 + +# +# Stack and heap information +# +# CONFIG_CUSTOM_STACK is not set +CONFIG_IDLETHREAD_STACKSIZE=1024 +CONFIG_USERMAIN_STACKSIZE=2048 +CONFIG_PTHREAD_STACK_MIN=256 +CONFIG_PTHREAD_STACK_DEFAULT=2048 + +# +# Device Drivers +# +CONFIG_DEV_NULL=y +# CONFIG_DEV_ZERO is not set +# CONFIG_LOOP is not set +# CONFIG_RAMDISK is not set +# CONFIG_CAN is not set +# CONFIG_PWM is not set +# CONFIG_I2C is not set +CONFIG_ARCH_HAVE_I2CRESET=y +# CONFIG_SPI is not set +# CONFIG_RTC is not set +# CONFIG_WATCHDOG is not set +# CONFIG_ANALOG is not set +# CONFIG_BCH is not set +# CONFIG_INPUT is not set +# CONFIG_LCD is not set +# CONFIG_MMCSD is not set +# CONFIG_MTD is not set +# CONFIG_PIPES is not set +# CONFIG_PM is not set +# CONFIG_POWER is not set +# CONFIG_SENSORS is not set +# CONFIG_SERCOMM_CONSOLE is not set +CONFIG_SERIAL=y +# CONFIG_LOWLEVEL_CONSOLE is not set +# CONFIG_16550_UART is not set +CONFIG_ARCH_HAVE_USART2=y +CONFIG_MCU_SERIAL=y +CONFIG_STANDARD_SERIAL=y +CONFIG_USART2_SERIAL_CONSOLE=y +# CONFIG_NO_SERIAL_CONSOLE is not set + +# +# USART2 Configuration +# +CONFIG_USART2_RXBUFSIZE=128 +CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART2_BAUD=115200 +CONFIG_USART2_BITS=8 +CONFIG_USART2_PARITY=0 +CONFIG_USART2_2STOP=0 +# CONFIG_USBDEV is not set +# CONFIG_USBHOST is not set +# CONFIG_WIRELESS is not set + +# +# System Logging Device Options +# + +# +# System Logging +# +# CONFIG_RAMLOG is not set + +# +# Networking Support +# +# CONFIG_NET is not set + +# +# File Systems +# + +# +# File system configuration +# +# CONFIG_FS_RAMMAP is not set + +# +# System Logging +# +# CONFIG_SYSLOG is not set + +# +# Graphics Support +# +# CONFIG_NX is not set + +# +# Memory Management +# +# CONFIG_MM_SMALL is not set +CONFIG_MM_REGIONS=2 +# CONFIG_GRAN is not set + +# +# Binary Formats +# +# CONFIG_BINFMT_DISABLE is not set +# CONFIG_NXFLAT is not set +# CONFIG_ELF is not set +CONFIG_SYMTAB_ORDEREDBYNAME=y + +# +# Library Routines +# +CONFIG_STDIO_BUFFER_SIZE=256 +CONFIG_STDIO_LINEBUFFER=y +CONFIG_NUNGET_CHARS=2 +# CONFIG_LIBM is not set +# CONFIG_NOPRINTF_FIELDWIDTH is not set +# CONFIG_LIBC_FLOATINGPOINT is not set +# CONFIG_EOL_IS_CR is not set +# CONFIG_EOL_IS_LF is not set +# CONFIG_EOL_IS_BOTH_CRLF is not set +CONFIG_EOL_IS_EITHER_CRLF=y +# CONFIG_LIBC_STRERROR is not set +# CONFIG_LIBC_PERROR_STDOUT is not set +CONFIG_ARCH_LOWPUTC=y +CONFIG_LIB_SENDFILE_BUFSIZE=512 +# CONFIG_ARCH_ROMGETC is not set +# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set + +# +# Basic CXX Support +# +# CONFIG_HAVE_CXX is not set + +# +# Application Configuration +# + +# +# Named Applications +# +# CONFIG_NAMEDAPP is not set + +# +# Examples +# +# CONFIG_EXAMPLES_BUTTONS is not set +# CONFIG_EXAMPLES_CAN is not set +# CONFIG_EXAMPLES_CDCACM is not set +# CONFIG_EXAMPLES_COMPOSITE is not set +# CONFIG_EXAMPLES_DHCPD is not set +# CONFIG_EXAMPLES_ELF is not set +# CONFIG_EXAMPLES_FTPC is not set +# CONFIG_EXAMPLES_FTPD is not set +# CONFIG_EXAMPLES_HELLO is not set +# CONFIG_EXAMPLES_HELLOXX is not set +# CONFIG_EXAMPLES_JSON is not set +# CONFIG_EXAMPLES_HIDKBD is not set +# CONFIG_EXAMPLES_IGMP is not set +# CONFIG_EXAMPLES_LCDRW is not set +# CONFIG_EXAMPLES_MM is not set +# CONFIG_EXAMPLES_MOUNT is not set +# CONFIG_EXAMPLES_MODBUS is not set +# CONFIG_EXAMPLES_NETTEST is not set +# CONFIG_EXAMPLES_NSH is not set +# CONFIG_EXAMPLES_NULL is not set +# CONFIG_EXAMPLES_NX is not set +# CONFIG_EXAMPLES_NXCONSOLE is not set +# CONFIG_EXAMPLES_NXFFS is not set +# CONFIG_EXAMPLES_NXFLAT is not set +# CONFIG_EXAMPLES_NXHELLO is not set +# CONFIG_EXAMPLES_NXIMAGE is not set +# CONFIG_EXAMPLES_NXLINES is not set +# CONFIG_EXAMPLES_NXTEXT is not set +CONFIG_EXAMPLES_OSTEST=y +# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set +CONFIG_EXAMPLES_OSTEST_LOOPS=1 +CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 +CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 +CONFIG_EXAMPLES_OSTEST_RR_RANGE=10000 +CONFIG_EXAMPLES_OSTEST_RR_RUNS=10 +# CONFIG_EXAMPLES_PASHELLO is not set +# CONFIG_EXAMPLES_PIPE is not set +# CONFIG_EXAMPLES_POLL is not set +# CONFIG_EXAMPLES_QENCODER is not set +# CONFIG_EXAMPLES_RGMP is not set +# CONFIG_EXAMPLES_ROMFS is not set +# CONFIG_EXAMPLES_SENDMAIL is not set +# CONFIG_EXAMPLES_SERLOOP is not set +# CONFIG_EXAMPLES_TELNETD is not set +# CONFIG_EXAMPLES_THTTPD is not set +# CONFIG_EXAMPLES_TIFF is not set +# CONFIG_EXAMPLES_TOUCHSCREEN is not set +# CONFIG_EXAMPLES_UDP is not set +# CONFIG_EXAMPLES_UIP is not set +# CONFIG_EXAMPLES_USBSERIAL is not set +# CONFIG_EXAMPLES_USBMSC is not set +# CONFIG_EXAMPLES_USBTERM is not set +# CONFIG_EXAMPLES_WATCHDOG is not set +# CONFIG_EXAMPLES_WLAN is not set + +# +# Interpreters +# + +# +# Interpreters +# +# CONFIG_FICL is not set +# CONFIG_PCODE is not set + +# +# Network Utilities +# + +# +# Networking Utilities +# +# CONFIG_NETUTILS_CODECS is not set +# CONFIG_NETUTILS_DHCPC is not set +# CONFIG_NETUTILS_DHCPD is not set +# CONFIG_NETUTILS_FTPC is not set +# CONFIG_NETUTILS_FTPD is not set +# CONFIG_NETUTILS_JSON is not set +# CONFIG_NETUTILS_RESOLV is not set +# CONFIG_NETUTILS_SMTP is not set +# CONFIG_NETUTILS_TELNETD is not set +# CONFIG_NETUTILS_TFTPC is not set +# CONFIG_NETUTILS_THTTPD is not set +# CONFIG_NETUTILS_UIPLIB is not set +# CONFIG_NETUTILS_WEBCLIENT is not set + +# +# ModBus +# + +# +# FreeModbus +# +# CONFIG_MODBUS is not set + +# +# NSH Library +# +# CONFIG_NSH_LIBRARY is not set + +# +# NxWidgets/NxWM +# + +# +# System NSH Add-Ons +# + +# +# Custom Free Memory Command +# +# CONFIG_SYSTEM_FREE is not set + +# +# I2C tool +# + +# +# FLASH Program Installation +# +# CONFIG_SYSTEM_INSTALL is not set + +# +# readline() +# +# CONFIG_SYSTEM_READLINE is not set + +# +# Power Off +# +# CONFIG_SYSTEM_POWEROFF is not set + +# +# RAMTRON +# +# CONFIG_SYSTEM_RAMTRON is not set + +# +# SD Card +# +# CONFIG_SYSTEM_SDCARD is not set + +# +# Sysinfo +# +# CONFIG_SYSTEM_SYSINFO is not set diff --git a/nuttx/configs/stm32f4discovery/winbuild/setenv.bat b/nuttx/configs/stm32f4discovery/winbuild/setenv.bat new file mode 100755 index 0000000000..e2196a90a0 --- /dev/null +++ b/nuttx/configs/stm32f4discovery/winbuild/setenv.bat @@ -0,0 +1,48 @@ +rem configs/stm32f4discovery/winbuild/setenv.sh
+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 CodeSourcey toolchain. See
+rem http://www.mentor.com/embedded-software/codesourcery
+
+set PATH=C:\Program Files (x86)\CodeSourcery\Sourcery G++ Lite\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%
diff --git a/nuttx/configs/z16f2800100zcog/ostest/Make.defs b/nuttx/configs/z16f2800100zcog/ostest/Make.defs index 8440224cab..7f86dd29fa 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/Make.defs +++ b/nuttx/configs/z16f2800100zcog/ostest/Make.defs @@ -146,10 +146,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lst diff --git a/nuttx/configs/z16f2800100zcog/pashello/Make.defs b/nuttx/configs/z16f2800100zcog/pashello/Make.defs index 1c3e277ad9..92a67fa652 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/Make.defs +++ b/nuttx/configs/z16f2800100zcog/pashello/Make.defs @@ -146,10 +146,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lst diff --git a/nuttx/configs/z8encore000zco/ostest/Make.defs b/nuttx/configs/z8encore000zco/ostest/Make.defs index cf310e0ff4..23185e2dd0 100644 --- a/nuttx/configs/z8encore000zco/ostest/Make.defs +++ b/nuttx/configs/z8encore000zco/ostest/Make.defs @@ -172,10 +172,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lst diff --git a/nuttx/configs/z8f64200100kit/ostest/Make.defs b/nuttx/configs/z8f64200100kit/ostest/Make.defs index 894df0855f..1ee00c72c0 100644 --- a/nuttx/configs/z8f64200100kit/ostest/Make.defs +++ b/nuttx/configs/z8f64200100kit/ostest/Make.defs @@ -172,10 +172,19 @@ define ASSEMBLE @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; } + echo "AR: $2"; + $(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 ; } \ + done +endef +endif define CLEAN @rm -f *.obj *.src *.lib *.hex *.lst diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile index 53e9cb12c6..a57285505c 100644 --- a/nuttx/drivers/Makefile +++ b/nuttx/drivers/Makefile @@ -105,16 +105,16 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend clean: - @rm -f $(BIN) *~ .*.swp + $(Q) rm -f $(BIN) *~ .*.swp $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/fs/Makefile b/nuttx/fs/Makefile index cb530cbec3..643b322bb8 100644 --- a/nuttx/fs/Makefile +++ b/nuttx/fs/Makefile @@ -123,20 +123,20 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) --dep-path . $(MMAPDEPPATH) $(FATDEPPATH) $(ROMFSDEPPATH) $(NXFFSDEPPATH) $(NFSDEPPATH) \ + $(Q) $(MKDEP) --dep-path . $(MMAPDEPPATH) $(FATDEPPATH) $(ROMFSDEPPATH) $(NXFFSDEPPATH) $(NFSDEPPATH) \ $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) touch $@ depend: .depend clean: - @rm -f $(BIN) *~ .*.swp + $(Q) rm -f $(BIN) *~ .*.swp $(call CLEAN) - @( for dir in $(SUBDIRS); do \ + $(Q) ( for dir in $(SUBDIRS); do \ rm -f $${dir}/*~ $${dir}/.*.swp; \ done ; ) distclean: clean - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile index 27edbb411b..f3a768113a 100644 --- a/nuttx/graphics/Makefile +++ b/nuttx/graphics/Makefile @@ -97,84 +97,84 @@ all: mklibgraphics gen32bppsources genfontsources gen1bppsources: - @$(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=1 EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=1 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=1 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=1 EXTRADEFINES=$(EXTRADEFINES) gen2bppsource: - @$(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=2 EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=2 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=2 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=2 EXTRADEFINES=$(EXTRADEFINES) gen4bppsource: - @$(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=4 EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=4 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=4 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=4 EXTRADEFINES=$(EXTRADEFINES) gen8bppsource: - @$(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=8 EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=8 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=8 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=8 EXTRADEFINES=$(EXTRADEFINES) gen16bppsource: - @$(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=16 EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=16 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=16 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=16 EXTRADEFINES=$(EXTRADEFINES) gen24bppsource: - @$(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=24 EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=24 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=24 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=24 EXTRADEFINES=$(EXTRADEFINES) gen32bppsources: - @$(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES) genfontsources: ifeq ($(CONFIG_NXFONT_SANS23X27),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS22X29),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS28X37),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS39X48),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS17X23B),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=16 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=16 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS20X27B),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=17 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=17 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS22X29B),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS28X37B),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS40X49B),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SERIF22X29),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SERIF29X37),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SERIF38X48),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SERIF22X28B),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SERIF27X38B),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SERIF38X49B),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=13 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=13 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS17X22),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=14 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=14 EXTRADEFINES=$(EXTRADEFINES) endif ifeq ($(CONFIG_NXFONT_SANS20X26),y) - @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=15 EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=15 EXTRADEFINES=$(EXTRADEFINES) endif gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources @@ -191,23 +191,23 @@ $(BIN): $(OBJS) mklibgraphics: gensources $(BIN) .depend: gensources Makefile $(SRCS) - @$(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend context: gensources clean: - @$(MAKE) -C nxglib -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) - @rm -f $(BIN) *~ .*.swp + $(Q) $(MAKE) -C nxglib -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) + $(Q) rm -f $(BIN) *~ .*.swp $(call CLEAN) distclean: clean - @$(MAKE) -C nxglib -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) - @$(MAKE) -C nxfonts -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) - @rm -f Make.dep .depend + $(Q) $(MAKE) -C nxglib -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile index d4e24124a0..dca8ea035a 100644 --- a/nuttx/lib/Makefile +++ b/nuttx/lib/Makefile @@ -40,6 +40,6 @@ all: depend: clean: - @rm -f *$(LIBEXT) + $(Q) rm -f *$(LIBEXT) distclean: clean diff --git a/nuttx/libc/Makefile b/nuttx/libc/Makefile index 9449915552..0e11c9bad2 100644 --- a/nuttx/libc/Makefile +++ b/nuttx/libc/Makefile @@ -83,23 +83,23 @@ $(BIN): $(OBJS) ifneq ($(BIN),$(UBIN)) .userlib: - @$(MAKE) $(UBIN) BIN=$(UBIN) TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) - @touch .userlib + $(Q) $(MAKE) $(UBIN) BIN=$(UBIN) TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) + $(Q) touch .userlib $(UBIN): kclean .userlib endif ifneq ($(BIN),$(KBIN)) .kernlib: - @$(MAKE) $(KBIN) BIN=$(KBIN) TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) - @touch .kernlib + $(Q) $(MAKE) $(KBIN) BIN=$(KBIN) TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES) + $(Q) touch .kernlib $(KBIN): uclean .kernlib endif .depend: Makefile $(SRCS) - @$(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend @@ -108,27 +108,27 @@ depend: .depend uclean: ifneq ($(OBJEXT),) - @( if [ -f .userlib ]; then rm -f *$(OBJEXT); fi ) + $(Q) ( if [ -f .userlib ]; then rm -f *$(OBJEXT); fi ) endif - @rm -f .userlib *~ .*.swp + $(Q) rm -f .userlib *~ .*.swp # Clean kernel-mode temporary files (retaining the KBIN binary) kclean: ifneq ($(OBJEXT),) - @( if [ -f .kernlib ]; then rm -f *$(OBJEXT); fi ) + $(Q) ( if [ -f .kernlib ]; then rm -f *$(OBJEXT); fi ) endif - @rm -f .kernlib *~ .*.swp + $(Q) rm -f .kernlib *~ .*.swp # Really clean everything clean: uclean kclean - @rm -f $(BIN) $(UBIN) $(KBIN) *~ .*.swp + $(Q) rm -f $(BIN) $(UBIN) $(KBIN) *~ .*.swp $(call CLEAN) # Deep clean -- removes all traces of the configuration distclean: clean - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/libxx/Makefile b/nuttx/libxx/Makefile index a69527c28e..bdbc5da872 100644 --- a/nuttx/libxx/Makefile +++ b/nuttx/libxx/Makefile @@ -99,16 +99,16 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(DEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(DEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend clean: - @rm -f $(BIN) *~ .*.swp + $(Q) rm -f $(BIN) *~ .*.swp $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile index d0c5048b42..b48d242ffd 100644 --- a/nuttx/mm/Makefile +++ b/nuttx/mm/Makefile @@ -37,8 +37,8 @@ ASRCS = CSRCS = mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c mm_shrinkchunk.c \ - mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c \ - mm_memalign.c mm_free.c mm_mallinfo.c + mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c \ + mm_memalign.c mm_free.c mm_mallinfo.c ifeq ($(CONFIG_GRAN),y) CSRCS += mm_graninit.c mm_granalloc.c mm_granfree.c mm_grancritical.c @@ -64,16 +64,16 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend clean: - @rm -f $(BIN) *~ .*.swp + $(Q) rm -f $(BIN) *~ .*.swp $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/net/Makefile b/nuttx/net/Makefile index 42759e643e..2a43914901 100644 --- a/nuttx/net/Makefile +++ b/nuttx/net/Makefile @@ -104,18 +104,18 @@ $(BIN): $(OBJS) .depend: Makefile $(SRCS) ifeq ($(CONFIG_NET),y) - @$(MKDEP) --dep-path . --dep-path uip $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) --dep-path . --dep-path uip $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep endif - @touch $@ + $(Q) touch $@ depend: .depend clean: - @rm -f $(BIN) *~ .*.swp - @rm -f uip/*~ uip/.*.swp + $(Q) rm -f $(BIN) *~ .*.swp + $(Q) rm -f uip/*~ uip/.*.swp $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/sched/Makefile b/nuttx/sched/Makefile index cbce639e73..6487c5701f 100644 --- a/nuttx/sched/Makefile +++ b/nuttx/sched/Makefile @@ -199,16 +199,16 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend clean: - @rm -f $(BIN) *~ .*.swp + $(Q) rm -f $(BIN) *~ .*.swp $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/syscall/Makefile b/nuttx/syscall/Makefile index 7d493665ad..e9370a7763 100644 --- a/nuttx/syscall/Makefile +++ b/nuttx/syscall/Makefile @@ -78,32 +78,32 @@ $(BIN2): $(STUB_OBJS) $(call ARCHIVE, $@, "$(STUB_OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(PROXYDEPPATH) $(STUBDEPPATH) \ + $(Q) $(MKDEP) $(ROOTDEPPATH) $(PROXYDEPPATH) $(STUBDEPPATH) \ $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) touch $@ depend: .depend $(MKSYSCALL): - @$(MAKE) -C $(TOPDIR)/tools -f Makefile.host mksyscall + $(Q) $(MAKE) -C $(TOPDIR)/tools -f Makefile.host mksyscall .context: syscall.csv - @(cd proxies; $(MKSYSCALL) -p $(CSVFILE);) - @(cd stubs; $(MKSYSCALL) -s $(CSVFILE);) - @touch $@ + $(Q) (cd proxies; $(MKSYSCALL) -p $(CSVFILE);) + $(Q) (cd stubs; $(MKSYSCALL) -s $(CSVFILE);) + $(Q) touch $@ context: $(MKSYSCALL) .context clean: - @rm -f $(BIN1) $(BIN2) *~ .*.swp + $(Q) rm -f $(BIN1) $(BIN2) *~ .*.swp ifneq ($(OBJEXT),) - @rm -f proxies/*$(OBJEXT) stubs/*$(OBJEXT) + $(Q) rm -f proxies/*$(OBJEXT) stubs/*$(OBJEXT) endif $(call CLEAN) distclean: clean - @rm -f Make.dep .depend .context - @rm -f proxies/*.c stubs/*.c + $(Q) rm -f Make.dep .depend .context + $(Q) rm -f proxies/*.c stubs/*.c -include Make.dep diff --git a/nuttx/tools/Config.mk b/nuttx/tools/Config.mk index 3a82a19377..47131b8007 100644 --- a/nuttx/tools/Config.mk +++ b/nuttx/tools/Config.mk @@ -62,10 +62,18 @@ define ASSEMBLE $(Q) $(CC) -c $(AFLAGS) $1 -o $2 endef +ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2"; \ - $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } + echo "AR: $2" + $(AR) $1 + $(AR) $1 $(subst ",,$(2)) endef +else +define ARCHIVE + echo "AR: $2" + $(AR) $1 $(subst ",,$(2)) || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } +endef +endif define CLEAN $(Q) rm -f *.o *.a diff --git a/nuttx/tools/Makefile.export b/nuttx/tools/Makefile.export index ce4842187a..95a33b7796 100644 --- a/nuttx/tools/Makefile.export +++ b/nuttx/tools/Makefile.export @@ -61,7 +61,7 @@ endif @echo "ARCHCFLAGS=\"$(ARCHCFLAGS) $(ARCHCPUFLAGS)\"" >> $(EXPORTDIR)/makeinfo.sh @echo "ARCHCXXFLAGS=\"$(ARCHCXXFLAGS) $(ARCHCPUFLAGS)\"" >> $(EXPORTDIR)/makeinfo.sh @echo "CROSSDEV=\"$(CROSSDEV)\"" >> $(EXPORTDIR)/makeinfo.sh - @chmod 755 $(EXPORTDIR)/makeinfo.sh + $(Q) chmod 755 $(EXPORTDIR)/makeinfo.sh clean: - @rm -f $(EXPORTDIR)/makeinfo.sh + $(Q) rm -f $(EXPORTDIR)/makeinfo.sh diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host index 33b7aaab2b..66bea9937b 100644 --- a/nuttx/tools/Makefile.host +++ b/nuttx/tools/Makefile.host @@ -44,34 +44,34 @@ CFLAGS = -O2 -Wall -I. # mkconfig - Convert a .config file into a C config.h file mkconfig: mkconfig.c cfgparser.c - @gcc $(CFLAGS) -o mkconfig mkconfig.c cfgparser.c + $(Q) gcc $(CFLAGS) -o mkconfig mkconfig.c cfgparser.c # cmpconfig - Compare the contents of two configuration files cmpconfig: cmpconfig.c - @gcc $(CFLAGS) -o cmpconfig cmpconfig.c + $(Q) gcc $(CFLAGS) -o cmpconfig cmpconfig.c # mkversion - Convert a .version file into a C version.h file mkversion: mkconfig.c cfgparser.c - @gcc $(CFLAGS) -o mkversion mkversion.c cfgparser.c + $(Q) gcc $(CFLAGS) -o mkversion mkversion.c cfgparser.c # mksyscall - Convert a CSV file into syscall stubs and proxies mksyscall: mksyscall.c csvparser.c - @gcc $(CFLAGS) -o mksyscall mksyscall.c csvparser.c + $(Q) gcc $(CFLAGS) -o mksyscall mksyscall.c csvparser.c # mksymtab - Convert a CSV file into a symbol table mksymtab: mksymtab.c csvparser.c - @gcc $(CFLAGS) -o mksymtab mksymtab.c csvparser.c + $(Q) gcc $(CFLAGS) -o mksymtab mksymtab.c csvparser.c # bdf-converter - Converts a BDF font to the NuttX font format bdf-converter: bdf-converter.c - @gcc $(CFLAGS) -o bdf-converter bdf-converter.c + $(Q) gcc $(CFLAGS) -o bdf-converter bdf-converter.c clean: - @rm -f *.o *.a *~ .*.swp - @rm -f mkconfig mksyscall mkversion bdf-converter - @rm -f mkconfig.exe mksyscall.exe mkversion.exe bdf-converter.exe + $(Q) rm -f *.o *.a *~ .*.swp + $(Q) rm -f mkconfig mksyscall mkversion bdf-converter + $(Q) rm -f mkconfig.exe mksyscall.exe mkversion.exe bdf-converter.exe |