diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-23 23:53:03 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-23 23:53:03 +0000 |
| commit | 2bec7f89cc1a4246ef3f0ed18525faef2482419d (patch) | |
| tree | d54d7119d4e7a8f3bd38345602b32526a0ffbdfb /nuttx/configs | |
| parent | 96810b921dd00bb3c235f9eee3b415e05b642f7c (diff) | |
| download | px4-nuttx-2bec7f89cc1a4246ef3f0ed18525faef2482419d.tar.gz px4-nuttx-2bec7f89cc1a4246ef3f0ed18525faef2482419d.tar.bz2 px4-nuttx-2bec7f89cc1a4246ef3f0ed18525faef2482419d.zip | |
Resolve merge conflicts
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1821 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
| -rw-r--r-- | nuttx/configs/eagle100/README.txt | 39 | ||||
| -rw-r--r-- | nuttx/configs/ez80f910200zco/README.txt | 10 |
2 files changed, 31 insertions, 18 deletions
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt index c1b32b950..29c5323bb 100644 --- a/nuttx/configs/eagle100/README.txt +++ b/nuttx/configs/eagle100/README.txt @@ -229,23 +229,26 @@ can be selected as follow: Where <subdir> is one of the following: -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. - -nsh -^^^ - -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. + 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. + + 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: + 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. + +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). diff --git a/nuttx/configs/ez80f910200zco/README.txt b/nuttx/configs/ez80f910200zco/README.txt index 69ec3f91d..8238dab40 100644 --- a/nuttx/configs/ez80f910200zco/README.txt +++ b/nuttx/configs/ez80f910200zco/README.txt @@ -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. |