--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-15  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* doc/redboot_installing.sgml (AT91): Tell users to switch JP1
+	(or SW1 for EB40) when installing, and warn them in no
+	uncertain terms the consequences of failing to do so.
+
 2003-07-01  Mark Salter  <msalter@redhat.com>
 
 	* cdl/redboot.cdl (CYGBLD_BUILD_REDBOOT_WITH_MCOPY): New option.

--- a/packages/redboot/current/doc/redboot_installing.sgml
+++ b/packages/redboot/current/doc/redboot_installing.sgml
@@ -887,6 +887,11 @@ Start address 0x2020040 , load size 3906
 Transfer rate: 6250 bits/sec, 500 bytes/write.
 </screen>
 At this point, set SW1 to <literal>upper mem</literal>.
+<warning><title>Warning!</title><para>Failure to set SW1 to
+<literal>upper mem</literal> will cause the installation of RedBoot
+to overwrite Angel, thus making the board <emphasis>unbootable</emphasis>.
+Only hardware JTAG can restore the board once in this state.
+</para></warning>
 <screen>
 (gdb) <userinput>cont</userinput>
 Continuing.
@@ -953,7 +958,14 @@ Transfer rate: 6264 bits/sec, 500 bytes/
 (gdb) <userinput>cont</userinput>
 Continuing.
 </screen>
-At this point, suspend the GDB session (use Ctrl-Z) and start a
+At this point, set JP1 to <literal>USER</literal> instead of
+<literal>STD</literal>
+<warning><title>Warning!</title><para>Failure to set JP1 to
+<literal>USER</literal> will cause the installation of RedBoot
+to overwrite Angel, thus making the board <emphasis>unbootable</emphasis>.
+Only hardware JTAG can restore the board once in this state.
+</para></warning>
+Now suspend the GDB session (use Ctrl-Z) and start a
 terminal emulator:
 <screen>
 RedBoot> <userinput>version</userinput>