diff --git a/README.txt b/README.txt index 7865b6eb4..067852494 100644 --- a/README.txt +++ b/README.txt @@ -168,9 +168,9 @@ A: Here are three: You can copy any pieces that you like from the old apps/directory to your custom apps directory as necessary. - This is documented in NuttX/configs/README.txt and + This is documented in NuttX/boards/README.txt and nuttx/Documentation/NuttxPortingGuide.html (Online at - https://bitbucket.org/nuttx/documentation/src/master/NuttxPortingGuide.html#apndxconfigs + https://bitbucket.org/nuttx/nuttx/src/master/Documentation/NuttxPortingGuide.html#apndxconfigs under Build options). And in the apps/README.txt file. 3) If you like the random collection of stuff in the apps/ directory @@ -212,7 +212,7 @@ A: Here are three: installs a custom application, configuration, and board specific directory: - a) Copy 'MyBoard' directory to configs/MyBoard. + a) Copy 'MyBoard' directory to boards/MyBoard. b) Add a symbolic link to MyApplication at apps/external c) Configure NuttX (usually by: diff --git a/examples/README.txt b/examples/README.txt index 021df0814..603899045 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -5,7 +5,7 @@ examples The examples directory contains several sample applications that can be linked with NuttX. The specific example is selected in the - configs//defconfig file via the CONFIG_EXAMPLES_xyz + boards//defconfig file via the CONFIG_EXAMPLES_xyz setting where xyz is the name of the example. For example, CONFIG_EXAMPLES_HELLO=y @@ -411,7 +411,7 @@ examples/ft80x This examples has ports of several FTDI demos for the FTDI/BridgeTek FT80x GUI chip. As an example configuration, see - nuttx/configs/viewtool-stm32f107/ft80x/defconfig. + nuttx/boards/viewtool-stm32f107/ft80x/defconfig. examples/ftpc ^^^^^^^^^^^^^ @@ -1738,7 +1738,7 @@ examples/thttpd ^^^^^^^^^^^^^^^ An example that builds netutils/thttpd with some simple NXFLAT - CGI programs. see configs/README.txt for most THTTPD settings. + CGI programs. see boards/README.txt for most THTTPD settings. In addition to those, this example accepts: CONFIG_EXAMPLES_THTTPD_NOMAC - (May be defined to use software assigned MAC) @@ -1888,7 +1888,7 @@ examples/unionfs CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_B - ROMFS file system 2 RAM disk device number CONFIG_EXAMPLES_UNIONFS_SECTORSIZE - ROM disk sector size. - See the README.txt file at nuttx/configs/sim/README.txt for a walk-through of + See the README.txt file at nuttx/boards/sim/README.txt for a walk-through of the output of this text. examples/usbserial diff --git a/examples/watchdog/Kconfig b/examples/watchdog/Kconfig index 7adea1481..05c1fb4ab 100644 --- a/examples/watchdog/Kconfig +++ b/examples/watchdog/Kconfig @@ -11,7 +11,7 @@ config EXAMPLES_WATCHDOG In order to use this example, board specific logic must register the watchdog timer driver. That would be in the board bring-up logic - in the configs//src directory for the board. + in the boards//src directory for the board. The way that this is done depends on the underlying MCU architecture. For STM32, this would be done like: diff --git a/nshlib/Kconfig b/nshlib/Kconfig index a2980ed96..6d2ae2e22 100644 --- a/nshlib/Kconfig +++ b/nshlib/Kconfig @@ -806,8 +806,8 @@ config NSH_ARCHROMFS ---help--- Enable this option to provide an architecture-specific ROMFS header at arch//nsh_romfsimg.h. Note that this header - will be linked (or copied) from nuttx/configs//include - and should be stored at that location in the nuttx configs/ + will be linked (or copied) from nuttx/boards//include + and should be stored at that location in the nuttx boards/ sub-directory. config NSH_CUSTOMROMFS diff --git a/nshlib/README.txt b/nshlib/README.txt index 8909dc736..2565f48f9 100644 --- a/nshlib/README.txt +++ b/nshlib/README.txt @@ -252,9 +252,9 @@ NOTE: apps/nshlib/rcS.template generates the standard, default nsh_romfsimg.h file. If CONFIG_NSH_ARCHROMFS is defined in the NuttX configuration file, then a custom, board-specific - nsh_romfsimg.h file residing in configs//include will be + nsh_romfsimg.h file residing in boards//include will be used. NOTE when the OS is configured, include/arch/board will - be linked to configs//include. + be linked to boards//include. All of the startup-behavior is contained in rcS.template. The role of mkromfsimg.sh is to (1) apply the specific configuration @@ -1544,7 +1544,7 @@ NSH-Specific Configuration Settings ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The behavior of NSH can be modified with the following settings in - the configs//defconfig file: + the boards//defconfig file: * CONFIG_NSH_READLINE Selects the minimal implementation of readline(). This minimal diff --git a/nshlib/nsh.h b/nshlib/nsh.h index 440735bcc..912a3a6e7 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -517,7 +517,7 @@ #endif /* The size of the I/O buffer may be specified in the - * configs/defconfig file -- provided that it is at least as + * boards/defconfig file -- provided that it is at least as * large as PATH_MAX. */ diff --git a/system/usbmsc/README.txt b/system/usbmsc/README.txt index 23c3ae6b2..1ec8d02c4 100644 --- a/system/usbmsc/README.txt +++ b/system/usbmsc/README.txt @@ -11,8 +11,8 @@ system/usbmsc boarctl BOARDIOC_USBDEV_CONTROL command in order to do the actual registration of the block device drivers. For examples of the implementation of board_usbmsc_initialize() see - configs/mcu123-lpc124x/src/up_usbmsc.c or - configs/stm3210e-eval/src/usbmsc.c + boards/mcu123-lpc124x/src/up_usbmsc.c or + boards/stm3210e-eval/src/usbmsc.c Configuration options: diff --git a/system/zmodem/README.txt b/system/zmodem/README.txt index b626acbef..847b256ec 100644 --- a/system/zmodem/README.txt +++ b/system/zmodem/README.txt @@ -210,7 +210,7 @@ Status ====== 2013-7-15: Testing against the Linux rz/sz commands. - I have tested with the configs/olimex-lpc1766stk configuration. I + I have tested with the boards/olimex-lpc1766stk configuration. I have been able to send large and small files with the target sz command. I have been able to receive small files, but there are problems receiving large files using the Linux sz command: The diff --git a/testing/README.txt b/testing/README.txt index bfce4f562..a876f8647 100644 --- a/testing/README.txt +++ b/testing/README.txt @@ -81,7 +81,7 @@ testing/ostest as of this writing, but it is used to qualify each NuttX release. The behavior of the ostest can be modified with the following - settings in the configs//defconfig file: + settings in the boards//defconfig file: * CONFIG_NSH_BUILTIN_APPS Build the OS test example as an NSH built-in application. diff --git a/tools/mkkconfig.bat b/tools/mkkconfig.bat index fca5597f7..61dffcada 100755 --- a/tools/mkkconfig.bat +++ b/tools/mkkconfig.bat @@ -119,7 +119,7 @@ Echo Menu description Echo -o ^: Echo Identifies the specific configuratin for the selected ^. Echo This must correspond to a sub-directory under the board directory at -Echo under nuttx/configs/^/. +Echo under nuttx/boards/^/. Echo ^<-h^>: Echo Prints this message and exits.