diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-28 18:06:51 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-28 18:06:51 +0000 |
| commit | 46f39c4adab2144ee3e7f11a02f0d2253b656668 (patch) | |
| tree | 75bd179581f5c8a8b532dcc83658105e3a180993 | |
| parent | 09e1aa6ffa05eedcdb4e9f71d7a08f9139311fb6 (diff) | |
| download | px4-nuttx-46f39c4adab2144ee3e7f11a02f0d2253b656668.tar.gz px4-nuttx-46f39c4adab2144ee3e7f11a02f0d2253b656668.tar.bz2 px4-nuttx-46f39c4adab2144ee3e7f11a02f0d2253b656668.zip | |
Replace CONFIG_EXAMPLE with CONFIG_APP_DIR
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2893 42af7a65-404d-4744-a932-0658087f49c3
109 files changed, 431 insertions, 342 deletions
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index e0947657b..0df789699 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -12,7 +12,7 @@ <h1><big><font color="#3c34ec"> <i>NuttX RTOS Porting Guide</i> </font></big></h1> - <p>Last Updated: August 21, 2010</p> + <p>Last Updated: August 27, 2010</p> </td> </tr> </table> @@ -2211,8 +2211,55 @@ extern void up_ledoff(int led); <ul> <li> - <code>CONFIG_EXAMPLE</code>: identifies the subdirectory in examples - that will be used in the build. + <p> + <code>CONFIG_APP_DIR</code>: Ldentifies the directory that builds the application to link with NuttX. + This symbol must be assigned to the path to the application build directory <i>relative</i> to the NuttX top build direcory. + As an an example, there are several example applicatins in the NuttX <code>examples/</code> sub-directory. + To use one of these example applications, say <code>nsh</code>, you would set <code>CONFIG_APP_DIR=examples/nsh</code>. + If you had an application directory and the NuttX directory both within another directory like this: +<ul><pre> +build + |-nuttx + | | + | `- Makefile + `-application + | + `- Makefile +</pre></ul> + Then you would set <code>CONFIG_APP_DIR=../application</code>. + </p> + <p> + The application direction must contain <code>Makefile</code> and this make file must support the following targets: + <ul> + <li> + <code>libapp$(LIBEXT)</code> (usually <code>libapp.a</code>). + <code>libapp.a</code> is a static library ( an archive) that contains all of application object files. + </li> + <li> + <code>clean</code>. + Do whatever is appropriate to clean the application directories for a fresh build. + </li> + <li> + <code>distclean</code>. + Clean everthing -- auto-generated files, symbolic links etc. -- so that the directory contents are the same as the contents in your configuration management system. + This is only done when you change the NuttX configuration. + </li> + <li> + <code>depend</code>. + Make or update the application build dependencies. + </li> + </ul> + </p> + <p> + When this application is invoked it will receive the setting <code>TOPDIR</code> like: + <ul> + <code>$(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)"</code> <target> + </ul> + </p> + <p> + <code>TOPDIR</code> is the full path to the NuttX directory. + It can be used, for example, to include makefile fragments (e.g., <code>.config</code> or <code>Make.defs</code>) or to set up include file paths. + </p> </li> <li> <code>CONFIG_DEBUG</code>: enables built-in debug options @@ -2925,7 +2972,7 @@ extern void up_ledoff(int led); </li> <li> <code>CONFIG_THTTPD_URLPATTERN</code>: If defined, then it will be used to match - and verify referrers. + and verify referrers. </li> </ul> diff --git a/nuttx/Makefile b/nuttx/Makefile index ddd9e1edf..90bd2f202 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -69,7 +69,7 @@ ADDON_DIRS := $(PCODE_DIR) $(NX_DIR) # (except for parts of FSDIRS). We will exclude FSDIRS # from the build if file descriptor support is disabled -NONFSDIRS = sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE) $(ADDON_DIRS) +NONFSDIRS = sched lib $(ARCH_SRC) mm $(CONFIG_APP_DIR) $(ADDON_DIRS) FSDIRS = fs drivers binfmt CONTEXTDIRS = @@ -113,7 +113,7 @@ endif # is disabled. LINKLIBS = sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \ - lib/liblib$(LIBEXT) examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT) + lib/liblib$(LIBEXT) $(CONFIG_APP_DIR)/libapp$(LIBEXT) # Add libraries for network support. CXX, CXXFLAGS, and COMPILEXX must # be defined in Make.defs for this to work! @@ -253,8 +253,8 @@ pcode/libpcode$(LIBEXT): context graphics/libgraphics$(LIBEXT): context @$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) -examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT): context - @$(MAKE) -C examples/$(CONFIG_EXAMPLE) TOPDIR="$(TOPDIR)" lib$(CONFIG_EXAMPLE)$(LIBEXT) +$(CONFIG_APP_DIR)/libapp$(LIBEXT): context + @$(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)" libapp$(LIBEXT) pass1: ifeq ($(CONFIG_BUILD_2PASS),y) diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 6484a1e19..c1b73b310 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -159,8 +159,48 @@ defconfig -- This is a configuration file similar to the Linux General OS setup - CONFIG_EXAMPLE - identifies the subdirectory in examples - that will be used in the build + CONFIG_APP_DIR - Identifies the directory that builds the + application to link with NuttX. This symbol must be assigned + to the path to the application build directory *relative* to + the NuttX top build direcory. As an an example, there are + several example applicatins in the NuttX examples/ sub-directory. + To use one of these example applications, say nsh, you would + set CONFIG_APP_DIR=examples/nsh. If you had an application + directory and the NuttX directory both within another directory + like this: + + build + |-nuttx + | | + | `- Makefile + `-application + | + `- Makefile + + Then you would set CONFIG_APP_DIR=../application. + + The application direction must contain Makefile and this make + file must support the following targets: + + - libapp$(LIBEXT) (usually libapp.a). libapp.a is a static + library ( an archive) that contains all of application object + files. + - clean. Do whatever is appropriate to clean the application + directories for a fresh build. + - distclean. Clean everthing -- auto-generated files, symbolic + links etc. -- so that the directory contents are the same as + the contents in your configuration management system. + This is only done when you change the NuttX configuration. + - depend. Make or update the application build dependencies. + + When this application is invoked it will receive the setting TOPDIR< like: + + $(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)" <target> + + TOPDIR is the full path to the NuttX directory. It can be used, for + example, to include makefile fragments (e.g., .config or Make.defs) + or to set up include file paths. + CONFIG_DEBUG - enables built-in debug options CONFIG_DEBUG_VERBOSE - enables verbose debug output CONFIG_DEBUG_SYMBOLS - build without optimization and with diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig index 6078b238f..b2d8eb161 100644 --- a/nuttx/configs/c5471evm/defconfig +++ b/nuttx/configs/c5471evm/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/c5471evm/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -200,7 +200,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/c5471evm/dhcpconfig b/nuttx/configs/c5471evm/dhcpconfig index 517fb82e9..f57cc2e3e 100644 --- a/nuttx/configs/c5471evm/dhcpconfig +++ b/nuttx/configs/c5471evm/dhcpconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/c5471evm/dhcpconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -200,7 +200,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=uip +CONFIG_APP_DIR=examples/uip CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/c5471evm/netconfig b/nuttx/configs/c5471evm/netconfig index dacc7d8b8..a96f8fc7e 100644 --- a/nuttx/configs/c5471evm/netconfig +++ b/nuttx/configs/c5471evm/netconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/c5471evm/netconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -135,8 +135,8 @@ CONFIG_NET_C5471_BASET10=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -200,7 +200,7 @@ CONFIG_NET_C5471_BASET10=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nettest +CONFIG_APP_DIR=examples/nettest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/c5471evm/nshconfig b/nuttx/configs/c5471evm/nshconfig index 6bce684ab..e2a924da6 100644 --- a/nuttx/configs/c5471evm/nshconfig +++ b/nuttx/configs/c5471evm/nshconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/c5471evm/nshconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -200,7 +200,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig index 9366f5321..630187b06 100755 --- a/nuttx/configs/demo9s12ne64/ostest/defconfig +++ b/nuttx/configs/demo9s12ne64/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/demo9s12ne64/ostest/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -183,8 +183,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -272,7 +272,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig index 92b6c2b36..0d2774c21 100755 --- a/nuttx/configs/ea3131/nsh/defconfig +++ b/nuttx/configs/ea3131/nsh/defconfig @@ -201,8 +201,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -290,7 +290,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig index f329b8277..922482d4c 100755 --- a/nuttx/configs/ea3131/ostest/defconfig +++ b/nuttx/configs/ea3131/ostest/defconfig @@ -201,8 +201,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -290,7 +290,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig index 756e92e88..db542a647 100755 --- a/nuttx/configs/ea3131/pgnsh/defconfig +++ b/nuttx/configs/ea3131/pgnsh/defconfig @@ -208,8 +208,8 @@ CONFIG_PASS1_LIB=locked.r # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -297,7 +297,7 @@ CONFIG_PASS1_LIB=locked.r # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ea3131/src/Makefile b/nuttx/configs/ea3131/src/Makefile index 07443cc87..44b1698f6 100755 --- a/nuttx/configs/ea3131/src/Makefile +++ b/nuttx/configs/ea3131/src/Makefile @@ -47,7 +47,7 @@ endif ifeq ($(CONFIG_PAGING),y) CSRCS += up_fillpage.c endif -ifeq ($(CONFIG_EXAMPLE),usbstorage) +ifeq ($(CONFIG_APP_DIR),examples/usbstorage) CSRCS += up_usbstrg.c endif COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig index 6ef507ba7..b7b652cf5 100755 --- a/nuttx/configs/ea3131/usbserial/defconfig +++ b/nuttx/configs/ea3131/usbserial/defconfig @@ -201,8 +201,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -290,7 +290,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=usbserial +CONFIG_APP_DIR=examples/usbserial CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_FS=n diff --git a/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig index 7474122a4..40e82d1e8 100755 --- a/nuttx/configs/ea3131/usbstorage/defconfig +++ b/nuttx/configs/ea3131/usbstorage/defconfig @@ -201,8 +201,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -290,7 +290,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=usbstorage +CONFIG_APP_DIR=examples/usbstorage CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_FS=n diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig index c7b8d7544..7d311cf0c 100644 --- a/nuttx/configs/eagle100/httpd/defconfig +++ b/nuttx/configs/eagle100/httpd/defconfig @@ -204,8 +204,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -269,7 +269,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=uip +CONFIG_APP_DIR=examples/uip CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig index 7dc147618..8f732462d 100644 --- a/nuttx/configs/eagle100/nettest/defconfig +++ b/nuttx/configs/eagle100/nettest/defconfig @@ -204,8 +204,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -269,7 +269,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nettest +CONFIG_APP_DIR=examples/nettest CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig index 4e4b462ee..a0ff72a87 100644 --- a/nuttx/configs/eagle100/nsh/defconfig +++ b/nuttx/configs/eagle100/nsh/defconfig @@ -204,8 +204,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -269,7 +269,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig index d18eedd5c..cf880e40e 100644 --- a/nuttx/configs/eagle100/nxflat/defconfig +++ b/nuttx/configs/eagle100/nxflat/defconfig @@ -204,8 +204,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -266,7 +266,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nxflat +CONFIG_APP_DIR=examples/nxflat CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig index 9f3b479ba..82d44a4fa 100644 --- a/nuttx/configs/eagle100/ostest/defconfig +++ b/nuttx/configs/eagle100/ostest/defconfig @@ -204,8 +204,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -275,7 +275,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig index 6f381e922..81f29fdb6 100644 --- a/nuttx/configs/eagle100/thttpd/defconfig +++ b/nuttx/configs/eagle100/thttpd/defconfig @@ -204,8 +204,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -272,7 +272,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=thttpd +CONFIG_APP_DIR=examples/thttpd CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig index 8509d2f33..ee3ee1c9b 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/defconfig +++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200kitg/ostest/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -167,8 +167,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -234,7 +234,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig index fac51a618..b15977b62 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig +++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/dhcpd/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_NET - enables debug of the network subsystem @@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=dhcpd +CONFIG_APP_DIR=examples/dhcpd CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig index ad045d0a2..27840eecb 100644 --- a/nuttx/configs/ez80f910200zco/httpd/defconfig +++ b/nuttx/configs/ez80f910200zco/httpd/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/httpd/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_NET - enables debug of the network subsystem @@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=uip +CONFIG_APP_DIR=examples/uip CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig index 9f73102b6..6679e9375 100644 --- a/nuttx/configs/ez80f910200zco/nettest/defconfig +++ b/nuttx/configs/ez80f910200zco/nettest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/nettest/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_NET - enables debug of the network subsystem @@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nettest +CONFIG_APP_DIR=examples/nettest CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig index 4606e71ab..91bc884b8 100644 --- a/nuttx/configs/ez80f910200zco/nsh/defconfig +++ b/nuttx/configs/ez80f910200zco/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/nsh/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_NET - enables debug of the network subsystem @@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig index 0b5183715..11f079c19 100644 --- a/nuttx/configs/ez80f910200zco/ostest/defconfig +++ b/nuttx/configs/ez80f910200zco/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/ostest/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -170,8 +170,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -237,7 +237,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig index 4b06b3f75..899d976b2 100644 --- a/nuttx/configs/ez80f910200zco/poll/defconfig +++ b/nuttx/configs/ez80f910200zco/poll/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/poll/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -239,7 +239,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=poll +CONFIG_APP_DIR=examples/poll CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig index 66c0fbed6..412eae239 100755 --- a/nuttx/configs/lm3s6965-ek/nsh/defconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig @@ -218,8 +218,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -289,7 +289,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index 9efda7b07..4fa93a886 100755 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -218,8 +218,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -289,7 +289,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nx +CONFIG_APP_DIR=examples/nx CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig index e1f85c3d0..bd2a3da7b 100755 --- a/nuttx/configs/lm3s6965-ek/ostest/defconfig +++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig @@ -218,8 +218,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -289,7 +289,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig index b742c4c02..208d2d49b 100644 --- a/nuttx/configs/m68332evb/defconfig +++ b/nuttx/configs/m68332evb/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/m68332evb/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -106,8 +106,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -168,7 +168,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig index 3125e535d..1d77d5c41 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig +++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/mcu123-lpc214x/nsh/defconfig # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -204,7 +204,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig index 58540313f..b3ce31e81 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig +++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/mcu123-lpc214x/ostest/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -204,7 +204,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/mcu123-lpc214x/src/Makefile b/nuttx/configs/mcu123-lpc214x/src/Makefile index aad225d08..431d85fc0 100644 --- a/nuttx/configs/mcu123-lpc214x/src/Makefile +++ b/nuttx/configs/mcu123-lpc214x/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # configs/mcu123-lpc214x/src/Makefile # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ CSRCS = up_spi.c up_leds.c ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif -ifeq ($(CONFIG_EXAMPLE),usbstorage) +ifeq ($(CONFIG_APP_DIR),examples/usbstorage) CSRCS += up_usbstrg.c endif diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig index 8eb24b0cc..109fcee6b 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/mcu123-lpc214x/usbserial/defconfig # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -204,7 +204,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=usbserial +CONFIG_APP_DIR=examples/usbserial CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig index 1e7525c0e..39dfe7b88 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/mcu123-lpc214x/usbstorage/defconfig # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -204,7 +204,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=usbstorage +CONFIG_APP_DIR=examples/usbstorage CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig index f3dc4a970..11b3f36cc 100644 --- a/nuttx/configs/mx1ads/ostest/defconfig +++ b/nuttx/configs/mx1ads/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/mx1ads/ostest/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -155,8 +155,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -220,7 +220,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig index 0530270ef..b032b8ea3 100644 --- a/nuttx/configs/ntosd-dm320/nettest/defconfig +++ b/nuttx/configs/ntosd-dm320/nettest/defconfig @@ -144,8 +144,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -209,7 +209,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nettest +CONFIG_APP_DIR=examples/nettest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig index 88797543a..8468d70cd 100644 --- a/nuttx/configs/ntosd-dm320/nsh/defconfig +++ b/nuttx/configs/ntosd-dm320/nsh/defconfig @@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -208,7 +208,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig index d6d26eb65..9c653ddb7 100644 --- a/nuttx/configs/ntosd-dm320/ostest/defconfig +++ b/nuttx/configs/ntosd-dm320/ostest/defconfig @@ -144,8 +144,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -209,7 +209,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig index d32a9d853..1d4b23e1f 100644 --- a/nuttx/configs/ntosd-dm320/poll/defconfig +++ b/nuttx/configs/ntosd-dm320/poll/defconfig @@ -144,8 +144,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -209,7 +209,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=poll +CONFIG_APP_DIR=examples/poll CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig index 9a2931cb7..a970b11eb 100644 --- a/nuttx/configs/ntosd-dm320/thttpd/defconfig +++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig @@ -148,8 +148,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -216,7 +216,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=thttpd +CONFIG_APP_DIR=examples/thttpd CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig index bf19c0811..5cab3bb1d 100644 --- a/nuttx/configs/ntosd-dm320/udp/defconfig +++ b/nuttx/configs/ntosd-dm320/udp/defconfig @@ -144,8 +144,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -209,7 +209,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=udp +CONFIG_APP_DIR=examples/udp CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig index 0e9d1381c..1125c2d16 100644 --- a/nuttx/configs/ntosd-dm320/uip/defconfig +++ b/nuttx/configs/ntosd-dm320/uip/defconfig @@ -144,8 +144,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -209,7 +209,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=uip +CONFIG_APP_DIR=examples/uip CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig index 994017d18..06b9a84c0 100755 --- a/nuttx/configs/nucleus2g/nsh/defconfig +++ b/nuttx/configs/nucleus2g/nsh/defconfig @@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -295,7 +295,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig index 6d75dfc87..ab7740c38 100755 --- a/nuttx/configs/nucleus2g/ostest/defconfig +++ b/nuttx/configs/nucleus2g/ostest/defconfig @@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -295,7 +295,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/nucleus2g/src/Makefile b/nuttx/configs/nucleus2g/src/Makefile index de5a3c76c..c54ba8a0a 100755 --- a/nuttx/configs/nucleus2g/src/Makefile +++ b/nuttx/configs/nucleus2g/src/Makefile @@ -42,7 +42,7 @@ CSRCS = up_boot.c up_leds.c up_ssp.c ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif -ifeq ($(CONFIG_EXAMPLE),usbstorage) +ifeq ($(CONFIG_APP_DIR),examples/usbstorage) CSRCS += up_usbstrg.c endif diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig index 506d719ba..93ef69bfc 100755 --- a/nuttx/configs/nucleus2g/usbserial/defconfig +++ b/nuttx/configs/nucleus2g/usbserial/defconfig @@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -295,7 +295,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=usbserial +CONFIG_APP_DIR=examples/usbserial CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig index 3f07556b2..2e1aa8322 100755 --- a/nuttx/configs/nucleus2g/usbstorage/defconfig +++ b/nuttx/configs/nucleus2g/usbstorage/defconfig @@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -295,7 +295,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=usbstorage +CONFIG_APP_DIR=examples/usbstorage CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/olimex-lpc2378/nsh/defconfig b/nuttx/configs/olimex-lpc2378/nsh/defconfig index d0a5f15c3..dc960eddf 100755 --- a/nuttx/configs/olimex-lpc2378/nsh/defconfig +++ b/nuttx/configs/olimex-lpc2378/nsh/defconfig @@ -162,8 +162,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_MM_REGIONS - If the architecture includes multiple @@ -193,7 +193,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console # driver (minimal support) # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n #CONFIG_DEBUG_MM=y diff --git a/nuttx/configs/olimex-lpc2378/ostest/defconfig b/nuttx/configs/olimex-lpc2378/ostest/defconfig index 1315af2e7..7dd1af602 100755 --- a/nuttx/configs/olimex-lpc2378/ostest/defconfig +++ b/nuttx/configs/olimex-lpc2378/ostest/defconfig @@ -162,8 +162,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_MM_REGIONS - If the architecture includes multiple @@ -193,7 +193,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_DEV_LOWCONSOLE - Use the simple, low-level serial console # driver (minimal support) # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n #CONFIG_DEBUG_MM=y diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig index 89a638d3e..a91ad272c 100755 --- a/nuttx/configs/olimex-strp711/nettest/defconfig +++ b/nuttx/configs/olimex-strp711/nettest/defconfig @@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -289,7 +289,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=nettest +CONFIG_APP_DIR=examples/nettest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig index 7e5378ca7..ab4d26a5c 100644 --- a/nuttx/configs/olimex-strp711/nsh/defconfig +++ b/nuttx/configs/olimex-strp711/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/olimes-strp711/nsh/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -271,7 +271,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig index 304bc7425..2aa5fd825 100644 --- a/nuttx/configs/olimex-strp711/ostest/defconfig +++ b/nuttx/configs/olimex-strp711/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/olimes-strp711/ostest/defconfig # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -271,7 +271,7 @@ CONFIG_HAVE_LIBM=n # This format will support execution of NuttX binaries located # in a ROMFS filesystem (see examples/nxflat). # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig index b8f3c4879..878daddb4 100644 --- a/nuttx/configs/pjrc-8051/defconfig +++ b/nuttx/configs/pjrc-8051/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/pjrc-8051/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -103,8 +103,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -165,7 +165,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index ec41ea06f..25854b145 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -292,7 +292,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index bc94309ec..16b0a79c3 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -292,7 +292,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=nx +CONFIG_APP_DIR=examples/nx CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index 9ee92ecf1..54706dcbd 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -204,8 +204,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -293,7 +293,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sam3u-ek/src/Makefile b/nuttx/configs/sam3u-ek/src/Makefile index edcb0ffa1..c80b99c8f 100755 --- a/nuttx/configs/sam3u-ek/src/Makefile +++ b/nuttx/configs/sam3u-ek/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # configs/sam3u-ek/src/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ endif ifeq ($(CONFIG_SAM3U_HSMCI),y) CSRCS += up_mmcsd.c endif -ifeq ($(CONFIG_EXAMPLE),usbstorage) +ifeq ($(CONFIG_APP_DIR),examples/usbstorage) CSRCS += up_usbstrg.c endif COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig index 0f4cd9185..606d69c59 100644 --- a/nuttx/configs/sim/mount/defconfig +++ b/nuttx/configs/sim/mount/defconfig @@ -1,7 +1,7 @@ ############################################################################ # sim/mount/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=mount +CONFIG_APP_DIR=examples/mount CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig index fde3940b7..d2c10377f 100644 --- a/nuttx/configs/sim/nettest/defconfig +++ b/nuttx/configs/sim/nettest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/nettest/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nettest +CONFIG_APP_DIR=examples/nettest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig index 4089f0ad5..1cda58d48 100644 --- a/nuttx/configs/sim/nsh/defconfig +++ b/nuttx/configs/sim/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # sim/nsh/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index 1b33eb482..cebea94dd 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/configs/sim/nx/defconfig @@ -1,7 +1,7 @@ ############################################################################ # sim/nx/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -59,8 +59,8 @@ CONFIG_SIM_FBBPP=8 # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -121,7 +121,7 @@ CONFIG_SIM_FBBPP=8 # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nx +CONFIG_APP_DIR=examples/nx CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sim/nx/defconfig-x11 b/nuttx/configs/sim/nx/defconfig-x11 index 8b7c83f24..8cb26d201 100644 --- a/nuttx/configs/sim/nx/defconfig-x11 +++ b/nuttx/configs/sim/nx/defconfig-x11 @@ -1,7 +1,7 @@ ############################################################################ # sim/nx/defconfig # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -59,8 +59,8 @@ CONFIG_SIM_FBBPP=32 # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -121,7 +121,7 @@ CONFIG_SIM_FBBPP=32 # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nx +CONFIG_APP_DIR=examples/nx CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sim/ostest/defconfig b/nuttx/configs/sim/ostest/defconfig index ba1d7a61d..01cad9c58 100644 --- a/nuttx/configs/sim/ostest/defconfig +++ b/nuttx/configs/sim/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/ostest/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig index 33694968e..7c8b356ae 100644 --- a/nuttx/configs/sim/pashello/defconfig +++ b/nuttx/configs/sim/pashello/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/sim/pashello/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -114,7 +114,7 @@ CONFIG_ARCH_BOARD_SIM=y # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=pashello +CONFIG_APP_DIR=examples/pashello CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig index 4baa36c96..9132a4a05 100644 --- a/nuttx/configs/skp16c26/ostest/defconfig +++ b/nuttx/configs/skp16c26/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/skp16c26/ostest/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -150,8 +150,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -212,7 +212,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig index 5ad48fd6f..9c2a78c4d 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/defconfig +++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/stm3210e-eval/RIDE/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -226,8 +226,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -315,7 +315,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=null +CONFIG_APP_DIR=examples/null CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig index 97e81e3d5..757c0ee45 100755 --- a/nuttx/configs/stm3210e-eval/nsh/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/stm3210e-eval/nsh/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -325,7 +325,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig index b6fd693a3..30c2346f8 100755 --- a/nuttx/configs/stm3210e-eval/ostest/defconfig +++ b/nuttx/configs/stm3210e-eval/ostest/defconfig @@ -238,8 +238,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -327,7 +327,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/stm3210e-eval/src/Makefile b/nuttx/configs/stm3210e-eval/src/Makefile index 03d565a56..d291a1693 100755 --- a/nuttx/configs/stm3210e-eval/src/Makefile +++ b/nuttx/configs/stm3210e-eval/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # configs/stm3210e-eval/src/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c \ ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif -ifeq ($(CONFIG_EXAMPLE),usbstorage) +ifeq ($(CONFIG_APP_DIR),examples/usbstorage) CSRCS += up_usbstrg.c endif COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig index 77fd6212b..f328ffc54 100755 --- a/nuttx/configs/stm3210e-eval/usbserial/defconfig +++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/stm3210e-eval/usbserial/defconfig # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -238,8 +238,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -327,7 +327,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=usbserial +CONFIG_APP_DIR=examples/usbserial CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_USB=n diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig index a1cd47c33..d0d665dcf 100755 --- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig +++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig @@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -325,7 +325,7 @@ CONFIG_HAVE_LIBM=n # CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up # the worker thread. Default: 4 # -CONFIG_EXAMPLE=usbstorage +CONFIG_APP_DIR=examples/usbstorage CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_FS=n diff --git a/nuttx/configs/us7032evb1/nsh/defconfig b/nuttx/configs/us7032evb1/nsh/defconfig index 165f913cd..6c3d9ff1a 100644 --- a/nuttx/configs/us7032evb1/nsh/defconfig +++ b/nuttx/configs/us7032evb1/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/us7032evb1/nsh/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -154,8 +154,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -216,7 +216,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/us7032evb1/ostest/defconfig b/nuttx/configs/us7032evb1/ostest/defconfig index 595f7afc5..a06b33122 100644 --- a/nuttx/configs/us7032evb1/ostest/defconfig +++ b/nuttx/configs/us7032evb1/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/us7032evb1/ostest/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -154,8 +154,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -216,7 +216,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig index 414ee636e..8df793ebd 100644 --- a/nuttx/configs/xtrs/nsh/defconfig +++ b/nuttx/configs/xtrs/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # sim/xtrs/nsh/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -160,7 +160,7 @@ CONFIG_LINKER_ROM_AT_0000=y # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig index b3f3373c1..f9f92ccba 100644 --- a/nuttx/configs/xtrs/ostest/defconfig +++ b/nuttx/configs/xtrs/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/xtrs/ostest/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -160,7 +160,7 @@ CONFIG_LINKER_ROM_AT_0000=y # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig index 10612e62d..e40a1c00f 100644 --- a/nuttx/configs/xtrs/pashello/defconfig +++ b/nuttx/configs/xtrs/pashello/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/xtrs/pashello/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -160,7 +160,7 @@ CONFIG_LINKER_ROM_AT_0000=y # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=pashello +CONFIG_APP_DIR=examples/pashello CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig index b453d0235..d77f486b8 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/defconfig +++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/z16f2800100zcog/ostest/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -125,8 +125,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -189,7 +189,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig index 257bc7380..61409a6af 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/defconfig +++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/z16f2800100zcog/pashello/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -125,8 +125,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -189,7 +189,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=pashello +CONFIG_APP_DIR=examples/pashello CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig index 10e7a4651..3616c0f35 100644 --- a/nuttx/configs/z80sim/nsh/defconfig +++ b/nuttx/configs/z80sim/nsh/defconfig @@ -1,7 +1,7 @@ ############################################################################ # sim/z80sim/nsh/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -150,7 +150,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=nsh +CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig index 301fa4e4c..2c6fc0fda 100644 --- a/nuttx/configs/z80sim/ostest/defconfig +++ b/nuttx/configs/z80sim/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/z80sim/ostest/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -150,7 +150,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig index 7b95e2bd1..6a740d231 100644 --- a/nuttx/configs/z80sim/pashello/defconfig +++ b/nuttx/configs/z80sim/pashello/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/z80sim/pashello/defconfig # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -150,7 +150,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=pashello +CONFIG_APP_DIR=examples/pashello CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig index 24b076723..73b8490c8 100644 --- a/nuttx/configs/z8encore000zco/ostest/defconfig +++ b/nuttx/configs/z8encore000zco/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/z8encore000zco/ostest/defconfig # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -117,8 +117,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -184,7 +184,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/configs/z8f64200100kit/ostest/defconfig b/nuttx/configs/z8f64200100kit/ostest/defconfig index 04388fc02..dc070f143 100644 --- a/nuttx/configs/z8f64200100kit/ostest/defconfig +++ b/nuttx/configs/z8f64200100kit/ostest/defconfig @@ -1,7 +1,7 @@ ############################################################################ # configs/z8f64200100kit/ostest/defconfig # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -117,8 +117,8 @@ CONFIG_HAVE_LIBM=n # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectory in examples -# that will be used in the build +# CONFIG_APP_DIR - Identifies the relative path to the directory +# that builds the application to link with NuttX. # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output # CONFIG_DEBUG_SYMBOLS - build without optimization and with @@ -184,7 +184,7 @@ CONFIG_HAVE_LIBM=n # desciptors by task_create() when a new task is started. If # set, all sockets will appear to be closed in the new task. # -CONFIG_EXAMPLE=ostest +CONFIG_APP_DIR=examples/ostest CONFIG_DEBUG=y CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n diff --git a/nuttx/examples/README.txt b/nuttx/examples/README.txt index ad301dbab..e6075ec84 100644 --- a/nuttx/examples/README.txt +++ b/nuttx/examples/README.txt @@ -2,11 +2,13 @@ examples ^^^^^^^^ The examples directory contains several sample applications that - can be linked with nuttx. The specific example is selected in the - configs/<board-name>/defconfig file via the CONFIG_EXAMPLE setting. - For example, + can be linked with NuttX. The specific example is selected in the + configs/<board-name>/defconfig file via the CONFIG_APP_DIR setting. + This setting provides the path to the directory containing the + application Makefile (this path is a relative to the NuttX top- + level directory). For example, - CONFIG_EXAMPLE=ostest + CONFIG_APP_DIR=examples/ostest Selects the examples/ostest example. diff --git a/nuttx/examples/dhcpd/Makefile b/nuttx/examples/dhcpd/Makefile index aee288668..2a154136b 100644 --- a/nuttx/examples/dhcpd/Makefile +++ b/nuttx/examples/dhcpd/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/dhcpd/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/hello/Makefile b/nuttx/examples/hello/Makefile index fd91fef11..5fd80c394 100644 --- a/nuttx/examples/hello/Makefile +++ b/nuttx/examples/hello/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/hello/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/helloxx/Makefile b/nuttx/examples/helloxx/Makefile index 7210ea2f1..5a90b03c5 100755 --- a/nuttx/examples/helloxx/Makefile +++ b/nuttx/examples/helloxx/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/helloxx/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) .PHONY: clean depend chkcxx diff --git a/nuttx/examples/igmp/Makefile b/nuttx/examples/igmp/Makefile index 2f3d93ff4..b1e92b942 100755 --- a/nuttx/examples/igmp/Makefile +++ b/nuttx/examples/igmp/Makefile @@ -45,7 +45,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/mount/Makefile b/nuttx/examples/mount/Makefile index 084fc8fb6..31067966e 100644 --- a/nuttx/examples/mount/Makefile +++ b/nuttx/examples/mount/Makefile @@ -1,7 +1,7 @@ ############################################################################ # Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/nettest/Makefile b/nuttx/examples/nettest/Makefile index 6677f847f..5fda016fb 100644 --- a/nuttx/examples/nettest/Makefile +++ b/nuttx/examples/nettest/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nettest/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ TARG_COBJS = $(TARG_CSRCS:.c=$(OBJEXT)) TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS) -TARG_BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +TARG_BIN = libapp$(LIBEXT) HOSTCFLAGS += -DCONFIG_EXAMPLE_NETTEST_HOST=1 ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y) diff --git a/nuttx/examples/nsh/Makefile b/nuttx/examples/nsh/Makefile index 341f59080..41f1aa44e 100644 --- a/nuttx/examples/nsh/Makefile +++ b/nuttx/examples/nsh/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nsh/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -65,7 +65,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/null/Makefile b/nuttx/examples/null/Makefile index 3eb745b41..53efcbe39 100644 --- a/nuttx/examples/null/Makefile +++ b/nuttx/examples/null/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/null/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/nx/Makefile b/nuttx/examples/nx/Makefile index 002e255ec..ea19ebcc5 100644 --- a/nuttx/examples/nx/Makefile +++ b/nuttx/examples/nx/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nxflat/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -50,7 +50,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/nxflat/Makefile b/nuttx/examples/nxflat/Makefile index fa740370f..dae8a4ea7 100644 --- a/nuttx/examples/nxflat/Makefile +++ b/nuttx/examples/nxflat/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/nxflat/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) .PHONY: headers clean distclean diff --git a/nuttx/examples/ostest/Makefile b/nuttx/examples/ostest/Makefile index d04de7bfe..5fc3cfad9 100644 --- a/nuttx/examples/ostest/Makefile +++ b/nuttx/examples/ostest/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/ostest/Makefile # -# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -85,7 +85,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/pashello/Makefile b/nuttx/examples/pashello/Makefile index aeb220028..fd91e1124 100644 --- a/nuttx/examples/pashello/Makefile +++ b/nuttx/examples/pashello/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/pashello/Makefile # -# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/pipe/Makefile b/nuttx/examples/pipe/Makefile index 4f61e86b8..72cd67ee7 100644 --- a/nuttx/examples/pipe/Makefile +++ b/nuttx/examples/pipe/Makefile @@ -1,7 +1,7 @@ ############################################################################ # Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/poll/Makefile b/nuttx/examples/poll/Makefile index e91f5018c..c8c4f1f1a 100644 --- a/nuttx/examples/poll/Makefile +++ b/nuttx/examples/poll/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/poll/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/romfs/Makefile b/nuttx/examples/romfs/Makefile index 301d1b27c..67f68de9d 100644 --- a/nuttx/examples/romfs/Makefile +++ b/nuttx/examples/romfs/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/romfs/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/sendmail/Makefile b/nuttx/examples/sendmail/Makefile index 0907345d4..2fac537d2 100644 --- a/nuttx/examples/sendmail/Makefile +++ b/nuttx/examples/sendmail/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/sendmail/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/serloop/Makefile b/nuttx/examples/serloop/Makefile index a75d9a964..4f6f53a6b 100644 --- a/nuttx/examples/serloop/Makefile +++ b/nuttx/examples/serloop/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/serloop/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/thttpd/Makefile b/nuttx/examples/thttpd/Makefile index 2d9b271a0..696117e64 100644 --- a/nuttx/examples/thttpd/Makefile +++ b/nuttx/examples/thttpd/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/thttpd/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) .PHONY: clean headers diff --git a/nuttx/examples/udp/Makefile b/nuttx/examples/udp/Makefile index a4d4fdd5e..da833f010 100644 --- a/nuttx/examples/udp/Makefile +++ b/nuttx/examples/udp/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/udp/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ TARG_COBJS = $(TARG_CSRCS:.c=$(OBJEXT)) TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS) -TARG_BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +TARG_BIN = libapp$(LIBEXT) HOSTCFLAGS += -DCONFIG_EXAMPLE_UDP_HOST=1 ifeq ($(CONFIG_EXAMPLE_UDP_SERVER),y) diff --git a/nuttx/examples/uip/Makefile b/nuttx/examples/uip/Makefile index c9b6932d8..e90f7ca42 100644 --- a/nuttx/examples/uip/Makefile +++ b/nuttx/examples/uip/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/uip/Makefile # -# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/usbserial/Makefile b/nuttx/examples/usbserial/Makefile index f71008783..a2fe9f41b 100644 --- a/nuttx/examples/usbserial/Makefile +++ b/nuttx/examples/usbserial/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/usbserial/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/usbstorage/Makefile b/nuttx/examples/usbstorage/Makefile index 43bd4d4e6..de69e5911 100644 --- a/nuttx/examples/usbstorage/Makefile +++ b/nuttx/examples/usbstorage/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/hello/Makefile # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) diff --git a/nuttx/examples/wget/Makefile b/nuttx/examples/wget/Makefile index aad645f3c..dc00702c7 100644 --- a/nuttx/examples/wget/Makefile +++ b/nuttx/examples/wget/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/wget/Makefile # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = lib$(CONFIG_EXAMPLE)$(LIBEXT) +BIN = libapp$(LIBEXT) all: $(BIN) |