mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 00:14:22 +08:00
Resolve merge conflicts
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1821 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
+17
-14
@@ -229,23 +229,26 @@ can be selected as follow:
|
||||
|
||||
Where <subdir> is one of the following:
|
||||
|
||||
nettest
|
||||
^^^^^^^
|
||||
nettest:
|
||||
This configuration directory may be used to enable networking using the
|
||||
LM3S6918's Ethernet controller. It uses examples/nettest to excercise the
|
||||
TCP/IP network.
|
||||
|
||||
This configuration directory may be used to enable networking using the
|
||||
LM3S6918's Ethernet controller. It uses examples/nettest to excercise the
|
||||
TCP/IP network.
|
||||
httpd:
|
||||
This builds the uIP web server example using the examples/uip application
|
||||
(for execution from FLASH). See examples/README.txt for information
|
||||
about ostest.
|
||||
|
||||
nsh
|
||||
^^^
|
||||
nsh:
|
||||
Configures the NuttShell (nsh) located at examples/nsh. The
|
||||
Configuration enables both the serial and telnetd NSH interfaces.
|
||||
|
||||
Configures the NuttShell (nsh) located at examples/nsh. The
|
||||
Configuration enables both the serial and telnetd NSH interfaces.
|
||||
ostest:
|
||||
This configuration directory, performs a simple OS test using
|
||||
examples/ostest.
|
||||
|
||||
ostest
|
||||
^^^^^^
|
||||
|
||||
This configuration directory, performs a simple OS test using
|
||||
examples/ostest.
|
||||
By default, all of these examples are built to be used with the Luminary
|
||||
Ethernet Bootloader (you can change the ld.script file in any of these
|
||||
sub-directories to change that configuration).
|
||||
|
||||
|
||||
|
||||
@@ -61,6 +61,16 @@ Where <sub-directory> is the specific board configuration that you
|
||||
wish to build. The following board-specific configurations are
|
||||
available:
|
||||
|
||||
dhcpd:
|
||||
This builds the DCHP server using the examples/dhcpd application
|
||||
(for execution from FLASH.) See examples/README.txt for information
|
||||
about ostest.
|
||||
|
||||
httpd:
|
||||
This builds the uIP web server example using the examples/uip application
|
||||
(for execution from FLASH). See examples/README.txt for information
|
||||
about ostest.
|
||||
|
||||
ostest
|
||||
This builds the examples/ostest application for execution from FLASH.
|
||||
See examples/README.txt for information about ostest.
|
||||
|
||||
Reference in New Issue
Block a user