diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-21 21:59:35 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-21 21:59:35 +0000 |
commit | aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2 (patch) | |
tree | 2ee3d56220eb419976035ac38aa73dc8f5e249b8 /nuttx/configs/ea3131 | |
parent | 60051cba0cf424e01ef2eda09816ee8945867b6d (diff) | |
download | px4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.tar.gz px4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.tar.bz2 px4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.zip |
Prep for 6.0 releasenuttx-6.0
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3408 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/ea3131')
-rwxr-xr-x | nuttx/configs/ea3131/locked/Makefile | 10 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/nsh/defconfig | 6 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/ostest/defconfig | 6 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/pgnsh/defconfig | 6 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/usbserial/defconfig | 6 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/usbstorage/defconfig | 6 |
6 files changed, 20 insertions, 20 deletions
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 |