sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve merge conflicts

Browse Source 
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 44ecaa8789
commit b8f2e53427
4 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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

2
Documentation/NuttX.html
View File

@ -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

31
configs/eagle100/README.txt
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
configs/ez80f910200zco/README.txt
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.