From 5029575d531576c6818094334dcae95359bdd119 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 18 Mar 2011 17:22:50 +0000 Subject: Update to apps/build git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3391 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/README.txt | 24 ++++++++++++++++ nuttx/configs/vsn/nsh/appconfig | 40 ++++++++++++++++++++++++++ nuttx/configs/vsn/nsh/defconfig | 64 +++++++++-------------------------------- 3 files changed, 78 insertions(+), 50 deletions(-) create mode 100755 nuttx/configs/vsn/nsh/appconfig (limited to 'nuttx/configs') diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 55dc6bdd3..ca14c4224 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -58,12 +58,17 @@ following characteristics: |-- | |-- Make.defs | |-- defconfig + | |-- appconfig* | `-- setenv.sh |-- | |-- Make.defs | |-- defconfig + | |-- appconfig* | `-- setenv.sh ... + + *optional + Summary of Files ^^^^^^^^^^^^^^^^ @@ -913,6 +918,10 @@ defconfig -- This is a configuration file similar to the Linux CONFIG_HEAP_BASE - The beginning of the heap CONFIG_HEAP_SIZE - The size of the heap +appconfig -- This is another configuration file that is specific to the + application. This file is copied into the application build directory + when NuttX is configured. See ../apps/README.txt for further details. + setenv.sh -- This is a script that you can include that will be installed at the toplevel of the directory structure and can be sourced to set any necessary environment variables. @@ -1098,9 +1107,24 @@ Configuring NuttX requires only copying configs///setenv.sh to ${TOPDIR}/setenv.sh configs///defconfig to ${TOPDIR}/.config +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 There is a script that automates these steps. The following steps will accomplish the same configuration: cd tools ./configure.sh / + +And if configs///appconfig exists and your +application directory is not in the standard loction (../apps), then +you should also specify the location of the application directory on the +command line like: + + cd tools + ./configure.sh -a / diff --git a/nuttx/configs/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig new file mode 100755 index 000000000..71883c3fa --- /dev/null +++ b/nuttx/configs/vsn/nsh/appconfig @@ -0,0 +1,40 @@ +############################################################################ +# configs/vsn/nsh/defconfig +# +# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (c) 2011 Uros Platise. All rights reserved. +# Author: Gregory Nutt +# Uros Platise +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +# Add the list of built-in apps needed by this configuration + +CONFIGURED_APPS += hello/.built_always poweroff/.built_always jvm/.built_always diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index 0f9496997..cb6f02c8e 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -139,6 +139,18 @@ CONFIG_STM32_TIM8=n CONFIG_STM32_USART1=y CONFIG_STM32_ADC3=n +# +# STM32 JTAG Options +# +# CONFIG_STM32_JTAG_FULL_ENABLE -- Full JTAG Enable (Parallel and Serial) +# CONFIG_STM32_JTAG_NOJNTRST_ENABLE -- Full but without the JNTRST pin +# CONFIG_STM32_JTAG_SW_ENABLE - Serial (SWJ) dual pin only which, can +# coexist besides the FRAM on SPI3 +# +CONFIG_STM32_JTAG_FULL_ENABLE=n +CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n +CONFIG_STM32_JTAG_SW_ENABLE=n + # # STM32F103Z specific serial device driver settings # @@ -357,7 +369,7 @@ CONFIG_SCHED_WORKPRIORITY=50 CONFIG_SCHED_WORKPERIOD=(50*1000) CONFIG_SCHED_WORKSTACKSIZE=1024 CONFIG_SIG_SIGWORK=4 - +CONFIG_SCHED_WAITPID=y # # The following can be used to disable categories of # APIs supported by the OS. If the compiler supports @@ -725,6 +737,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors # CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint # +CONFIG_EXAMPLES_NSH_BUILTIN_APPS=y CONFIG_EXAMPLES_NSH_FILEIOSIZE=512 CONFIG_EXAMPLES_NSH_STRERROR=n CONFIG_EXAMPLES_NSH_LINELEN=64 @@ -816,52 +829,3 @@ CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_HEAP_BASE= CONFIG_HEAP_SIZE= - - -######################################################################## -# STM32 JTAG Options -# -# Full JTAG Enable (Parallel and Serial) -CONFIG_STM32_JTAG_FULL_ENABLE=n - -# Full but without the JNTRST pin -CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n - -# Serial (SWJ) dual pin only which, can coexist besides the FRAM on SPI3 -CONFIG_STM32_JTAG_SW_ENABLE=n - - -######################################################################## -# -# Applications to be included within the NuttX binary as described -# under the ../apps/README.txt -# -# Set thi config parameter above to: CONFIG_TASK_NAME_SIZE=16 -# In order to enable argv[0]= argument set the option -# CONFIG_TASK_NAME_SIZE=16 -# -# Include builtin NuttX applications (general option) -CONFIG_BUILTIN_APPS_NUTTX=y - -# Invoke the following application after NuttX starts -#CONFIG_BUILTIN_APP_START="hello" - -# Individual selection of built-in applications: - -# Hello world provide a simple skeleton/demo application -CONFIG_BUILTIN_APPS_HELLO=y - -# Provide poweroff command to switch off the board -CONFIG_BUILTIN_APPS_POWEROFF=y - -# Provide JAVA Virtual Machine (the Darjeeling JVM) -CONFIG_BUILTIN_APPS_JVM=n - -# CONFIG_EXAMPLES_NSH_BUILTIN_APPS - Enable invocation of all builtin -# apps from nsh command line. See apps/README for more information. -# -CONFIG_EXAMPLES_NSH_BUILTIN_APPS=y - CONFIG_SCHED_WAITPID=y - -# -######################################################################## -- cgit v1.2.3