From b8f2e53427f298683d7ff246f336196c87fa5e60 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 23 May 2009 23:53:03 +0000 Subject: [PATCH] Resolve merge conflicts git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1821 42af7a65-404d-4744-a932-0658087f49c3 --- ChangeLog | 2 ++ Documentation/NuttX.html | 2 ++ configs/eagle100/README.txt | 31 +++++++++++++++++-------------- configs/ez80f910200zco/README.txt | 10 ++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f0d3d7f56..0c3fbe37bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -728,6 +728,8 @@ * configs/eagle100/nettest: Added an examples/nettest configuration for the Micromint Eagle100 board. * Documentation/NuttxPortingGuide.html: Added a section on NuttX device drivers. + * configs/eagle100/httpd: Added an examples/uip configuration for the + Micromint Eagle100 board. * arch/arm/src/lm3s: Added an SSI driver for the LM3S6918 * examples/nsh: Added MMC/SD support for the LM3S6918 diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 8f4d62a083..432ba4e7a5 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -1418,6 +1418,8 @@ nuttx-0.4.7 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * configs/eagle100/nettest: Added an examples/nettest configuration for the Micromint Eagle100 board. * Documentation/NuttxPortingGuide.html: Added a section on NuttX device drivers. + * configs/eagle100/httpd: Added an examples/uip configuration for the + Micromint Eagle100 board. * arch/arm/src/lm3s: Added an SSI driver for the LM3S6918 * examples/nsh: Added MMC/SD support for the LM3S6918 diff --git a/configs/eagle100/README.txt b/configs/eagle100/README.txt index c1b32b950f..29c5323bb0 100644 --- a/configs/eagle100/README.txt +++ b/configs/eagle100/README.txt @@ -229,23 +229,26 @@ can be selected as follow: Where 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). diff --git a/configs/ez80f910200zco/README.txt b/configs/ez80f910200zco/README.txt index 69ec3f91db..8238dab40f 100644 --- a/configs/ez80f910200zco/README.txt +++ b/configs/ez80f910200zco/README.txt @@ -61,6 +61,16 @@ Where 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.