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:
patacongo
2009-05-23 23:53:03 +00:00
parent 6c6269f5e2
commit ad228723c0
2 changed files with 27 additions and 14 deletions
+17 -14
View File
@@ -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).
+10
View File
@@ -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.