# HG changeset patch
# User jld
# Date 1048148330 0
# Node ID c043b17d4bec548c232d1cc8fc2ef808ab0d822e
# Parent  117841263956fbaf4af5e16f8086adb5f2fbad5e
* doc/redboot_installing.sgml: Merge AT91EB40 RedBoot installation
  instructions update from the trunk.

diff --git a/packages/redboot/current/ChangeLog b/packages/redboot/current/ChangeLog
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-19  John Dallaway  <jld@ecoscentric.com>
+
+	* doc/redboot_installing.sgml: Update Atmel AT91EB40 RedBoot
+	installation instructions.
+
 2003-02-24  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* doc/redboot.sgml: De-vendorise a little.
@@ -611,14 +616,14 @@ 2002-03-05  Jesper Skov  <jskov@redhat.c
 	Updated edb7312 details.
 
 2002-03-05  Gary Thomas  <gthomas@redhat.com>
-2002-02-25  Hendrik Ruijter  <Hendrik.Ruijter@axis.com>
+2002-02-25 Hendrik Ruijter <Hendrik.Ruijter@axis.com>
 
 	* include/net/net.h: Add 'reuse' flag.
 
 	* src/net/tcp.c 
 	(tcp_send): Adjust socket close time to allow for faster re-use.
-	(__tcp_handler): State transitions to TIME_WAIT on active close 
-	when FIN,ACK received simultaneously.
+	(__tcp_handler): Statetransitions to TIME_WAIT on active close 
+	when FIN,ACK receivedsimultaneously.
 	(__tcp_so_reuseaddr): New function - select fast re-use.
 
 2002-03-05  Jesper Skov  <jskov@redhat.com>
diff --git a/packages/redboot/current/doc/redboot_installing.sgml b/packages/redboot/current/doc/redboot_installing.sgml
--- a/packages/redboot/current/doc/redboot_installing.sgml
+++ b/packages/redboot/current/doc/redboot_installing.sgml
@@ -788,9 +788,8 @@ installing and testing</primary><seconda
 The default serial port settings are 38400,8,N,1. RedBoot
 also supports minimal flash management on the EB40.
 However, since the flash device (AT29LV1024) is so small (only the upper 64K is
-available for general use), only 'fconfig' is
-supported, along with the simple flash write command, 'fis
-write'.</para>
+available for general use), only the simple flash write command 'fis
+write' is supported.</para>
 
 <para>The following RedBoot configurations are supported:
 
@@ -844,11 +843,11 @@ it has been installed.
 <para>
 Set SW1 to "lower mem" and connect serial port A to a host computer.  Using GDB
 from the host and Angel on the board, download the RAM mode image of RedBoot
-to the board.  Once this is started, the Angel session must be interrupted (on
+to the board. SW1 should then be set to "upper mem" just before starting RedBoot using
+the 'cont' command. Once RedBoot is started, the Angel session must be interrupted (on
 Linux this can be done using ^Z).  Follow this by connecting to the board using
 minicom at 38400-8N1.  At this point, RedBoot will be running on the board in
-RAM.  Now, download the ROMRAM mode image and program it to flash.  Be sure and
-first set SW1 to "upper mem".
+RAM.  Now, download the ROMRAM mode image and program it to flash.
 <screen>
 <userinput>arm-elf-gdb redboot_RAM.elf</userinput>
 (gdb) <userinput>tar rdi s=/dev/ttyS0</userinput>
@@ -857,7 +856,7 @@ AT91EB40 (2.00)
 Angel Debug Monitor rebuilt on Apr 07 2000 at 12:40:31
 Serial Rate:   9600
 Connected to ARM RDI target.
-(gdb) <userinput>set $ps=0xd3</userinput>
+(gdb) <userinput>set $cpsr=0xd3</userinput>
 (gdb) <userinput>load</userinput>
 Loading section .rom_vectors, size 0x40 lma 0x2020000
 Loading section .text, size 0x7fd8 lma 0x2020040
@@ -865,6 +864,9 @@ Loading section .rodata, size 0x15a0 lma
 Loading section .data, size 0x2e4 lma 0x20295b8
 Start address 0x2020040 , load size 39068
 Transfer rate: 6250 bits/sec, 500 bytes/write.
+</screen>
+At this point, set SW1 to "upper mem".
+<screen>
 (gdb) <userinput>cont</userinput>
 Continuing.
 </screen>
@@ -886,9 +888,9 @@ RedBoot> <userinput>load -m ymodem -b %{
 </screen>
 Use minicom to send the file redboot_ROMRAM.srec via YModem.
 <screen>
-RedBoot> <userinput>fi wr -f 0x01010000 -b %{FREEMEMLO} -l 0xe000</userinput>
+RedBoot> <userinput>fi wr -f 0x01010000 -b %{FREEMEMLO} -l 0xe100</userinput>
 </screen>
-Set switch SW1 to "upper mem", press the "reset" pushbutton and RedBoot
+Press the "reset" pushbutton and RedBoot
 should come up on the board.
 </para>
 </sect2>