Updated for 0.2.4 releasenuttx-2.4

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@192 42af7a65-404d-4744-a932-0658087f49c3

6 files changed, 111 insertions, 26 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index a97a6648d..32d3a665e 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -111,7 +111,7 @@
 	  pthread_join.  In the failure condition, memory was being
 	  deallocated while still in use.
 
-0.2.4 2007-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
+0.2.4 2007-04-28 Gregory Nutt <spudmonkey@racsa.co.cr>
 
 	* Verfied c5471 build under Cygwin on WinXP
 	* Makesystem changes to better support different SoCs.
@@ -120,4 +120,7 @@
 	* Logic from arch/c5471 and arch/dm320 combined into arch/arm.
 	  arch/c5471 and arch/dm320 are deprecated and will be removed
 	  when the new c5471 and dm320 logic is verified.
+
+0.2.5 2007-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
+
 	* Started m68322
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 52cc244cb..bcfcf34f1 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -180,7 +180,7 @@
 </table>
 
 <p>
-   The sixth release of NuttX (nuttx-0.2.3) is available for download
+   The seventh release of NuttX (nuttx-0.2.4) is available for download
    from the <a href="http://sourceforge.net/project/showfiles.php?group_id=189573">SourceForge</a>
    website.
 </p>
@@ -472,9 +472,18 @@ Other memory:
 	  pthread_join.  In the failure condition, memory was being
 	  deallocated while still in use.
 
-0.2.4 2007-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
+0.2.4 2007-04-28 Gregory Nutt <spudmonkey@racsa.co.cr>
 
 	* Verfied c5471 build under Cygwin on WinXP
+	* Makesystem changes to better support different SoCs.
+	* Made arch/c5471/include and arch/dm320/include identical in
+	  preparation for merging into arch/arm
+	* Logic from arch/c5471 and arch/dm320 combined into arch/arm.
+	  arch/c5471 and arch/dm320 are deprecated and will be removed
+	  when the new c5471 and dm320 logic is verified.
+
+0.2.5 2007-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
+
 	* Started m68322
 </pre></ul>
 
diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes
index 009535b5a..57ed2aab0 100644
--- a/nuttx/ReleaseNotes
+++ b/nuttx/ReleaseNotes
@@ -1,18 +1,20 @@
-nuttx-0.2.3
+nuttx-0.2.4
 ^^^^^^^^^^^^
 
-This is the sixth release of NuttX.  This release is primarily
-a bugfix release.  Numerous problems were fixed as detailed
-in the change log.  New functionaliy includes support for
-timed messsage queues.
+This is the 7th release of NuttX.  This release is only to roll out
+build changes to better support different SoC's that use the same
+processor architecture.  In particular, the two existing ARM architectures,
+c5471 and DM320 were combined into a single ARM directory.  This was done
+in preparation for an LPC2148 port that is currently in progress.  There
+is NO new functionality or significant bufixes in this release.
 
 See the ChangeLog for a complete list of changes.
 
 This release has been verified on the Linux user-mode platform
 and the Neuros OSD using the test program under examples/ostest.
 The results of the testing is available in the source tree under
-configs/ntosd-dm320/doc/test-results. There are no known,
-critical defects but the project development status remains at
-'beta' status pending further test and evaluation.
+configs/ntosd-dm320/doc/test-results and under configs/sim/doc/test-results.
+There are no known, critical defects but the project development status
+remains at 'beta' status pending further test and evaluation.
 
-This tarball contains a complete CVS snapshot from March 29, 2007.
+This tarball contains a complete CVS snapshot from April 28, 2007.
diff --git a/nuttx/configs/ntosd-dm320/doc/README.txt b/nuttx/configs/ntosd-dm320/doc/README.txt
new file mode 100644
index 000000000..dd4790841
--- /dev/null
+++ b/nuttx/configs/ntosd-dm320/doc/README.txt
@@ -0,0 +1,67 @@
+NuttX on the Neuros Technology OSD
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+References:
+^^^^^^^^^^^
+
+http://wiki.neurostechnology.com/index.php/Main_Page
+http://wiki.neurostechnology.com/index.php/OSD_Developer_Home
+http://wiki.neurostechnology.com/index.php/DM320_Platform_development
+http://wiki.neurostechnology.com/index.php/The_Neuros_and_Open_Source
+...
+
+Status:
+^^^^^^^
+
+At present, the system only supports a serial console and timer
+interrupts so there is not to much that you can do with it.  But I
+would be happy to work with anyone who is interested in using it.
+
+General instructions.
+
+1. Download build-0.1.0.tar.gz and nuttx-0.2.3.tar.gz into the same
+   <directory>.  These are the current versions as of this writing
+   (but could very well new older release now).
+
+2. Unpack, you should now have <directory>/buildroot and
+   <directory>/nuttx-0.2.3
+
+3. Rename nuttx-0.2.3 to nuttx
+
+4. Configure NuttX:
+
+   cd <directory>/nuttx/tools
+  ./configure.sh ntosd-dm320
+
+5. Build the toolchain:
+
+  cd <directory>/buildroot
+  cp configs/c5471-defconfig .config
+  make oldconfig
+  make
+
+6. Build Nuttx:
+
+  cd <directory>nuttx
+  . ./setenv.sh
+  make
+  mv nuttx /tftpboot/nuttx.dm320
+
+7. Configure the OSD u-boot:
+
+   Neuros Devboard > set ipaddr yy.yy.yy.yy
+   Neuros Devboard > set serverip xx.xx.xx.xx
+   Neuros Devboard > ...
+   Neuros Devboard > run update-ipstatic
+
+   where yy.yy.yy.yy is the OSD IP address and xx.xx.xx.xx is
+   the host PC address.
+
+8. Load and run nuttx from uboot
+
+  tftpboot xx.xx.xx.xx nuttx.dm320
+  go 1008000
+
+What will run is an a simple OS test that will verify many of the
+features of the OS.  (this is nutts/examples/ostest).
+
diff --git a/nuttx/configs/ntosd-dm320/doc/test-result.txt b/nuttx/configs/ntosd-dm320/doc/test-result.txt
index 9179df8c8..6b295e495 100644
--- a/nuttx/configs/ntosd-dm320/doc/test-result.txt
+++ b/nuttx/configs/ntosd-dm320/doc/test-result.txt
@@ -1,16 +1,16 @@
-This is the output from running examples/ostest on March 28, 2007
+This is the output from running examples/ostest on April 28, 2007
 =================================================================
 
-Neuros Devboard >  tftpboot 10.0.0.1 nuttx.dm320
+Neuros Devboard >  tftpboot 192.168.0.100 nuttx.dm320
 Found DM9000 ID:90000a46 at address 60000300 !
 DM9000 work in 16 bus width
 [eth_init]MAC:0:18:11:80:10:6:
-TFTP from server 10.0.0.1; our IP address is 10.0.0.2
+TFTP from server 192.168.0.100; our IP address is 192.168.0.101
 Filename 'nuttx.dm320'.
-Load address: 0x10
+Load address: 0x1000000
 Loading: #############################
 done
-Bytes transferred = 146570 (23c8a hex)
+Bytes transferred = 146617 (23cb9 hex)
 Neuros Devboard >  go 1008000
 ## Starting application at 0x01008000 ...
 stdio_test: write fd=1
@@ -53,9 +53,9 @@ user_main: mutex test
 Initializing mutex
 Starting thread 1
 Starting thread 2
-                Thread1 Thread2
-        Loops   32      32
-        Errors  0       0
+		Thread1	Thread2
+	Loops	32	32
+	Errors	0	0
 
 End of test memory usage:
 VARIABLE  BEFORE   AFTER
@@ -170,10 +170,10 @@ cond_test: Set thread 2 priority to 64
 thread_signaler: Started
 thread_signaler: Terminating
 cond_test: signaler terminated, now cancel the waiter
-cond_test:      Waiter  Signaler
-cond_test: Loops        32      32
-cond_test: Errors       0       0
-cond_test:
+cond_test: 	Waiter	Signaler
+cond_test: Loops	32	32
+cond_test: Errors	0	0
+cond_test: 
 0 times, waiter did not have to wait for data
 cond_test: 0 times, data was already available when the signaler run
 cond_test: 0 times, the waiter was in an unexpected state when the signaler ran
@@ -375,10 +375,10 @@ uordblks     53f0     53f0
 fordblks   fdbb20   fdbb20
 
 user_main: round-robin scheduler test
-rr_test: Starting sieve1 thread
+rr_test: Starting sieve1 thread 
 rr_test: Set thread priority to 1
 rr_test: Set thread policty to SCHED_RR
-rr_test: Starting sieve1 thread
+rr_test: Starting sieve1 thread 
 sieve1 started
 sieve1 finished
 rr_test: Waiting for sieves to complete -- this should take awhile
diff --git a/nuttx/tools/zipme.sh b/nuttx/tools/zipme.sh
index 8b2f6b3ee..dc2636d94 100755
--- a/nuttx/tools/zipme.sh
+++ b/nuttx/tools/zipme.sh
@@ -47,6 +47,10 @@ GARBAGEDIRS="\
   configs/m68332evb/src/src\
   configs/m68332evb/src/include\
   configs/m68332evb/src/doc\
+  configs/sim/doc/include\
+  configs/sim/doc/src\
+  arch/c5471\
+  arch/dm320
 "
 
 # Make sure we know what is going on