clean
.
@@ -2708,7 +2708,7 @@ build
When this application is invoked it will receive the setting TOPDIR
like:
- $(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)"
<target>
+ $(MAKE) -C $(CONFIG_APPS_DIR) TOPDIR="$(TOPDIR)"
<target>
diff --git a/nuttx/Makefile b/nuttx/Makefile
index b5c4dd6ae..ed2f63e9b 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@@ -62,16 +62,22 @@ BOARD_DIR = configs/$(CONFIG_ARCH_BOARD)
# Add-on directories. These may or may not be in place in the
# NuttX source tree (they must be specifically installed)
#
-# APPLOC can be over-ridden from the command line or in the .config file:
+# CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file.
+# The default value of CONFIG_APPS_DIR is ../apps. Ultimately, the application
+# will be built if APPDIR is defined. APPDIR will be defined if a directory containing
+# a Makefile is found at the path provided by CONFIG_APPS_DIR
-ifeq ($(CONFIG_BUILTIN_APPS),y)
-ifeq ($(APPLOC),)
-APPLOC = ../apps
-endif
-APPDIR := ${shell if [ -r $(APPLOC)/Makefile ]; then echo "$(APPLOC)"; fi}
+ifeq ($(CONFIG_APPS_DIR),)
+CONFIG_APPS_DIR = ../apps
endif
+APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi}
+
+# The Pascal p-code add-on directory
PCODE_DIR := ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi}
+
+# All add-on directories
+
ADDON_DIRS := $(PCODE_DIR) $(NX_DIR) $(APPDIR)
# FSDIRS depend on file descriptor support; NONFSDIRS do not
@@ -88,10 +94,6 @@ NONFSDIRS += graphics
CONTEXTDIRS += graphics
endif
-ifneq ($(CONFIG_APP_DIR),)
-NONFSDIRS = $(CONFIG_APP_DIR)
-endif
-
# CLEANDIRS are the directories that will clean in. These are
# all directories that we know about.
# MAKEDIRS are the directories in which we will build targets
@@ -146,17 +148,11 @@ ifeq ($(CONFIG_HAVE_CXX),y)
LINKLIBS += libxx/liblibxx$(LIBEXT)
endif
-# Add application-specific library
-
-ifneq ($(CONFIG_APP_DIR),)
-LINKLIBS = $(CONFIG_APP_DIR)/libapp$(LIBEXT)
-endif
-
# Add library for application support
# Always compile the framework which includes exec_nuttapp if users
# or nuttX applications are to be included.
-ifeq ($(CONFIG_BUILTIN_APPS),y)
+ifneq ($(APPDIR),)
LINKLIBS += $(APPDIR)/libapps$(LIBEXT)
endif
@@ -291,9 +287,6 @@ pcode/libpcode$(LIBEXT): context
graphics/libgraphics$(LIBEXT): context
@$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT)
-$(CONFIG_APP_DIR)/libapp$(LIBEXT): context
- @$(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)" libapp$(LIBEXT)
-
# If the 2 pass build option is selected, then this pass1 target is
# configured be build a extra link object. This is assumed to be an
# incremental (relative) link object, but could be a static library
@@ -355,6 +348,7 @@ depend: context
done
subdir_clean:
+ echo "CLEANDIRS: $(CLEANDIRS)"
@for dir in $(CLEANDIRS) ; do \
if [ -e $$dir/Makefile ]; then \
$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" clean ; \
diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes
index a00ac19b5..cd9ac5277 100644
--- a/nuttx/ReleaseNotes
+++ b/nuttx/ReleaseNotes
@@ -1694,7 +1694,7 @@ identified in the ChangeLog. Headlines would include:
* Incorporated the LUFA HID parser.
* Various bugfix as detailed in the ChangeLog
-nuttx-5.18
+nuttx-5.19
^^^^^^^^^^
The 66th release of NuttX, Version 5.19, was made on March 12, 2011 and is
@@ -1730,3 +1730,50 @@ several new features in various states of integration and maturity:
Uros Platise))
* New waitpid() system interface.
* Additional bugfixes: pipes, stdint.h, STM32 SDIO and SPI drivers
+
+nuttx-6.0
+^^^^^^^^^
+
+The 67th release of NuttX, Version 6.0, was made on March 21, 2011 and is
+available for download from the SourceForge website. The version number of
+this release was bumped from 5.19 to 6.0. A change in the major revision
+number is used to reflect an incompatibility with previous versions. In
+this release, the NuttX core OS functionality has been separated from NuttX
+application-related functionality. These are provided as separate tarballs:
+
+ * nuttx-6.0.tar.gz, and
+ * apps-6.0.tar.gz
+
+The purpose of this separation is both to better organize and modularize the
+NuttX source tree, but also to provide better support for incorporation of
+end-user applications with Nuttx.
+
+The incompatibily results from the changes to the board configuration logic
+needed to supported the separable application. The major changes to the
+configuration include:
+
+ * CONFIG_APPS_DIR - This should not be set. The default is ../apps. This
+ should only be set if you have a custom, product-specific application
+ directory in some different location.
+
+ * appconfig - Each board configuration now requires a new file called
+ 'appconfig.' As its name suggests, this file provides new configuration
+ information needed by the logic in ../apps.
+
+In addition to this major reorganization in the directory structure, this
+release also includes some important extensions to existing features and some
+important bugfixes. These include:
+
+ * The SLIP driver was been well debugged and significantly re-designed.
+ Now you can have an Ethernet connection to you board even if you have
+ no Ethernet hardware. How cool is that?
+
+ * The QEMU i486 port is now functional. It has also been reported to
+ work on the Bifferboard (see http://bifferos.bizhat.com/).
+
+ * And extensions to the uIP driver interface, and
+
+ * Bug fixes to fopen() and STM32 GPIO configuration
+
+Please see the ChangeLog for details.
+
diff --git a/nuttx/TODO b/nuttx/TODO
index ef73e2e80..99be2df88 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -687,7 +687,7 @@ o ARM/LPC17xx (arch/arm/src/lpc17xx/)
debug disabled. For some reason, certain debug statements hang(?).
Also, this example does not use UART1's hardware flow control. UART1
hardware flow control is partially implemented but does not behave as
- expected. It needs a little more work.
+ expected. Hardware flow control needs a little more work.
Status: Open
Priority: Low
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index f7891dd08..152a45645 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -168,8 +168,8 @@ defconfig -- This is a configuration file similar to the Linux
Building application code:
- CONFIG_APP_DIR - Identifies the directory that builds the
- application to link with NuttX. This symbol must be assigned
+ CONFIG_APPS_DIR - Identifies the directory that builds the
+ application to link with NuttX. Default: ../apps This symbol must be assigned
to the path to the application build directory *relative* to
the NuttX top build direcory. If you had an application
directory and the NuttX directory each in separate directory
@@ -183,12 +183,12 @@ defconfig -- This is a configuration file similar to the Linux
|
`- Makefile
- Then you would set CONFIG_APP_DIR=../application.
+ Then you would set CONFIG_APPS_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
+ - libapps$(LIBEXT) (usually libapps.a). libapps.a is a static
library ( an archive) that contains all of application object
files.
- clean. Do whatever is appropriate to clean the application
@@ -201,7 +201,7 @@ defconfig -- This is a configuration file similar to the Linux
When this application is invoked it will receive the setting TOPDIR like:
- $(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)"
+ $(MAKE) -C $(CONFIG_APPS_DIR) TOPDIR="$(TOPDIR)"
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)
@@ -1108,7 +1108,6 @@ And if configs///appconfig exists in the board
configuration directory:
Copy configs///appconfig to /.config
- echo "CONFIG_BUILTIN_APPS=y" >> "${TOPDIR}/.config"
echo "APPS_LOC=\"\"" >> "${TOPDIR}/.config"
tools/configure.sh
diff --git a/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig
index 4be6e47ee..bbe3a92f9 100755
--- a/nuttx/configs/avr32dev1/nsh/defconfig
+++ b/nuttx/configs/avr32dev1/nsh/defconfig
@@ -216,8 +216,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -305,7 +305,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig
index ae27af68b..c68984353 100755
--- a/nuttx/configs/avr32dev1/ostest/defconfig
+++ b/nuttx/configs/avr32dev1/ostest/defconfig
@@ -216,8 +216,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -305,7 +305,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/c5471evm/httpd/defconfig b/nuttx/configs/c5471evm/httpd/defconfig
index 4e94cef97..e7e3479f8 100644
--- a/nuttx/configs/c5471evm/httpd/defconfig
+++ b/nuttx/configs/c5471evm/httpd/defconfig
@@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/c5471evm/nettest/defconfig b/nuttx/configs/c5471evm/nettest/defconfig
index f262d5001..fb35d1ee8 100644
--- a/nuttx/configs/c5471evm/nettest/defconfig
+++ b/nuttx/configs/c5471evm/nettest/defconfig
@@ -135,8 +135,8 @@ CONFIG_NET_C5471_BASET10=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig
index 065f29d68..026d761ba 100644
--- a/nuttx/configs/c5471evm/nsh/defconfig
+++ b/nuttx/configs/c5471evm/nsh/defconfig
@@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/c5471evm/ostest/defconfig b/nuttx/configs/c5471evm/ostest/defconfig
index a0e2d355e..2cbc0fe51 100644
--- a/nuttx/configs/c5471evm/ostest/defconfig
+++ b/nuttx/configs/c5471evm/ostest/defconfig
@@ -135,8 +135,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 2f5f7cf53..80cec002f 100755
--- a/nuttx/configs/demo9s12ne64/ostest/defconfig
+++ b/nuttx/configs/demo9s12ne64/ostest/defconfig
@@ -194,8 +194,8 @@ CONFIG_PASS1_OBJECT=init.r
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -283,7 +283,7 @@ CONFIG_PASS1_OBJECT=init.r
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/detron/hidkbd/defconfig b/nuttx/configs/detron/hidkbd/defconfig
index d116d1fab..28efc6d74 100755
--- a/nuttx/configs/detron/hidkbd/defconfig
+++ b/nuttx/configs/detron/hidkbd/defconfig
@@ -234,8 +234,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -323,7 +323,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/detron/nsh/defconfig b/nuttx/configs/detron/nsh/defconfig
index 4ae3f4bd6..c8af3917b 100755
--- a/nuttx/configs/detron/nsh/defconfig
+++ b/nuttx/configs/detron/nsh/defconfig
@@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/detron/ostest/defconfig b/nuttx/configs/detron/ostest/defconfig
index b418e996f..f247c9a2a 100755
--- a/nuttx/configs/detron/ostest/defconfig
+++ b/nuttx/configs/detron/ostest/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/detron/wlan/defconfig b/nuttx/configs/detron/wlan/defconfig
index ddfcd4443..5a4e63220 100755
--- a/nuttx/configs/detron/wlan/defconfig
+++ b/nuttx/configs/detron/wlan/defconfig
@@ -235,8 +235,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/ea3131/locked/Makefile b/nuttx/configs/ea3131/locked/Makefile
index a6bae11a0..053781578 100755
--- a/nuttx/configs/ea3131/locked/Makefile
+++ b/nuttx/configs/ea3131/locked/Makefile
@@ -44,18 +44,18 @@ PASS1_LIBBOARD = $(PASS1_BOARDDIR)/libboard$(LIBEXT)
# Where is the application library?
-ifneq ($(CONFIG_APP_DIR),)
-PASS1_LIBAPP = $(CONFIG_APP_DIR)/libapp$(LIBEXT)
+ifneq ($(CONFIG_APPS_DIR),)
+PASS1_LIBAPPS = $(CONFIG_APPS_DIR)/libapps$(LIBEXT)
else
ifneq ($(APPDIR),)
-PASS1_LIBAPP = $(APPDIR)/libapps$(LIBEXT)
+PASS1_LIBAPPS = $(APPDIR)/libapps$(LIBEXT)
endif
endif
-# Remove the application library (libapp) from the list of libraries. Add
+# Remove the application library (libapps) from the list of libraries. Add
# the boad library (liboard)
-PASS1_LINKLIBS = $(filter-out $(PASS1_LIBAPP),$(LINKLIBS))
+PASS1_LINKLIBS = $(filter-out $(PASS1_LIBAPPS),$(LINKLIBS))
PASS1_LINKLIBS += $(PASS1_LIBBOARD)
# Get the paths to the libraries and the links script path in format that
diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig
index e79f4cee1..712c85fd8 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 7c47da43f..c09f0c00b 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 33b378224..859b606be 100755
--- a/nuttx/configs/ea3131/pgnsh/defconfig
+++ b/nuttx/configs/ea3131/pgnsh/defconfig
@@ -208,8 +208,8 @@ CONFIG_PASS1_OBJECT=locked.r
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_OBJECT=locked.r
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig
index 060e096e1..4b2530af6 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 34e7609f9..da1f5afc7 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 129285cab..4d819930b 100644
--- a/nuttx/configs/eagle100/httpd/defconfig
+++ b/nuttx/configs/eagle100/httpd/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -268,7 +268,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 05705add5..f7810a201 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/configs/eagle100/nettest/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -268,7 +268,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 14b28a5dc..b20d339d7 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/configs/eagle100/nsh/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -268,7 +268,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 7cf4e2835..dd5c46a4b 100644
--- a/nuttx/configs/eagle100/nxflat/defconfig
+++ b/nuttx/configs/eagle100/nxflat/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -265,7 +265,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_APP_DIR=
+#CONFIG_APPS_DIR=
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 6d9a2a3b5..321a0911a 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -274,7 +274,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 c5ac38827..0008b8e75 100644
--- a/nuttx/configs/eagle100/thttpd/defconfig
+++ b/nuttx/configs/eagle100/thttpd/defconfig
@@ -203,8 +203,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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
# desciptors by task_create() when a new task is started. If
# set, all sockets will appear to be closed in the new task.
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 031dae4cd..fe23817c1 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -167,8 +167,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 475d12e25..9270d0522 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 ff68c80c3..026ccdd08 100644
--- a/nuttx/configs/ez80f910200zco/httpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/httpd/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 22713e280..746bd0224 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/configs/ez80f910200zco/nettest/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 fda8b9fb0..c866e9542 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 fd2c7df58..2bb4ce44e 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/configs/ez80f910200zco/ostest/defconfig
@@ -170,8 +170,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 8546f5663..b5cde349f 100644
--- a/nuttx/configs/ez80f910200zco/poll/defconfig
+++ b/nuttx/configs/ez80f910200zco/poll/defconfig
@@ -171,8 +171,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 71d9367ea..77357971f 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 a0afe732c..a0f155559 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -222,8 +222,8 @@ CONFIG_SPI_CMDDATA=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_SPI_CMDDATA=y
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 a51d3aa4a..933db9a5a 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index eade135b6..add9a6167 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index 326a28b49..1be795ecd 100755
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nx/defconfig
@@ -222,8 +222,8 @@ CONFIG_SPI_CMDDATA=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_SPI_CMDDATA=y
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig
index 659b6a442..db9304a4c 100755
--- a/nuttx/configs/lm3s8962-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -288,7 +288,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig
index 06c188c85..ddd7fcbf6 100644
--- a/nuttx/configs/m68332evb/defconfig
+++ b/nuttx/configs/m68332evb/defconfig
@@ -105,8 +105,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -167,7 +167,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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig
index 46ae66bdb..dbda7b3e3 100644
--- a/nuttx/configs/mbed/hidkbd/defconfig
+++ b/nuttx/configs/mbed/hidkbd/defconfig
@@ -237,8 +237,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig
index 3f10cb1b1..905a11a7f 100755
--- a/nuttx/configs/mbed/nsh/defconfig
+++ b/nuttx/configs/mbed/nsh/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 605eea0da..66f9def27 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 165658643..1e47a77a2 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index 093ead44e..5ae98dba8 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 aee5c503c..f4e423780 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 47688a22e..81f271ec0 100644
--- a/nuttx/configs/mx1ads/ostest/defconfig
+++ b/nuttx/configs/mx1ads/ostest/defconfig
@@ -155,8 +155,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig
index 57670752c..47ce5e58b 100755
--- a/nuttx/configs/ne64badge/ostest/defconfig
+++ b/nuttx/configs/ne64badge/ostest/defconfig
@@ -205,8 +205,8 @@ CONFIG_PASS1_OBJECT=init.r
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -294,7 +294,7 @@ CONFIG_PASS1_OBJECT=init.r
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 c72ba50d1..216eff7e7 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 bf2a4d8c3..d46a1b6c5 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -142,8 +142,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -207,7 +207,7 @@ CONFIG_HAVE_LIBM=n
# This format will support execution of NuttX binaries located
# in a ROMFS filesystem (see examples/nxflat).
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 183000974..f9b863c28 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/configs/ntosd-dm320/ostest/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 1e8faf426..bb584936a 100644
--- a/nuttx/configs/ntosd-dm320/poll/defconfig
+++ b/nuttx/configs/ntosd-dm320/poll/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 a4003ef28..d92b971d1 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/defconfig
+++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig
@@ -147,8 +147,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -215,7 +215,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_APP_DIR=
+#CONFIG_APPS_DIR=
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 3bb8fac40..a9dc75dcf 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 61f8641a4..5b8b8d878 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -143,8 +143,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 abfd3def3..7c8bc2c17 100755
--- a/nuttx/configs/nucleus2g/nsh/defconfig
+++ b/nuttx/configs/nucleus2g/nsh/defconfig
@@ -233,8 +233,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -322,7 +322,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 2539e617e..0b8df6124 100755
--- a/nuttx/configs/nucleus2g/ostest/defconfig
+++ b/nuttx/configs/nucleus2g/ostest/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig
index 502ee3a85..f20eed8f3 100755
--- a/nuttx/configs/nucleus2g/usbserial/defconfig
+++ b/nuttx/configs/nucleus2g/usbserial/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 871634660..4eeac6d4f 100755
--- a/nuttx/configs/nucleus2g/usbstorage/defconfig
+++ b/nuttx/configs/nucleus2g/usbstorage/defconfig
@@ -230,8 +230,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -319,7 +319,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
index 78f50af03..a55ba91a9 100755
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -237,8 +237,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
index 20153e310..353036bfd 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
@@ -237,8 +237,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index b16abf38f..db03deeea 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
@@ -237,8 +237,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -326,7 +326,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
index d45d7a296..2d61bca84 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
@@ -236,8 +236,8 @@ CONFIG_SPI_CMDDATA=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_SPI_CMDDATA=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
index f5b46927c..4122d8d09 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
@@ -231,8 +231,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
index b7c6f1731..049b751c8 100755
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -322,7 +322,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
index a7f8a9f25..b92d886d5 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -234,8 +234,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
index 436ca1ea6..73f52406d 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -231,8 +231,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
index 4b56fb1fe..841601f74 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -231,8 +231,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -320,7 +320,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
index 61cd0085e..e80c70622 100755
--- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig
@@ -234,8 +234,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 c2ffdb837..597b80d5d 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 c1bec6554..a7b0b25d5 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 a91e9af0c..9179ae8d3 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 d253aef86..a8ba52709 100644
--- a/nuttx/configs/olimex-strp711/nsh/defconfig
+++ b/nuttx/configs/olimex-strp711/nsh/defconfig
@@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 a625349fc..dc81b213f 100644
--- a/nuttx/configs/olimex-strp711/ostest/defconfig
+++ b/nuttx/configs/olimex-strp711/ostest/defconfig
@@ -206,8 +206,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 b2303d0c7..2ae280ff1 100644
--- a/nuttx/configs/pjrc-8051/defconfig
+++ b/nuttx/configs/pjrc-8051/defconfig
@@ -103,8 +103,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig
index 60f60b697..3a70e23f3 100644
--- a/nuttx/configs/qemu-i486/nsh/defconfig
+++ b/nuttx/configs/qemu-i486/nsh/defconfig
@@ -174,8 +174,8 @@ CONFIG_UART3_2STOP=0
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory that builds
-# the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory that builds
+# the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with debug symbols
@@ -230,7 +230,7 @@ CONFIG_UART3_2STOP=0
# task_create() when a new task is started. If set, all sockets will appear
# to be closed in the new task.
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig
index 9e3f0891c..140dc9032 100644
--- a/nuttx/configs/qemu-i486/ostest/defconfig
+++ b/nuttx/configs/qemu-i486/ostest/defconfig
@@ -90,8 +90,8 @@ CONFIG_ARCH_DMA=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory that builds
-# the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory that builds
+# the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with debug symbols
@@ -146,7 +146,7 @@ CONFIG_ARCH_DMA=n
# task_create() when a new task is started. If set, all sockets will appear
# to be closed in the new task.
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
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 65a56ff74..5e44d5fe5 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 fce97cd37..6c11f93ae 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 900160874..f5991cdc5 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig
index 6682c8a7f..f829db30c 100644
--- a/nuttx/configs/sim/mount/defconfig
+++ b/nuttx/configs/sim/mount/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 d4354238f..378a0cf3e 100644
--- a/nuttx/configs/sim/nettest/defconfig
+++ b/nuttx/configs/sim/nettest/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 4cdb88df9..5bc0c34c7 100644
--- a/nuttx/configs/sim/nsh/defconfig
+++ b/nuttx/configs/sim/nsh/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 23edd54dd..f2d13ac0e 100644
--- a/nuttx/configs/sim/nx/defconfig
+++ b/nuttx/configs/sim/nx/defconfig
@@ -59,8 +59,8 @@ CONFIG_SIM_FBBPP=8
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 d01f54522..f53d6c1b5 100644
--- a/nuttx/configs/sim/nx/defconfig-x11
+++ b/nuttx/configs/sim/nx/defconfig-x11
@@ -59,8 +59,8 @@ CONFIG_SIM_FBBPP=32
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 41da39ce7..7c998e847 100644
--- a/nuttx/configs/sim/ostest/defconfig
+++ b/nuttx/configs/sim/ostest/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 2a31128fe..f697e247d 100644
--- a/nuttx/configs/sim/pashello/defconfig
+++ b/nuttx/configs/sim/pashello/defconfig
@@ -52,8 +52,8 @@ CONFIG_ARCH_BOARD_SIM=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 d743397cd..1b611c63c 100644
--- a/nuttx/configs/skp16c26/ostest/defconfig
+++ b/nuttx/configs/skp16c26/ostest/defconfig
@@ -150,8 +150,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 83ebe4fe2..78da2fa7e 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/defconfig
+++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig
@@ -226,8 +226,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 7a54c879b..384a96a1a 100755
--- a/nuttx/configs/stm3210e-eval/nsh/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh/defconfig
@@ -236,8 +236,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 075e3f213..9a4a8bb0a 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig
index c469da139..e4b640ea0 100755
--- a/nuttx/configs/stm3210e-eval/usbserial/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig
@@ -238,8 +238,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 ef37ef8d7..48b4480e4 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_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 e9ee5805d..768a83d5f 100644
--- a/nuttx/configs/us7032evb1/nsh/defconfig
+++ b/nuttx/configs/us7032evb1/nsh/defconfig
@@ -154,8 +154,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 c87235acc..06326b2ab 100644
--- a/nuttx/configs/us7032evb1/ostest/defconfig
+++ b/nuttx/configs/us7032evb1/ostest/defconfig
@@ -154,8 +154,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig
index 52bea358b..a6fffc4c6 100755
--- a/nuttx/configs/vsn/nsh/defconfig
+++ b/nuttx/configs/vsn/nsh/defconfig
@@ -250,8 +250,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# CONFIG_DEBUG - enables built-in debug options
# CONFIG_DEBUG_VERBOSE - enables verbose debug output
# CONFIG_DEBUG_SYMBOLS - build without optimization and with
@@ -339,7 +339,7 @@ CONFIG_HAVE_LIBM=n
# CONFIG_SIG_SIGWORK - The signal number that will be used to wake-up
# the worker thread. Default: 4
#
-#CONFIG_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=y
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig
index 18286cefc..9fdcc5237 100644
--- a/nuttx/configs/xtrs/nsh/defconfig
+++ b/nuttx/configs/xtrs/nsh/defconfig
@@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 f11088c30..e06787636 100644
--- a/nuttx/configs/xtrs/ostest/defconfig
+++ b/nuttx/configs/xtrs/ostest/defconfig
@@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 932fc2932..b5e4a68b0 100644
--- a/nuttx/configs/xtrs/pashello/defconfig
+++ b/nuttx/configs/xtrs/pashello/defconfig
@@ -95,8 +95,8 @@ CONFIG_LINKER_ROM_AT_0000=y
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 28dac2c9f..a1d304ed7 100644
--- a/nuttx/configs/z16f2800100zcog/ostest/defconfig
+++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig
@@ -125,8 +125,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 5b9c820b2..6103d8236 100644
--- a/nuttx/configs/z16f2800100zcog/pashello/defconfig
+++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig
@@ -125,8 +125,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 40b6ea423..ad71864ef 100644
--- a/nuttx/configs/z80sim/nsh/defconfig
+++ b/nuttx/configs/z80sim/nsh/defconfig
@@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 660acbfc8..32db98607 100644
--- a/nuttx/configs/z80sim/ostest/defconfig
+++ b/nuttx/configs/z80sim/ostest/defconfig
@@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 8e94f33c7..6c5d3724a 100644
--- a/nuttx/configs/z80sim/pashello/defconfig
+++ b/nuttx/configs/z80sim/pashello/defconfig
@@ -85,8 +85,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 6c06006e6..6d89cca84 100644
--- a/nuttx/configs/z8encore000zco/ostest/defconfig
+++ b/nuttx/configs/z8encore000zco/ostest/defconfig
@@ -117,8 +117,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
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 9a02ed8bf..d814d7fcc 100644
--- a/nuttx/configs/z8f64200100kit/ostest/defconfig
+++ b/nuttx/configs/z8f64200100kit/ostest/defconfig
@@ -117,8 +117,8 @@ CONFIG_HAVE_LIBM=n
#
# General OS setup
#
-# CONFIG_APP_DIR - Identifies the relative path to the directory
-# that builds the application to link with NuttX.
+# CONFIG_APPS_DIR - Identifies the relative path to the directory
+# that builds the application to link with NuttX. Default: ../apps
# 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_APP_DIR=
+#CONFIG_APPS_DIR=
CONFIG_DEBUG=y
CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n
diff --git a/nuttx/sched/os_bringup.c b/nuttx/sched/os_bringup.c
index 64b4e9388..dd413277a 100644
--- a/nuttx/sched/os_bringup.c
+++ b/nuttx/sched/os_bringup.c
@@ -54,7 +54,7 @@
#ifdef CONFIG_SCHED_WORKQUEUE
# include "work_internal.h"
#endif
-#ifdef CONFIG_BUILTIN_APPS
+#ifdef CONFIG_BUILTIN_APP_START
# include "apps/apps.h"
#endif
@@ -120,7 +120,7 @@
int os_bringup(void)
{
-#if defined(CONFIG_BUILTIN_APPS) && defined(CONFIG_BUILTIN_APP_START)
+#ifdef CONFIG_BUILTIN_APP_START
static const char *argv[3] = {NULL, "init", NULL};
#endif
int init_taskid;
@@ -155,8 +155,8 @@ int os_bringup(void)
*/
svdbg("Starting init thread\n");
-
-#if defined(CONFIG_BUILTIN_APPS) && defined(CONFIG_BUILTIN_APP_START)
+
+#ifdef CONFIG_BUILTIN_APP_START
/* Start the built-in application, passing an "init" argument, so that
* application can distinguish different run-levels
*/
diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh
index 8e56c2a0e..a4e74d4ee 100755
--- a/nuttx/tools/configure.sh
+++ b/nuttx/tools/configure.sh
@@ -162,8 +162,7 @@ if [ ! -z "${appdir}" ]; then
echo "" >> "${TOPDIR}/.config"
echo "# Application configuration" >> "${TOPDIR}/.config"
echo "" >> "${TOPDIR}/.config"
- echo "CONFIG_BUILTIN_APPS=y" >> "${TOPDIR}/.config"
- echo "APPLOC=\"$appdir\"" >> "${TOPDIR}/.config"
+ echo "CONFIG_APPS_DIR=\"$appdir\"" >> "${TOPDIR}/.config"
fi
fi
diff --git a/nuttx/tools/zipme.sh b/nuttx/tools/zipme.sh
index bf8041a4f..448a53a57 100755
--- a/nuttx/tools/zipme.sh
+++ b/nuttx/tools/zipme.sh
@@ -67,40 +67,44 @@ else
fi
fi
-# Get the NuttX directory name and the path to the parent directory
+# Get the NuttX directory names and the path to the parent directory
-NUTTXDIR=${PROJECTS}/nuttx-${VERSION}
-NUTTX=${NUTTXDIR}/nuttx
-APPS=${NUTTXDIR}/apps
+TRUNKDIR=${PROJECTS}/trunk
+NUTTX=${TRUNKDIR}/nuttx-${VERSION}
+APPDIR=${TRUNKDIR}/apps-${VERSION}
# Make sure that the versioned directory exists
-if [ ! -d ${NUTTXDIR} ]; then
- echo "Directory ${NUTTXDIR} does not exist"
+if [ ! -d ${TRUNKDIR} ]; then
+ echo "Directory ${TRUNKDIR} does not exist"
exit 1
fi
-cd ${PROJECTS} || \
- { echo "Failed to cd to ${PROJECTS}" ; exit 1 ; }
+cd ${TRUNKDIR} || \
+ { echo "Failed to cd to ${TRUNKDIR}" ; exit 1 ; }
if [ ! -d nuttx-${VERSION} ] ; then
echo "Directory ${PROJECTS}/nuttx-${VERSION} does not exist!"
exit 1
fi
-if [ ! -d ${APPS} ] ; then
- echo "Directory ${APPS} does not exist!"
+if [ ! -d app-${VERSION} ] ; then
+ echo "Directory ${PROJECTS}/nuttx-${VERSION} does not exist!"
exit 1
fi
-TAR_NAME=nuttx-${VERSION}.tar
-ZIP_NAME=${TAR_NAME}.gz
+# Create the versioned tarball names
+
+NUTTX_TARNAME=nuttx-${VERSION}.tar
+APPS_TARNAME=apps-${VERSION}.tar
+NUTTX_ZIPNAME=${NUTTX_TARNAME}.gz
+APPS_ZIPNAME=${APPS_TARNAME}.gz
# Prepare the nuttx directory -- Remove editor garbage
-find ${NUTTXDIR} -name '*~' -exec rm -f '{}' ';' || \
+find ${TRUNKDIR} -name '*~' -exec rm -f '{}' ';' || \
{ echo "Removal of emacs garbage failed!" ; exit 1 ; }
-find ${NUTTXDIR} -name '*.swp' -exec rm -f '{}' ';' || \
+find ${TRUNKDIR} -name '*.swp' -exec rm -f '{}' ';' || \
{ echo "Removal of VI garbage failed!" ; exit 1 ; }
# Make sure that all of the necessary soft links are in place
@@ -111,6 +115,14 @@ cd ${NUTTX}/Documentation || \
ln -sf ../TODO TODO.txt
ln -sf ../ChangeLog ChangeLog.txt
+# Write a version file into the NuttX directoy. The syntax of file is such that it
+# may be sourced by a bash script or included by a Makefile.
+
+echo "#!/bin/bash" >${NUTTX}/.version
+echo "" >>${NUTTX}/.version
+echo "CONFIG_NUTTX_VERSION=\"${VERSION}\"" >>${NUTTX}/.version
+chmod 755 ${NUTTX}/.version
+
# Perform a full clean for the distribution
cd ${PROJECTS} || \
@@ -120,31 +132,44 @@ make -C ${NUTTX} distclean
# Remove any previous tarballs
-if [ -f ${TAR_NAME} ] ; then
- echo "Removing ${PROJECTS}/${TAR_NAME}"
- rm -f ${TAR_NAME} || \
- { echo "rm ${TAR_NAME} failed!" ; exit 1 ; }
+if [ -f ${NUTTX_TARNAME} ] ; then
+ echo "Removing ${PROJECTS}/${NUTTX_TARNAME}"
+ rm -f ${NUTTX_TARNAME} || \
+ { echo "rm ${NUTTX_TARNAME} failed!" ; exit 1 ; }
fi
-if [ -f ${ZIP_NAME} ] ; then
- echo "Removing ${PROJECTS}/${ZIP_NAME}"
- rm -f ${ZIP_NAME} || \
- { echo "rm ${ZIP_NAME} failed!" ; exit 1 ; }
+if [ -f ${NUTTX_ZIPNAME} ] ; then
+ echo "Removing ${PROJECTS}/${NUTTX_ZIPNAME}"
+ rm -f ${NUTTX_ZIPNAME} || \
+ { echo "rm ${NUTTX_ZIPNAME} failed!" ; exit 1 ; }
fi
-# Write a version file. The syntax of file is such that it may be sourced
-# by a bash script or included by a Makefile
+if [ -f ${APPS_TARNAME} ] ; then
+ echo "Removing ${PROJECTS}/${APPS_TARNAME}"
+ rm -f ${APPS_TARNAME} || \
+ { echo "rm ${APPS_TARNAME} failed!" ; exit 1 ; }
+fi
-echo "#!/bin/bash" >${NUTTX}/.version
-echo "" >>${NUTTX}/.version
-echo "CONFIG_NUTTX_VERSION=\"${VERSION}\" >>${NUTTX}/.version
-chmod 755 ${NUTTX}/.version
+if [ -f ${APPS_ZIPNAME} ] ; then
+ echo "Removing ${PROJECTS}/${APPS_ZIPNAME}"
+ rm -f ${APPS_ZIPNAME} || \
+ { echo "rm ${APPS_ZIPNAME} failed!" ; exit 1 ; }
+fi
+
+# Then tar and zip-up the directories
-# Then zip-up the directories
+cd ${TRUNKDIR} || \
+ { echo "Failed to cd to ${TRUNKDIR}" ; exit 1 ; }
-${TAR} ${TAR_NAME} nuttx-${VERSION}/nuttx nuttx-${VERSION}/apps || \
- { echo "tar of ${TAR_NAME} failed!" ; exit 1 ; }
-${ZIP} ${TAR_NAME} || \
- { echo "zip of ${TAR_NAME} failed!" ; exit 1 ; }
+${TAR} ${NUTTX_TARNAME} nuttx-${VERSION}/nuttx || \
+ { echo "tar of ${NUTTX_TARNAME} failed!" ; exit 1 ; }
+${ZIP} ${NUTTX_TARNAME} || \
+ { echo "zip of ${NUTTX_TARNAME} failed!" ; exit 1 ; }
+
+${TAR} ${APPS_TARNAME} nuttx-${VERSION}/nuttx || \
+ { echo "tar of ${APPS_TARNAME} failed!" ; exit 1 ; }
+${ZIP} ${APPS_TARNAME} || \
+ { echo "zip of ${APPS_TARNAME} failed!" ; exit 1 ; }
cd ${NUTTX}
+
--
cgit v1.2.3