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
+3 -18
View File
@@ -60,17 +60,13 @@ following characteristics:
|-- <config1-dir> |-- <config1-dir>
| |-- Make.defs | |-- Make.defs
| |-- defconfig | |-- defconfig
| |-- appconfig*
| `-- setenv.sh | `-- setenv.sh
|-- <config2-dir> |-- <config2-dir>
| |-- Make.defs | |-- Make.defs
| |-- defconfig | |-- defconfig
| |-- appconfig*
| `-- setenv.sh | `-- setenv.sh
... ...
*optional
Summary of Files 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 (2) to generate include/nuttx/config.h which is included by
most C files in the system. 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 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 the toplevel of the directory structure and can be sourced to set any
necessary environment variables. You will most likely have to customize the 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>/setenv.sh to ${TOPDIR}/setenv.sh
configs/<board-name>/<config-dir>/defconfig to ${TOPDIR}/.config 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 tools/configure.sh
There is a script that automates these steps. The following steps will There is a script that automates these steps. The following steps will
accomplish the same configuration: accomplish the same configuration:
@@ -643,10 +629,9 @@ tools/configure.sh
See tools/README.txt for more information about these scripts. See tools/README.txt for more information about these scripts.
And if configs/<board-name>/<config-dir>/appconfig exists and your And if your application directory is not in the standard loction (../apps
application directory is not in the standard loction (../apps), then or ../apps-<version>), then you should also specify the location of the
you should also specify the location of the application directory on the application directory on the command line like:
command line like:
cd tools cd tools
./configure.sh -a <app-dir> <board-name>/<config-dir> ./configure.sh -a <app-dir> <board-name>/<config-dir>
+4 -4
View File
@@ -1053,11 +1053,11 @@ Where <subdir> is one of the following:
USB serial example at apps/examples/usbterm by changing the USB serial example at apps/examples/usbterm by changing the
following: following:
-CONFIGURED_APPS += examples/usbserial -CONFIG_EXAMPLES_USBSERIAL=y
+CONFIGURED_APPS += examples/usbterm +CONFIG_EXAMPLES_USBSERIAL=n
In either the original appconfig file (before configuring) -CONFIG_EXAMPLES_USBTERM=n
or in the final apps/.config file (after configuring). +CONFIG_EXAMPLES_USBTERM=y
usbmsc: usbmsc:
------- -------
+22 -25
View File
@@ -933,18 +933,16 @@ Where <subdir> is one of the following:
CONFIG_CAN_REGDEBUG CONFIG_CAN_REGDEBUG
6. This example can support an FTP client. In order to build in FTP client 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 support simply reconfigure NuttX, adding:
configuring) or in the apps/.config file (after configuring):
#CONFIGURED_APPS += netutils/ftpc CONFIG_NETUTILS_FTPC=y
#CONFIGURED_APPS += examples/ftpc CONFIG_EXAMPLES_FTPC=y
7. This example can support an FTP server. In order to build in FTP server 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 support simply add the following lines in the NuttX configuration file:
configuring) or in the apps/.config file (after configuring):
#CONFIGURED_APPS += netutils/ftpd CONFIG_NETUTILS_FTPD=y
#CONFIGURED_APPS += examples/ftpd CONFIG_EXAMPLES_FTPD=y
And enable poll() support in the NuttX configuration file: And enable poll() support in the NuttX configuration file:
@@ -968,32 +966,31 @@ Where <subdir> is one of the following:
9. Adding LCD and graphics support: 9. Adding LCD and graphics support:
appconfig (apps/.config): Enable the application configurations that you Enable the application configurations that you want to use. As examples:
want to use. Asexamples:
CONFIGURED_APPS += examples/nx : Pick one or more CONFIG_EXAMPLES_NX=y : Pick one or more
CONFIGURED_APPS += examples/nxhello : CONFIG_EXAMPLES_NXHELLO=y :
CONFIGURED_APPS += examples/nximage : CONFIG_EXAMPLES_NXIMAGE=y :
CONFIGURED_APPS += examples/nxlines : CONFIG_EXAMPLES_NXLINES=y :
defconfig (nuttx/.config): defconfig (nuttx/.config):
CONFIG_STM32_FSMC=y : FSMC support is required for the LCD CONFIG_STM32_FSMC=y : FSMC support is required for the LCD
CONFIG_NX=y : Enable graphics suppport CONFIG_NX=y : Enable graphics suppport
CONFIG_MM_REGIONS=2 : When FSMC is enabled, so is the on-board SRAM memory region CONFIG_MM_REGIONS=2 : When FSMC is enabled, so is the on-board SRAM memory region
10. USB OTG FS Device or Host Support 10. USB OTG FS Device or Host Support
CONFIG_USBDEV - Enable USB device support, OR CONFIG_USBDEV : Enable USB device support, OR
CONFIG_USBHOST - Enable USB host support (but not both) CONFIG_USBHOST : Enable USB host support (but not both)
CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block CONFIG_STM32_OTGFS : Enable the STM32 USB OTG FS block
CONFIG_STM32_SYSCFG - Needed for all USB OTF FS support 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). storage class (both host and device).
CONFIG_NSH_ARCHINIT - Architecture specific USB initialization CONFIG_NSH_ARCHINIT : Architecture specific USB initialization
is needed is needed
11. This configuration requires that jumper JP22 be set to enable RS-232 operation. 11. This configuration requires that jumper JP22 be set to enable RS-232 operation.
+7 -6
View File
@@ -691,8 +691,8 @@ Where <subdir> is one of the following:
System Type -> PIC32MX Peripheral Support: System Type -> PIC32MX Peripheral Support:
CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support
examples/usbterm - This option can be enabled by uncommenting examples/usbterm - This option can be enabled by adding the following
the following line in the appconfig file: to the NuttX configuration file:
Application Configuration->Examples: Application Configuration->Examples:
CONFIG_EXAMPLES_USBTERM=y : Selects /apps/examples/usbterm 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) CONFIG_CDCACM=y : or the CDC/ACM serial driver (not both)
system/cdcacm - The system/cdcacm program can be included as an 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: Application Configuration->Examples:
CONFIG_SYSTEM_CDCACM=y : Select apps/system/cdcacm CONFIG_SYSTEM_CDCACM=y : Select apps/system/cdcacm
@@ -714,9 +714,10 @@ Where <subdir> is one of the following:
Drivers->USB Device Driver Support Drivers->USB Device Driver Support
CONFIG_CDCACM=y : Enable the CDCACM device CONFIG_CDCACM=y : Enable the CDCACM device
system/usbmsc - There are some hooks in the appconfig file system/usbmsc - To enable the USB mass storage class (MSC)device,
to enable the USB mass storage class (MSC)device. However, this device you would need to add the following to the NuttX configuration file.
cannot work until support for the SD card is also incorporated. However, this device cannot work until support for the SD card is
also incorporated.
Drivers->USB Device Driver Support Drivers->USB Device Driver Support
CONFIG_USBMSC=y : Enables the USB MSC class CONFIG_USBMSC=y : Enables the USB MSC class