Support for the older, manual configurations has been completely removed from the NuttX build system

This commit is contained in:
Gregory Nutt 2014-03-06 13:00:50 -06:00
parent 7050b91155
commit 283d71032a
4 changed files with 36 additions and 53 deletions

View File

@ -60,17 +60,13 @@ following characteristics:
|-- <config1-dir>
| |-- Make.defs
| |-- defconfig
| |-- appconfig*
| `-- setenv.sh
|-- <config2-dir>
| |-- Make.defs
| |-- defconfig
| |-- appconfig*
| `-- setenv.sh
...
*optional
Summary of Files
^^^^^^^^^^^^^^^^
@ -132,10 +128,6 @@ defconfig -- This is a configuration file similar to the Linux
(2) to generate include/nuttx/config.h which is included by
most C files in the system.
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. You will most likely have to customize the
@ -622,12 +614,6 @@ Configuring NuttX requires only copying
configs/<board-name>/<config-dir>/setenv.sh to ${TOPDIR}/setenv.sh
configs/<board-name>/<config-dir>/defconfig to ${TOPDIR}/.config
And if configs/<board-name>/<config-dir>/appconfig exists in the board
configuration directory:
Copy configs/<board-name>/<config-dir>/appconfig to <app-dir>/.config
echo "APPS_LOC=\"<app-dir>\"" >> "${TOPDIR}/.config"
tools/configure.sh
There is a script that automates these steps. The following steps will
accomplish the same configuration:
@ -643,10 +629,9 @@ tools/configure.sh
See tools/README.txt for more information about these scripts.
And if configs/<board-name>/<config-dir>/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:
And if your application directory is not in the standard loction (../apps
or ../apps-<version>), then you should also specify the location of the
application directory on the command line like:
cd tools
./configure.sh -a <app-dir> <board-name>/<config-dir>

View File

@ -1053,11 +1053,11 @@ Where <subdir> is one of the following:
USB serial example at apps/examples/usbterm by changing the
following:
-CONFIGURED_APPS += examples/usbserial
+CONFIGURED_APPS += examples/usbterm
-CONFIG_EXAMPLES_USBSERIAL=y
+CONFIG_EXAMPLES_USBSERIAL=n
In either the original appconfig file (before configuring)
or in the final apps/.config file (after configuring).
-CONFIG_EXAMPLES_USBTERM=n
+CONFIG_EXAMPLES_USBTERM=y
usbmsc:
-------

View File

@ -933,18 +933,16 @@ Where <subdir> is one of the following:
CONFIG_CAN_REGDEBUG
6. This example can support an FTP client. In order to build in FTP client
support simply uncomment the following lines in the appconfig file (before
configuring) or in the apps/.config file (after configuring):
support simply reconfigure NuttX, adding:
#CONFIGURED_APPS += netutils/ftpc
#CONFIGURED_APPS += examples/ftpc
CONFIG_NETUTILS_FTPC=y
CONFIG_EXAMPLES_FTPC=y
7. This example can support an FTP server. In order to build in FTP server
support simply uncomment the following lines in the appconfig file (before
configuring) or in the apps/.config file (after configuring):
support simply add the following lines in the NuttX configuration file:
#CONFIGURED_APPS += netutils/ftpd
#CONFIGURED_APPS += examples/ftpd
CONFIG_NETUTILS_FTPD=y
CONFIG_EXAMPLES_FTPD=y
And enable poll() support in the NuttX configuration file:
@ -968,13 +966,12 @@ Where <subdir> is one of the following:
9. Adding LCD and graphics support:
appconfig (apps/.config): Enable the application configurations that you
want to use. Asexamples:
Enable the application configurations that you want to use. As examples:
CONFIGURED_APPS += examples/nx : Pick one or more
CONFIGURED_APPS += examples/nxhello :
CONFIGURED_APPS += examples/nximage :
CONFIGURED_APPS += examples/nxlines :
CONFIG_EXAMPLES_NX=y : Pick one or more
CONFIG_EXAMPLES_NXHELLO=y :
CONFIG_EXAMPLES_NXIMAGE=y :
CONFIG_EXAMPLES_NXLINES=y :
defconfig (nuttx/.config):
@ -984,15 +981,15 @@ Where <subdir> is one of the following:
10. USB OTG FS Device or Host Support
CONFIG_USBDEV - Enable USB device support, OR
CONFIG_USBHOST - Enable USB host support (but not both)
CONFIG_USBDEV : Enable USB device support, OR
CONFIG_USBHOST : Enable USB host support (but not both)
CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block
CONFIG_STM32_SYSCFG - Needed for all USB OTF FS support
CONFIG_STM32_OTGFS : Enable the STM32 USB OTG FS block
CONFIG_STM32_SYSCFG : Needed for all USB OTF FS support
CONFIG_SCHED_WORKQUEUE - Worker thread support is required for the mass
CONFIG_SCHED_WORKQUEUE : Worker thread support is required for the mass
storage class (both host and device).
CONFIG_NSH_ARCHINIT - Architecture specific USB initialization
CONFIG_NSH_ARCHINIT : Architecture specific USB initialization
is needed
11. This configuration requires that jumper JP22 be set to enable RS-232 operation.

View File

@ -691,8 +691,8 @@ Where <subdir> is one of the following:
System Type -> PIC32MX Peripheral Support:
CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support
examples/usbterm - This option can be enabled by uncommenting
the following line in the appconfig file:
examples/usbterm - This option can be enabled by adding the following
to the NuttX configuration file:
Application Configuration->Examples:
CONFIG_EXAMPLES_USBTERM=y : Selects /apps/examples/usbterm
@ -704,7 +704,7 @@ Where <subdir> is one of the following:
CONFIG_CDCACM=y : or the CDC/ACM serial driver (not both)
system/cdcacm - The system/cdcacm program can be included as an
function by uncommenting the following line in the appconfig file:
function by dding the following to the NuttX configuration file:
Application Configuration->Examples:
CONFIG_SYSTEM_CDCACM=y : Select apps/system/cdcacm
@ -714,9 +714,10 @@ Where <subdir> is one of the following:
Drivers->USB Device Driver Support
CONFIG_CDCACM=y : Enable the CDCACM device
system/usbmsc - There are some hooks in the appconfig file
to enable the USB mass storage class (MSC)device. However, this device
cannot work until support for the SD card is also incorporated.
system/usbmsc - To enable the USB mass storage class (MSC)device,
you would need to add the following to the NuttX configuration file.
However, this device cannot work until support for the SD card is
also incorporated.
Drivers->USB Device Driver Support
CONFIG_USBMSC=y : Enables the USB MSC class