[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-25-g7c5acf8

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  7c5acf8660ddfce4746152e03749b699532f513f (commit)
       via  17fb7ead4b901f10c01c0824f594d91775b012b3 (commit)
      from  c116d8f6bcb745ccc8fb8e6b562c8f22d54cd003 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c5acf8660ddfce4746152e03749b699532f513f
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Dec 30 07:48:49 2009 +0800

    whitespace cleanup, mostly for docs
    
    Remove useless space/tab at end of lines.
    Remove spaces in indentation and replace with tab.
    
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/BUGS b/BUGS
index 6967525..961b339 100644
--- a/BUGS
+++ b/BUGS
@@ -22,7 +22,7 @@ that may be important.
 - If the report is for a regression:
   - Include logs for both working and broken versions.
   - Find the precise version that caused the regression by binary search.
-    You can use "git bisect" to expedite this binary search:  
+    You can use "git bisect" to expedite this binary search:
     http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html
 
 If possible, please develop and attach a patch that helps to expose or
@@ -36,7 +36,7 @@ in total.
 @section bugscrashdump Obtaining Crash Backtraces
 
 If OpenOCD is crashing, there are two very effective things you can do to
-improve your chances of getting help on the development mailing list. 
+improve your chances of getting help on the development mailing list.
 
 Try to reproduce the problem using the dummy JTAG interface to allow other developers to replicate
 your problem robustly and use GDB to get a trace:@par
diff --git a/NEWS-0.2.0 b/NEWS-0.2.0
index f56c7a4..7426926 100644
--- a/NEWS-0.2.0
+++ b/NEWS-0.2.0
@@ -9,7 +9,7 @@ must past stricter value checks, and many more error conditions have
 been handled correctly.  These efforts helped to make the 0.2.0 release
 more stable and robust, though some changes may expose latent bugs in
 your existing configuration scripts.
- 
+
 This release does not maintain backward compatibility in all respects,
 so some target or configuration scripts may need to be updated.  In some
 cases, you may also see warnings; resolve those, because they indicate
@@ -20,7 +20,7 @@ The following areas of OpenOCD functionality changed in this release:
 JTAG Layer:
 - Improves modularity: core, TCL, driver commands, and interface have
   been separated, encapsulated, and documented for developers.  Mostly.
-- Improves JTAG TAP transition tables: 
+- Improves JTAG TAP transition tables:
    * Makes TAP paths variable length, rather than being fixed at 7 steps.
    * Fixes problems with some targets that did not like longer paths.
 - Improves JTAG driver/minidriver modularity and encapsulation.
diff --git a/NEWTAPS b/NEWTAPS
index 2fc6f12..e789054 100644
--- a/NEWTAPS
+++ b/NEWTAPS
@@ -30,7 +30,7 @@ Version Number Changes:
   not a big deal.  Please do report this information.  We'd like to
   know about it.
 
-  For example 
+  For example
 
 Error:  ERROR: Tap: s3c4510.cpu - Expected id: 0x3f0f0f0f, Got: 0x1f0f0f0f
 Error:  ERROR: expected: mfg: 0x787, part: 0xf0f0, ver: 0x3
@@ -39,7 +39,7 @@ Error:  ERROR:      got: mfg: 0x787, part: 0xf0f0, ver: 0x1
 ========================================
 
 Updating the Tap ID number your self
- 
+
   Why do this? You just want the warning to go away.  And don't want
   to update your version/instance of OpenOCD.
 
@@ -79,11 +79,11 @@ Examples:
     0x3f0f0f0f - is a newer ARM7TDMI
     0x3ba00477 - is an ARM cortex M3
 
-Some chips have multiple JTAG taps - be sure to list 
+Some chips have multiple JTAG taps - be sure to list
 each one individually - ORDER is important!
 
 ========================================
-B) The maker of the part 
+B) The maker of the part
 
 Examples:
     Xilinx, Atmel, ST Micro Systems, Freescale
@@ -94,7 +94,7 @@ C) The family of parts it belongs to
 Examples:
    "NXP LPC Series"
    "Atmel SAM7 Series"
-   
+
 ========================================
 
 D) The actual part number on the package
@@ -121,7 +121,7 @@ For example: A consumer GPS unit or a cellphone
         ie: Olimex, LogicPD, Freescale(eval board)
 
 ========================================
-	 
+
 (G)   Identifying information on the board.
 
       Not good:   "iar red ST eval board"
diff --git a/PATCHES b/PATCHES
index 74a76fd..856b094 100644
--- a/PATCHES
+++ b/PATCHES
@@ -32,7 +32,7 @@ in response to feedback.
 Add yourself to the GPL copyright for non-trivial changes.
 
 To create a patch from the command line:
-@code 
+@code
 	git diff >mypatch.txt
 @endcode
 
diff --git a/README.Win32 b/README.Win32
index bec4567..6c690c9 100644
--- a/README.Win32
+++ b/README.Win32
@@ -27,8 +27,8 @@ based JTAG debuggers.
 
 	http://sourceforge.net/projects/libusb-win32/
 
-You need to download the libusb-win32-device-bin-0.1.12.2.tar.gz 
-package.  Extract this file into a temp directory. 
+You need to download the libusb-win32-device-bin-0.1.12.2.tar.gz
+package.  Extract this file into a temp directory.
 
 Copy the file libusb-win32-device-bin-0.1.12.2\include\usb.h
 to your MinGW include directory.
@@ -59,10 +59,10 @@ released source tarball or the git tree.
 If you are using the git tree, the following are the instructions from
 README.mingw. You will need to have the cmake utility installed.
 
-- Edit Toolchain-mingw32.cmake to point to the correct MinGW 
+- Edit Toolchain-mingw32.cmake to point to the correct MinGW
   installation.
 - Create a build directory like "mkdir build-win32", e.g in ../libftdi/
-- cd into that directory and run  
+- cd into that directory and run
   "cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain-mingw32.cmake .."
 - Copy src/ftdi.h to your MinGW include directory.
 - Copy build-win32/src/*.a to your MinGW lib directory.
diff --git a/TODO b/TODO
index a9e95f6..8fed264 100644
--- a/TODO
+++ b/TODO
@@ -27,8 +27,8 @@ This section provides possible things to improve with OpenOCD's TCL support.
   parameters.  Currently variables assigned through one such parameter
   command/script are unset before the next one is invoked.
 
-- Isolate all TCL command support: 
-  - Pure C CLI implementations using --disable-builtin-tcl. 
+- Isolate all TCL command support:
+  - Pure C CLI implementations using --disable-builtin-tcl.
     - Allow developers to build new dongles using OpenOCD's JTAG core.
     - At first, provide only low-level JTAG support; target layer and
       above rely heavily on scripting event mechanisms.
@@ -112,7 +112,7 @@ TCP/IP packets handled by the server.
 
 @section thelistswd Serial Wire Debug
 
-- implement Serial Wire Debug interface 
+- implement Serial Wire Debug interface
 
 @section thelistbs Boundary Scan Support
 
@@ -163,7 +163,7 @@ https://lists.berlios.de/pipermail/openocd-development/2009-October/011506.html
   use hardware stepping if available.
   - mdb can return garbage data if read byte operation fails for
   a memory region(16 & 32 byte access modes may be supported). Is this
-  a bug in the .MX31 PDK init script? Try on i.MX31 PDK: 
+  a bug in the .MX31 PDK init script? Try on i.MX31 PDK:
   mdw 0xb80005f0 0x8, mdh 0xb80005f0 0x10, mdb 0xb80005f0 0x20. mdb returns
   garabage.
   - implement missing functionality (grep FNC_INFO_NOTIMPLEMENTED ...)
@@ -197,8 +197,8 @@ https://lists.berlios.de/pipermail/openocd-development/2009-October/011506.html
 
 @section thelistsvf SVF/XSVF
 
-- develop SVF unit tests 
-- develop XSVF unit tests 
+- develop SVF unit tests
+- develop XSVF unit tests
 
 @section thelistflash Flash Support
 
@@ -328,7 +328,7 @@ at the bottom of the list below.  Example, on amd64:
   from unaligned memory addresses
 - libopenocd support: @par
     https://lists.berlios.de/pipermail/openocd-development/2009-May/006405.html
-- review and clean up interface/target/flash APIs 
+- review and clean up interface/target/flash APIs
 
 The following strategic tasks will require ambition, knowledge, and time
 to complete:
diff --git a/bootstrap b/bootstrap
index 268d07c..9094a27 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 # Run the autotools bootstrap sequence to create the configure script
 
-# Stop execution as soon as we have an unknown command 
+# Stop execution as soon as we have an unknown command
 set -e
 
 if libtoolize --version >/dev/null 2>&1; then
diff --git a/configure.in b/configure.in
index 21edba9..ecc9c6d 100644
--- a/configure.in
+++ b/configure.in
@@ -559,7 +559,7 @@ case $host in
       AC_MSG_WARN([--disable-parport-giveio is not supported by MinGW32 hosts])
     fi
     parport_use_giveio=yes
-    
+
     CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO"
 
     AC_DEFINE(IS_MINGW, 1, [1 if building for MinGW.])
diff --git a/doc/manual/primer/commands.txt b/doc/manual/primer/commands.txt
index c9db7cc..6169734 100644
--- a/doc/manual/primer/commands.txt
+++ b/doc/manual/primer/commands.txt
@@ -55,7 +55,7 @@ static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
 @endcode
 
 Of course, you may also call other macros or functions, but that extends
-beyond the scope of this tutorial on writing commands. 
+beyond the scope of this tutorial on writing commands.
 
 @section primercmdreg Command Registration
 
diff --git a/doc/manual/release.txt b/doc/manual/release.txt
index 737cf13..70a22ff 100644
--- a/doc/manual/release.txt
+++ b/doc/manual/release.txt
@@ -399,7 +399,7 @@ affect its behavior:
 
 @section releasetutorial Release Tutorials
 
-This section should contain a brief tutorial for using the Release 
+This section should contain a brief tutorial for using the Release
 Script to perform release tasks, but the new script needs to be
 used for 0.3.0.
 
diff --git a/doc/manual/server.txt b/doc/manual/server.txt
index 57bac4a..5250f7f 100644
--- a/doc/manual/server.txt
+++ b/doc/manual/server.txt
@@ -320,6 +320,6 @@ openocd -s /usr/local/share/openocd -f httpd/httpd.tcl -f interface/dummy.cfg -f
 
 Navigate to: http://localhost:8888/
 
- 
+
 
  */
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 02caf5b..7281d71 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -3757,14 +3757,14 @@ Use it in board specific configuration files, not interactively.
 @comment the REAL name for this command is "ocd_flash_banks"
 @comment less confusing would be:  "flash list" (like "nand list")
 @deffn Command {flash banks}
-Prints a one-line summary of each device that was 
+Prints a one-line summary of each device that was
 declared using @command{flash bank}, numbered from zero.
 Note that this is the @emph{plural} form;
 the @emph{singular} form is a very different command.
 @end deffn
 
 @deffn Command {flash list}
-Retrieves a list of associative arrays for each device that was 
+Retrieves a list of associative arrays for each device that was
 declared using @command{flash bank}, numbered from zero.
 This returned list can be manipulated easily from within scripts.
 @end deffn
@@ -4914,28 +4914,28 @@ nand device $NANDFLASH at91sam9 $CHIPNAME 0x40000000 0xfffffe800
 @end example
 AT91SAM9 chips support single-bit ECC hardware. The @code{write_page} and
 @code{read_page} methods are used to utilize the ECC hardware unless they are
-disabled by using the @command{nand raw_access} command.  There are four 
+disabled by using the @command{nand raw_access} command.  There are four
 additional commands that are needed to fully configure the AT91SAM9 NAND
 controller.  Two are optional; most boards use the same wiring for ALE/CLE:
 @deffn Command {at91sam9 cle} num addr_line
-Configure the address line used for latching commands.  The @var{num} 
+Configure the address line used for latching commands.  The @var{num}
 parameter is the value shown by @command{nand list}.
 @end deffn
 @deffn Command {at91sam9 ale} num addr_line
-Configure the address line used for latching addresses.  The @var{num} 
+Configure the address line used for latching addresses.  The @var{num}
 parameter is the value shown by @command{nand list}.
 @end deffn
 
-For the next two commands, it is assumed that the pins have already been 
+For the next two commands, it is assumed that the pins have already been
 properly configured for input or output.
 @deffn Command {at91sam9 rdy_busy} num pio_base_addr pin
-Configure the RDY/nBUSY input from the NAND device.  The @var{num} 
-parameter is the value shown by @command{nand list}.  @var{pio_base_addr} 
+Configure the RDY/nBUSY input from the NAND device.  The @var{num}
+parameter is the value shown by @command{nand list}.  @var{pio_base_addr}
 is the base address of the PIO controller and @var{pin} is the pin number.
 @end deffn
 @deffn Command {at91sam9 ce} num pio_base_addr pin
-Configure the chip enable input to the NAND device.  The @var{num} 
-parameter is the value shown by @command{nand list}.  @var{pio_base_addr} 
+Configure the chip enable input to the NAND device.  The @var{num}
+parameter is the value shown by @command{nand list}.  @var{pio_base_addr}
 is the base address of the PIO controller and @var{pin} is the pin number.
 @end deffn
 @end deffn
@@ -5824,7 +5824,7 @@ and using the MCR instruction.
 an ARM register.)
 @end deffn
 
-@deffn Command {arm mrc} pX coproc op1 CRn CRm op2 
+@deffn Command {arm mrc} pX coproc op1 CRn CRm op2
 Read a coprocessor @var{pX} register passing parameters @var{CRn},
 @var{CRm}, opcodes @var{opc1} and @var{opc2},
 and the MRC instruction.
@@ -5843,7 +5843,7 @@ core mode if necessary.
 @cindex ARMv5
 
 The ARMv4 and ARMv5 architectures are widely used in embedded systems,
-and introduced core parts of the instruction set in use today. 
+and introduced core parts of the instruction set in use today.
 That includes the Thumb instruction set, introduced in the ARMv4T
 variant.
 
diff --git a/ecosflash/notes.txt b/ecosflash/notes.txt
index 773db9f..bf456bb 100644
--- a/ecosflash/notes.txt
+++ b/ecosflash/notes.txt
@@ -1,4 +1,4 @@
-Some of these binaries are build & linked using eCos. 
+Some of these binaries are build & linked using eCos.
 
 For source for the flash drivers, see:
 
diff --git a/src/server/httpd/menu.xml b/src/server/httpd/menu.xml
index ef1d4ec..be14464 100644
--- a/src/server/httpd/menu.xml
+++ b/src/server/httpd/menu.xml
@@ -1,26 +1,26 @@
 <?xml version = "1.0" encoding="iso-8859-1" standalone="yes"?>
 <?xml-stylesheet type="text/xsl" href="plaintext.xsl"?>
 <website>
-	
+
 	<language lang="Norsk">
 
 		<page lang="eng">
 			<outfile>index.tcl</outfile>
-			<menutext>Config Target</menutext> 
-			<menulink>index.tcl</menulink> 
+			<menutext>Config Target</menutext>
+			<menulink>index.tcl</menulink>
 			<pageheading>OpenOCD debugger</pageheading>
 			<level2parent>index.tcl</level2parent>
 			<level2menu href="index.tcl" title="Target Status" titlestyle="color:#4e6627;">
 			</level2menu>
-			<!-- 
+			<!--
 			<level2menu href="terminal.tcl" title="UART forwarding" titlestyle="color:#4e6627;">
 			</level2menu>
 			 -->
-		
+
 			<pagetext>
 			<markup_code><![CDATA[
 
-			
+
 			<table>
 				<tr><td style="height:10px;width:535px;">&nbsp</td></tr>
 				<tr><td style="height:1px;width:535px;background-color:#a2c5d1;"></td></tr>
@@ -35,18 +35,18 @@
 						<tcl>
 							set form_address [formfetch form_address]
 							set form_action [formfetch form_action]
-							
+
 							if {[string compare $form_action "Halt"]==0} {
 								append console [encode [capture_catch "halt"]]
 							}
 							if {[string compare $form_action "Resume"]==0} {
 								append console [encode [capture_catch "resume"]]
 							}
-							  
+
 							if {[string compare $form_action "Reset and run"]==0} {
 								append console [encode [capture_catch "reset run"]]
 							}
-							
+
 							if {[string compare $form_action "Power on"]==0} {
 								append console [encode [capture_catch "power on"]]
 							}
@@ -54,13 +54,13 @@
 								append console [encode [capture_catch "power off"]]
 							}
 						</tcl>
-					
+
 						<tcl>append console [encode [capture_catch poll]]</tcl>
 					</td>
 				</tr>
 			</table>
 
-			<form action="index.tcl" method="post"> 
+			<form action="index.tcl" method="post">
 				<table><tr>
 					<td><input type="submit" name="form_action" value="Reset and run"></td>
 					<td class="buttonspacesmall"></td><td><input type="submit" name="form_action" value="Halt"></td>
@@ -69,32 +69,32 @@
 					<td class="buttonspacesmall"></td><td><input type="submit" name="form_action" value="Power off"></td>
 				</tr></table>
 
-				<br>						
-				<br>						
-										
+				<br>
+				<br>
+
 				<p>
 			</form>
 			]]></markup_code>
 			<right_column>
 				<markup_code><![CDATA[
-					<p>Target status shows that status of the connected target. </p> 
+					<p>Target status shows that status of the connected target. </p>
 					<p><b>Current target</b> - selected target configuration. <br>
 					<p><b>Startup</b> - whether or not the target script ran to completion. Note
 					that even if the target is disconnected, powered down or unresponsive, the
 					startup script will still run to completion. Startup - OK does not mean
 					that the target is fully operational, simply that the configuration script
-					did not contain syntax errors for instance. 
+					did not contain syntax errors for instance.
 					See log for details. <br>
 					<p><b>Target power</b> - Detects power on target. <br>
 					If the JTAG cable is not connected, or the target has no power, then no target power will be detected.</p>
 					<p>Type "help power" in telnet for command to control power relay.</p>
 				]]></markup_code>
 			</right_column>
-			
+
 			</pagetext>
 		</page>
-		
-		
+
+
 
 
 		<page lang="eng">
@@ -103,12 +103,12 @@
 			<pageheading>Target config quick start guide</pageheading>
 			<pagetext>
 				<markup_code><![CDATA[
-				
+
 				A target needs an openocd.cfg file. This config file sets up
 				the CPU, flash and reset init script. Either OpenOCD ships with an
 				openocd.cfg file for your target or you need to take an existing
 				config file and modify it for your needs.
-				<p> 
+				<p>
 				The reset init script is crucial. It will set up e.g. MMU, chip
 				select registers, etc. after a reset. The init.cfg (reset init script)
 				is embedded into the openocd.cfg file in the sampls OpenOCD provides.
@@ -116,25 +116,25 @@
 				Writing an openocd.cfg from scratch is a non-trivial exercise, but
 				fortunally it only has to be done once for a target and afterwards it
 				rarely if ever needs to be changed.
-				
-				
+
+
 				]]></markup_code>
 				<right_column>
-					
-					  Quick start guide on how to configure a target.
+
+					Quick start guide on how to configure a target.
 				</right_column>
 			</pagetext>
-			
-			
+
+
 		</page>
 
 
 
-		
+
 		<page lang="eng">
 			<outfile>flashinfo.tcl</outfile>
-			<menutext>Flash</menutext> 
-			<menulink>flashinfo.tcl</menulink> 
+			<menutext>Flash</menutext>
+			<menulink>flashinfo.tcl</menulink>
 			<pageheading>Flash Information</pageheading>
 			<level2parent>flashinfo.tcl</level2parent>
 			<level2menu href="flashinfo.tcl" title="Info" titlestyle="color:#4e6627;">
@@ -150,13 +150,13 @@
 			<markup_code><![CDATA[
 
 			<div style="font-size:14px;">Configured flash banks:</div>
-			<p>			
+			<p>
 			<code style="white-space: nowrap;">
 				<tcl>
 					set flash_return [ocd_flash_banks]
 					if {[llength $flash_return]!=0} {
 						append buffer [encode [flash banks]]
-					
+
 						set form_action [formfetch form_action]
 						if {[string compare $form_action "Reset CPU and probe flash"]==0} {
 							append console [encode [capture_catch "reset init"]]
@@ -168,17 +168,17 @@
 					}
 				</tcl>
 				<p>
-				<form action="flashinfo.tcl" method="post"> 
+				<form action="flashinfo.tcl" method="post">
 					<input type="submit" name="form_action" value="Reset CPU and probe flash">
 				</form>
 				<tcl>
 					foreach a [ocd_flash_banks] {
 						append buffer "Flash bank at [format "0x%08x size 0x%08x" $a(base) $a(size)]: "
 						</tcl>
-							<form action="downloadmem.tcl" method="post"> 
+							<form action="downloadmem.tcl" method="post">
 								<input type="hidden" name="form_address" value="<tcl>append buffer [format "0x%08x" $a(base)]</tcl>">
 								<input type="hidden" name="form_length" value="<tcl>append buffer [format "0x%08x" $a(size)]</tcl>">
-		
+
 								<input type="submit" value="Download" name="form_action">
 								<br>
 							</form>
@@ -186,7 +186,7 @@
 					}
 				</tcl>
 			</code>
-			
+
 
 			]]></markup_code>
 			<right_column>
@@ -198,7 +198,7 @@
 				the different sectors in the flash, and the flash driver used.</p>
 				]]>
 			</right_column>
-			
+
 			</pagetext>
 		</page>
 
@@ -208,82 +208,82 @@
 			<pageheading>Program / Verify Flash</pageheading>
 			<pagetext>
 			<markup_code><![CDATA[
-			
+
 			<tcl>
-			
+
 			set form_offset [formfetch form_offset]
 			set form_action [formfetch form_action]
 			set form_type [formfetch form_type]
-			
-			
+
+
 			set post ""
 			catch {set post $post_data} err
-			
+
 			if {[string compare $form_offset ""]==0} {
 				set form_offset 0
 			}
 			if {[string compare $form_type ""]==0} {
 				set form_type ""
 			}
-			
+
 			</tcl><code style="white-space: nowrap;"><tcl>
-			
+
 			set data ""
 			append buffer {<form enctype="multipart/form-data" action="flash.tcl" method="post">}
-			
-			set action_reset [expr {[string length $form_action]!=0}] 
-			set action_flash [expr {[string compare $form_action "Flash"]==0 || [string compare $form_action "Flash and verify"]==0}] 
+
+			set action_reset [expr {[string length $form_action]!=0}]
+			set action_flash [expr {[string compare $form_action "Flash"]==0 || [string compare $form_action "Flash and verify"]==0}]
 			set action_verify [expr {[string compare $form_action "Verify"]==0 || [string compare $form_action "Flash and verify"]==0}]
-			
+
 			if {$action_reset} {
 				append console [encode [capture_catch "reset init"]]
 			}
 			</tcl>
 			</code><tcl>
-				
+
 			append buffer {<table>}
 			append buffer {<tr><td class="formtext">File</td><td><input type="file" name="form_filecontent"></td></tr>}
 			append buffer "<tr><td class=\"formtext\" >Offset</td><td><input type=\"text\" name=\"form_offset\" value=\"$form_offset\"></td></tr>"
-			
+
 			</tcl>
 			<tr><td class="formtext" style="padding-top:1px;">Type</td><td>
 			<select name="form_type">
-			  		<option
-			   <tcl>if {[string compare $form_type ""]==0} { append buffer {selected="selected"} }  </tcl>
-			  		value ="">auto</option>
-			  <option 
-			   <tcl>if {[string compare $form_type "elf"]==0} { append buffer {selected="selected"} }  </tcl>
-			  value ="elf">elf</option>
-			  <option 
-			   <tcl>if {[string compare $form_type "bin"]==0} { append buffer {selected="selected"} }  </tcl>
-			  value ="bin">binary</option>
-			  <option 
-			   <tcl>if {[string compare $form_type "ihex"]==0} { append buffer {selected="selected"} }  </tcl>
-			  value ="ihex">ihex</option>
-			  <!-- broken <option value ="s19">s19</option> -->
+				<option
+					<tcl>if {[string compare $form_type ""]==0} { append buffer {selected="selected"} } </tcl>
+					value ="">auto</option>
+				<option
+					<tcl>if {[string compare $form_type "elf"]==0} { append buffer {selected="selected"} } </tcl>
+					value ="elf">elf</option>
+				<option
+					<tcl>if {[string compare $form_type "bin"]==0} { append buffer {selected="selected"} } </tcl>
+					value ="bin">binary</option>
+				<option
+					<tcl>if {[string compare $form_type "ihex"]==0} { append buffer {selected="selected"} } </tcl>
+					value ="ihex">ihex</option>
+				<!-- broken <option value ="s19">s19</option> -->
 			</select>
 			</td>
-			
+
 			</tr>
-			
-			
+
+
 			</table>
-			
+
 				<table>
 					<tr><td style="height:15px;width:535px;">&nbsp</td></tr>
 					<tr><td style="height:1px;width:535px;background-color:#a2c5d1;"></td></tr>
 					<tr><td style="height:15px;width:535px;">&nbsp</td></tr>
 				</table>
-			
+
 			<table><tr>
 				<td><input type="submit" name="form_action" value="Flash" ></td>
 				<td class="buttonspacesmall"></td><td><input type="submit" name="form_action" value="Flash and verify" ></td>
 				<td class="buttonspacesmall"></td><td><input type="submit" name="form_action" value="Verify" ></td>
 			</tr></table>
-		
+
 			<p>
 			<tcl>
-			
+
 			if {$action_flash||$action_verify} {
 				catch {writeform form_filecontent $upload_filename} result
 				append console [encode $result]
@@ -313,27 +313,27 @@
 				}
 				append buffer "</b>"
 			}
-			</tcl>		
-				
+			</tcl>
+
 			</form>
-			
+
 			]]></markup_code>
-			
+
 			<right_column>
 				<![CDATA[
 				<p>Program and/or verify the flash on your target.</p>
 				<p><b>Flash</b> - Halt CPU, automatically erase flash if required and program flash with image.</p>
 				<p><b>Flash and verify</b> - Programs the flash and verifies the programmed flash content is correct.</p>
 				<p><b>Verify</b> - Halt CPU and verify image in flash or RAM.</p>
-				<p><b>Offset</b> - This value is added to the address of the image.<br> 
-					Binary images start at address 0 by default, whereas elf and ihex have addresses encoded into the image.<br> 
+				<p><b>Offset</b> - This value is added to the address of the image.<br>
+					Binary images start at address 0 by default, whereas elf and ihex have addresses encoded into the image.<br>
 					Typically 0 for elf/ihex and the address to	write the image to for binary files.</p>
-					]]> 
+					]]>
 			</right_column>
-			
-			
+
+
 			</pagetext>
-			
+
 		</page>
 
 
@@ -350,23 +350,23 @@
 				set form_serialnumber [formfetch form_serialnumber]
 				append buffer [production_info]
 			</tcl>
-				
+
 			<form enctype="multipart/form-data" action="production.tcl" method="post">
 				<code style="white-space: nowrap;">
-					<tcl>	
+					<tcl>
 						if {[string compare $form_action "Upload firmware"]==0} {
-							set wrotedata [catch {writeform form_filecontent $upload_filename} result]  
+							set wrotedata [catch {writeform form_filecontent $upload_filename} result]
 							append buffer [encode $result]
 							if {$wrotedata==0} {
 								append buffer "<br>Running production procedure<p>"
 								append buffer "<br>Reset and init: <br>"
-								
+
 								append console [encode [capture_catch {catch "production $upload_filename $form_serialnumber"}]]
 							}
 						}
 						if {[string compare $form_action "Test"]==0} {
 							append buffer "<br>Running production test. Output from first 10 seconds printed below. <p>"
-							
+
 							append console [encode [capture_catch {catch production_test}]]
 						}
 						if {[string compare $form_action "Power on"]==0} {
@@ -381,13 +381,13 @@
 					append buffer {<p class="formtext">Firmware file(raw binary) <input type="file" name="form_filecontent"><p>}
 					append buffer {<p class="formtext">Serial number <input type="text" name="form_serialnumber"><p>}
 				</tcl>
-				
+
 				<table>
 					<tr><td style="height:15px;width:535px;">&nbsp</td></tr>
 					<tr><td style="height:1px;width:535px;background-color:#a2c5d1;"></td></tr>
 					<tr><td style="height:15px;width:535px;">&nbsp</td></tr>
 				</table>
-			
+
 				<table><tr>
 					<td><input type="submit" name="form_action" value="Upload firmware" ></td>
 					<td class="buttonspacesmall">&nbsp</td><td><input type="submit" name="form_action" value="Test"></td>
@@ -395,55 +395,55 @@
 					<td class="buttonspacesmall">&nbsp</td><td><input type="submit" name="form_action" value="Power off">
 				</tr></table>
 			</form>
-			
+
 			]]></markup_code>
-			
+
 			<right_column>
 				<![CDATA[
 				The target script can implement the "production", "production_info" and "production_test" tcl proc's. These procedures
 				are used on this page. There are default implementations that do nothing.
-				
+
 				<p><b>Upload firmware</b> - Power cycle target, reset target and program raw binary file to flash bank 0, offset 0 and verify flash programming. Leave target powered on.</p>
-				<p><b>Test</b> -  Power up target, run 10 second target test. Output is provided via the DCC output channel. </p>
+				<p><b>Test</b> - Power up target, run 10 second target test. Output is provided via the DCC output channel. </p>
 				<p><b>Power on</b> - Power on target.</p>
 				<p><b>Power off</b> - Power off target.</p>
 				<p><b>Serial number</b> - A target script can use this string in the production procedure. Type "help production" for more info.</p>
-					]]> 
+					]]>
 			</right_column>
-			
-			
+
+
 			</pagetext>
-			
+
 		</page>
 
 
 
 		<page lang="eng">
 			<outfile>erase.tcl</outfile>
-			<menulink>erase.tcl</menulink> 
+			<menulink>erase.tcl</menulink>
 			<pageheading>Erase Flash</pageheading>
 			<level2parent>flashinfo.tcl</level2parent>
 			<pagetext>
 			<markup_code><![CDATA[
 
 
-			
+
 			<tcl>
-			
+
 			set form_address [formfetch form_address]
 			set form_length [formfetch form_length]
 			set form_action [formfetch form_action]
-			
+
 			if {[string compare $form_length ""]==0} {
 				set form_length 0x10000
-			}  
+			}
 			if {[string compare $form_address ""]==0} {
 				if {[catch {[first_flash_base]} result]==0} {
 						set form_address "0x[tohex $result]"
-					}			
-			}  
-			
-			
+					}
+			}
+
+
 			if {[string compare $form_address ""]!=0} {
 				if {[string compare $form_action "Erase"]==0} {
 						append buffer "<code style=\"white-space: nowrap;\">"
@@ -451,13 +451,13 @@
 						reset init
 						flash erase_address $form_address $form_length}]]
 						append buffer </code>
-				}  
+				}
 			}
-			
-			
+
+
 			</tcl>
-			
-			<form action="erase.tcl" method="post"> 
+
+			<form action="erase.tcl" method="post">
 				<table>
 				<tr><td class="formtext" style="padding-right:10px;">Address</td><td><input type="text" name="form_address" value="<tcl>append buffer $form_address</tcl>"></td></tr>
 				<tr><td class="formtext">Length</td><td><input type="text" name="form_length" value="<tcl>append buffer $form_length</tcl>"></td></tr>
@@ -468,14 +468,14 @@
 					<tr><td style="height:1px;width:535px;background-color:#a2c5d1;"></td></tr>
 					<tr><td style="height:15px;width:535px;">&nbsp</td></tr>
 				</table>
-			
+
 				<input type="submit" name="form_action" value="Erase"><br>
-				
-				
+
+
 			</form>
-			
 
-			
+
+
 			]]></markup_code>
 			<right_column>
 				<![CDATA[
@@ -484,21 +484,21 @@
 				<p>The length field is specified in number of bytes.</p>
 					]]>
 			</right_column>
-			
+
 			</pagetext>
 		</page>
 
 
 		<page lang="eng">
 			<outfile>run.tcl</outfile>
-			<menulink>run.tcl</menulink> 
+			<menulink>run.tcl</menulink>
 			<pageheading>Run program</pageheading>
 			<level2parent>flashinfo.tcl</level2parent>
 			<pagetext>
 			<markup_code><![CDATA[
 
 
-			
+
 <tcl>
 
 set form_address [formfetch form_address]
@@ -508,26 +508,26 @@ if {[string compare $form_action "Run from address"]==0} {
 	append console [encode [capture_catch "halt"]]
 	append console [encode [capture_catch "wait_halt"]]
 	append console [encode [capture_catch "resume $form_address"]]
-}  
+}
 
 if {[string compare $form_action "Halt"]==0} {
 	append console [encode [capture_catch "halt"]]
 	append console [encode [capture_catch "wait_halt"]]
 }
-  
+
 if {[string compare $form_action "Reset and run"]==0} {
 	append console [encode [capture_catch "reset run"]]
 }
-  
+
 if {[string compare $form_action "Reset and init"]==0} {
 	append console [encode [capture_catch "reset init"]]
-}  
+}
 
 append console [encode [capture_catch poll]]
 
 </tcl>
 
-<form action="run.tcl" method="post"> 
+<form action="run.tcl" method="post">
 	<table>
 	<tr><td class="formtext" style="padding-right:10px;">Address</td><td><input type="text" name="form_address" value="<tcl>append buffer $form_address</tcl>"></td></tr>
 	</td></tr>
@@ -537,12 +537,12 @@ append console [encode [capture_catch poll]]
 		<tr><td style="height:1px;width:535px;background-color:#a2c5d1;"></td></tr>
 		<tr><td style="height:15px;width:535px;">&nbsp</td></tr>
 	</table>
-	
+
 	<input type="submit" name="form_action" value="Reset and run"> <input type="submit" name="form_action" value="Run from address"> <input type="submit" name="form_action" value="Halt"><input type="submit" name="form_action" value="Reset and init"><br>
 </form>
-			
 
-			
+
+
 			]]></markup_code>
 			<right_column>
 				<![CDATA[
@@ -552,15 +552,15 @@ append console [encode [capture_catch poll]]
 				<p>Reset and init - reset CPU and run init script.</p>
 				]]>
 			</right_column>
-			
+
 			</pagetext>
 		</page>
 
 
 		<page lang="eng">
 			<outfile>browsemem.tcl</outfile>
-			<menutext>Memory</menutext> 
-			<menulink>browsemem.tcl</menulink> 
+			<menutext>Memory</menutext>
+			<menulink>browsemem.tcl</menulink>
 			<pageheading>Browse / Edit Memory</pageheading>
 			<level2parent>browsemem.tcl</level2parent>
 			<level2menu href="browsemem.tcl" title="Browse / Edit" titlestyle="color:#4e6627;">
@@ -570,53 +570,53 @@ append console [encode [capture_catch poll]]
 			</level2menu>
 			<level2menu href="downloadmem.tcl" title="Download" titlestyle="color:#4e6627;">
 			<![CDATA[
-			    Copy memory range to developer machine
+				Copy memory range to developer machine
 			]]>
 			</level2menu>
-			
+
 			<pagetext>
 			<markup_code><![CDATA[
 
 
-			
+
 			<tcl>
-			
+
 			set form_address [formfetch form_address]
 			set form_length [formfetch form_length]
 			set form_type [formfetch form_type]
 			set form_action [formfetch form_action]
 			set form_value [formfetch form_value]
-			
+
 			if {[string compare $form_length ""]==0} {
 				set form_length 0
-			}  
+			}
 			if {$form_length<=0} {
 				set form_length 0x80
-			} 
+			}
 			if {$form_length>0x1000} {
 				set form_length 0x1000
-			} 
-			
+			}
+
 			if {[string compare $form_type ""]==0} {
 				set form_type mdw
 			}
-			
+
 			if {[string compare $form_type "mdw"]==0} {
 				set wordsize 4
-				set modify_cmd mww 
+				set modify_cmd mww
 			}
 			if {[string compare $form_type "mdh"]==0} {
 				set wordsize 2
-				set modify_cmd mwh 
+				set modify_cmd mwh
 			}
 			if {[string compare $form_type "mdb"]==0} {
 				set wordsize 1
-				set modify_cmd mwb 
+				set modify_cmd mwb
 			}
-			
-			
-			
-			
+
+
+
+
 			if {[string compare $form_address ""]!=0} {
 				if {[string compare $form_action "Previous"]==0} {
 					# Kludge! Work around problems parsing hex in Jim Tcl expressions
@@ -626,24 +626,24 @@ append console [encode [capture_catch poll]]
 					} else {
 						set form_address "0x0"
 					}
-				}  
+				}
 				if {[string compare $form_action "Next"]==0} {
 					# Kludge! Work around problems parsing hex in Jim Tcl expressions
 					incr form_address ; set form_address [expr $form_address-1]
 					set form_address "0x[tohex [expr $form_address+$form_length]]"
-				}  
+				}
 				if {[string compare $form_action "Modify"]==0} {
 					append console [capture_catch "$modify_cmd $form_address $form_value"]
-				}  
+				}
 				if {[string compare $form_action "Fill"]==0} {
 					append console [capture_catch "$modify_cmd $form_address $form_value $form_length"]
-				}  
+				}
 			}
-			
-			
+
+
 			</tcl>
-			
-			<form action="browsemem.tcl" method="post"> 
+
+			<form action="browsemem.tcl" method="post">
 				<table>
 				<tr><td class="formtext">Address</td><td><input type="text" name="form_address" value="<tcl>append buffer $form_address</tcl>"></td></tr>
 				<tr><td class="formtext">Length</td><td><input type="text" name="form_length" value="<tcl>append buffer "0x[tohex $form_length]"</tcl>"></td></tr>
@@ -652,17 +652,17 @@ append console [encode [capture_catch poll]]
 					<td class="buttonspacesmall">&nbsp</td><td><input type="submit" name="form_action" value="Fill"></td></tr>
 				<tr><td class="formtext">Type</td><td style="padding-top:1px;">
 				<select name="form_type">
-				  <option 
-				    <tcl>if {[string compare $form_type "mdb"]==0} { append buffer {selected="selected"} }  </tcl> value ="mdb">8 bit
-				  </option>
-				  <option 
-				   <tcl>if {[string compare $form_type "mdh"]==0} { append buffer {selected="selected"} }  </tcl> value ="mdh">16 bit
-				  </option>
-			  		<option
-					   <tcl>if {[string compare $form_type "mdw"]==0} { append buffer {selected="selected"} }  </tcl>value ="mdw">32 bit
-				  	</option>
+					<option
+						<tcl>if {[string compare $form_type "mdb"]==0} { append buffer {selected="selected"} } </tcl> value ="mdb">8 bit
+					</option>
+					<option
+						<tcl>if {[string compare $form_type "mdh"]==0} { append buffer {selected="selected"} } </tcl> value ="mdh">16 bit
+					</option>
+					<option
+						<tcl>if {[string compare $form_type "mdw"]==0} { append buffer {selected="selected"} } </tcl>value ="mdw">32 bit
+					</option>
 				</select>
-				
+
 				</td></tr>
 				</table>
 				<table>
@@ -670,14 +670,14 @@ append console [encode [capture_catch poll]]
 					<tr><td style="height:1px;width:535px;background-color:#a2c5d1;"></td></tr>
 					<tr><td style="height:15px;width:535px;">&nbsp</td></tr>
 				</table>
-			
+
 				<table><tr>
 					<td><input type="submit" name="form_action" value="Refresh"></td>
 					<td class="buttonspacesmall">&nbsp</td><td><input type="submit" name="form_action" value="Previous" ></td>
 					<td class="buttonspacesmall">&nbsp</td><td><input type="submit" name="form_action" value="Next" ></td>
 				</tr></table>
 				<br>
-				
+
 			</form>
 			<p>
 			<div class="fontbigger">Memory:</div><p>
@@ -686,19 +686,19 @@ append console [encode [capture_catch poll]]
 				if {[string compare $form_address ""]!=0} {
 					append console [encode [capture_catch halt]]
 					append buffer [encode [capture_catch "$form_type $form_address [expr $form_length]"]]
-				} 
+				}
 				</tcl>
 			</code>
 
 
-			
 
-			
+
+
 			]]></markup_code>
 			<right_column>
 				<![CDATA[
 				<p>Browse and edit target memory.<br>
-				   Length is in bytes, maximum 4096 bytes.</p> 
+					Length is in bytes, maximum 4096 bytes.</p>
 				<p>An error message is shown when trying to browse or edit memory which cases a CPU fault.</p>
 				<p>CPU will be halted if required.</p>
 				<p><b>Modify</b> - Will modify only one byte, half-word or word starting at Address.</p>
@@ -706,11 +706,11 @@ append console [encode [capture_catch poll]]
 				<p><b>Refresh</b> - Display the content of the specified memory area.</p>
 					]]>
 			</right_column>
-			
+
 			</pagetext>
 		</page>
 
-		
+
 
 
 		<page lang="eng">
@@ -723,8 +723,8 @@ append console [encode [capture_catch poll]]
 				set form_address [formfetch form_address]
 				set form_length [formfetch form_length]
 				set form_action [formfetch form_action]
-			</tcl>			
-			<form action="downloadmem.tcl" method="post"> 
+			</tcl>
+			<form action="downloadmem.tcl" method="post">
 				<table>
 				<tr><td class="formtext">Address</td><td><input type="text" name="form_address" value="<tcl>append buffer $form_address</tcl>"></td></tr>
 				<tr><td class="formtext">Length</td><td><input type="text" name="form_length" value="<tcl>append buffer $form_length</tcl>"></td></tr>
@@ -736,29 +736,29 @@ append console [encode [capture_catch poll]]
 					<tr><td style="height:1px;width:535px;background-color:#a2c5d1;"></td></tr>
 					<tr><td style="height:15px;width:535px;">&nbsp</td></tr>
 				</table>
-			
+
 				<input type="submit" value="Download" name="form_action">
-				
-				
+
+
 			</form>
 			<tcl>
 				if {[string compare $form_action "Download"]==0} {
 					append console [encode [capture_catch "reset init"]]
 					append console [encode [capture_catch "dump_image /tmp/dump.bin $form_address $form_length"]]
 					</tcl>
-					<form action="../dump.bin" target="_blank"> 
+					<form action="../dump.bin" target="_blank">
 						<input type="submit" name="form_action" value="Save downloaded memory">
 					</form>
-					<tcl> 
+					<tcl>
 				}
-				
+
 			</tcl>
 
 
-			
+
 			]]></markup_code>
 			<right_column>
-				<![CDATA[	
+				<![CDATA[
 				Download memory from target. <br>
 				<b>Note</b> that download memory can take
 				a long time(potentially minutes for megabytes at low JTAG clk speeds).
@@ -768,25 +768,25 @@ append console [encode [capture_catch poll]]
 				]]>
 			</right_column>
 			</pagetext>
-			
+
 		</page>
 
 
 
 		<page lang="eng">
 			<outfile>openocd.tcl</outfile>
-			<menutext>OpenOCD</menutext> 
-			<menulink>openocd.tcl</menulink> 
+			<menutext>OpenOCD</menutext>
+			<menulink>openocd.tcl</menulink>
 			<pageheading>Run Command</pageheading>
 			<level2parent>openocd.tcl</level2parent>
 			<level2menu href="openocd.tcl" title="Run Command" titlestyle="color:#4e6627;">
 			</level2menu>
 			<level2menu href="guiupload.tcl" title="Upload File" titlestyle="color:#4e6627;">
 			<![CDATA[
-			    Upload file
+				Upload file
 			]]>
 			</level2menu>
-			
+
 			<pagetext>
 			<markup_code><![CDATA[
 
@@ -797,23 +797,23 @@ append console [encode [capture_catch poll]]
 				if {[string length $form_command]>0} {
 					set form_edittext [capture_catch {eval $form_command}]
 				}
-				
+
 				append buffer {<form action="openocd.tcl" method="post">} "\n"
 				append buffer {Command<br>}
-				append buffer {<textarea  style="overflow:auto;"  rows="5" cols="65" name="form_command" wrap="off">}
+				append buffer {<textarea style="overflow:auto;" rows="5" cols="65" name="form_command" wrap="off">}
 				append buffer [to_textarea $form_command]
 				append buffer {</textarea><br>}
 				append buffer {<input type="submit" value="Run" name="form_action" ><br>}
-				append buffer {<textarea  style="overflow:auto;"  rows="21" cols="65" name="form_edittext" readonly=1 wrap="off">}
+				append buffer {<textarea style="overflow:auto;" rows="21" cols="65" name="form_edittext" readonly=1 wrap="off">}
 				append buffer [to_textarea $form_edittext]
 				append buffer {</textarea><br>}
-				
+
 				append buffer {</form>} "\n"
-			
+
 			</tcl>
 
 			]]></markup_code>
-			
+
 			<right_column>
 				<![CDATA[
 				<p>Run tcl statement(s). Add "ocd_" prefix to OpenOCD commands otherwise
@@ -828,28 +828,28 @@ append console [encode [capture_catch poll]]
 				<code>
 				curl --form form_command=ocd_version <tcl>append buffer [ip]</tcl>runtcl.tcl
 				</code>
-				
+
 				]]>
 			</right_column>
 			</pagetext>
 		</page>
 
-		
-		
+
+
 		<page lang="eng">
 			<outfile>guiupload.tcl</outfile>
 			<level2parent>openocd.tcl</level2parent>
 			<pageheading>Upload File</pageheading>
 			<pagetext>
 			<markup_code><![CDATA[
-			
+
 			<tcl>
 				set form_filename [formfetch form_filename];
 				set form_action [formfetch form_action];
 				#set form_filecontent [formfetch form_filecontent];
-				
+
 				append buffer {<form enctype="multipart/form-data" action="guiupload.tcl" method="post">}
-				append buffer <br> 
+				append buffer <br>
 				if {[string compare $form_action "Upload"]==0} {
 					if {[catch {writeform form_filecontent $form_filename} result]==0} {
 						append buffer [encode $result]
@@ -857,20 +857,20 @@ append console [encode [capture_catch poll]]
 						append buffer Wrote $form_filename
 					}
 				}
-				
+
 				append buffer {<table style="padding:0px;border-collapse:collapse;"><tr><td class="formtext">Filename on OpenOCD machine</td><td><input type="text" name="form_filename"></td></tr>}
 				append buffer {<td class="formtext">File to upload</td><td><input type="file" name="form_filecontent"></td></tr></table>}
 				append buffer {<table><tr><td style="height:15px;width:535px;">&nbsp</td></tr><tr><td style="height:1px;width:535px;background-color:#a2c5d1;"></td></tr><tr><td style="height:15px;width:535px;">&nbsp</td></tr></table>}
 				append buffer {<input type="submit" name="form_action" value="Upload" ><br> }
 				append buffer {</form>}
-			
+
 			</tcl>
-			
+
 			]]></markup_code>
 			</pagetext>
-			
+
 		</page>
-		
+
 
 
 		<page lang="eng">
@@ -879,12 +879,12 @@ append console [encode [capture_catch poll]]
 			<pageheading>Target config quick start guide</pageheading>
 			<pagetext>
 				<markup_code><![CDATA[
-				
+
 				A target needs an openocd.cfg file. This config file sets up
 				the CPU, flash and reset init script. Either OpenOCD ships with an
 				openocd.cfg file for your target or you need to take an existing
 				config file and modify it for your needs.
-				<p> 
+				<p>
 				The reset init script is crucial. It will set up e.g. MMU, chip
 				select registers, etc. after a reset. The init.cfg (reset init script)
 				is embedded into the openocd.cfg file in the sampls OpenOCD provides.
@@ -892,24 +892,24 @@ append console [encode [capture_catch poll]]
 				Writing an openocd.cfg from scratch is a non-trivial exercise, but
 				fortunally it only has to be done once for a target and afterwards it
 				rarely if ever needs to be changed.
-				
-				
+
+
 				]]></markup_code>
 				<right_column>
-					
-					  Quick start guide on how to configure a target.
+
+					Quick start guide on how to configure a target.
 				</right_column>
 			</pagetext>
-			
-			
+
+
 		</page>
 
 
-		
+
 
 
 		<page lang="eng">
-			<menulink>index.tcl</menulink> 
+			<menulink>index.tcl</menulink>
 			<level2parent>index.tcl</level2parent>
 			<outfile>terminal.tcl</outfile>
 			<pageheading>UART forwarding</pageheading>
@@ -924,27 +924,27 @@ append console [encode [capture_catch poll]]
 				set form_action [formfetch form_action]
 			</tcl>
 			<form action="terminal.tcl" method="post">
-				Target baudrate: 
+				Target baudrate:
 					<select name="form_baudrate">
 						<tcl>
-							foreach i {9600 19200 38400 57600 115200} { 
+							foreach i {9600 19200 38400 57600 115200} {
+							</tcl>
+								<option <tcl>if {[string compare $form_baudrate $i]==0} { append buffer {selected="selected"} } </tcl>
+								value ="<tcl>append buffer $i</tcl>"><tcl>append buffer $i</tcl></option>
+							<tcl>
+							}
 							</tcl>
-				  				<option <tcl>if {[string compare $form_baudrate $i]==0} { append buffer {selected="selected"} }  </tcl>
-				  				value ="<tcl>append buffer $i</tcl>"><tcl>append buffer $i</tcl></option>
-				  			<tcl>
-				  			}
-				  			</tcl>
 						</select>
 
-					<p>	
+					<p>
 					<input type="submit" name="form_action" value="Set baudrate" >
-				</form>			
+				</form>
 			<tcl>
 				if {[string compare $form_action "Set baudrate"]==0} {
 					append console [encode [ocd_uart $form_baudrate]]
 				}
 			</tcl>
-			
+
 			<h2>Simple UART</h2>
 			This terminal window is purely for illustrative purposes. Use telnet or a terminal program
 			to talk to the target over TCP/IP for anything but trivial case of reading/writing a few
@@ -963,11 +963,11 @@ append console [encode [capture_catch poll]]
 				]]>
 			</right_column>
 			</pagetext>
-			
+
 		</page>
 
 
-		
+
 	</language>
-	
-</website>
\ No newline at end of file
+
+</website>
diff --git a/src/server/httpd/menu.xsl b/src/server/httpd/menu.xsl
index 7b47d9e..b54f16c 100644
--- a/src/server/httpd/menu.xsl
+++ b/src/server/httpd/menu.xsl
@@ -2,7 +2,7 @@
 <!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/TR/REC-html40" version="1.0">
 	<xsl:output method="html" version="4.0" indent="yes" encoding="UTF-8"
-	
+
 	 media-type="text/plain; charset=UTF-8"/>
 
 	<xsl:param name="pagetogenerate" select="UNDEFINED"/>
@@ -16,17 +16,17 @@
 		<html>
 			<head>
 				<title>OpenOCD debugger</title>
-				<meta http-equiv="Content-Type" content="text/html"  charset="utf-8"/>
-				<link href="menuweb.css" rel="stylesheet" type="text/css"/>				
-				
+				<meta http-equiv="Content-Type" content="text/html" charset="utf-8"/>
+				<link href="menuweb.css" rel="stylesheet" type="text/css"/>
+
 			</head>
-	
-			
+
+
 			<tcl>
 				set console ""
 				set upload_filename /ram/upload
 			</tcl>
-			
+
 			<body style="margin:0px;">
 				<div style="width:974px;height:85px;">
 					<div style="float:left;position:relative;left:32px;width:478px;">
@@ -92,17 +92,17 @@
 								</xsl:for-each>
 								<tr>
 									<td style="width:140px;height:35px;background-image:url('menu_cuts/v_1.png')">
-									
+
 									</td>
 								</tr>
 								<tr>
 									<td style="width:140px;background-image:url('menu_cuts/v_2_tile.png')">
-									
+
 									</td>
 								</tr>
 								<tr>
 									<td style="width:140px;height:140px;background-image:url('menu_cuts/v_3.png')">
-									
+
 									</td>
 								</tr>
 							</table>
@@ -142,96 +142,96 @@
 												</xsl:for-each>
 											</tr>
 										</table>
-								 	</td>
-								</tr>			
-							 	<tr>
-							 		<td colspan="6" style="height:30px;width:535px;background-image:url('menu_cuts/center_top.png');background-repeat: no-repeat;background-position:top right;">
-							 			<div style="width:500px;background-color:#ffffff;height:100%;">
-								 			&nbsp;
-							 			</div>
-							 		</td>
-							 	</tr>
-							 	<tr>
-							 		<td colspan="6" style="background-color:#ffffff;text-indent:30px;height:40px;">
-							 			<H1><xsl:value-of select="pageheading"/></H1>
-							 		</td>
-							 	</tr>
-							 	<tr style="height:100%;">
-							 		<td colspan="6" style="background-color:#ffffff;padding-left:30px;padding-right:30px;width=535px;height:100%;">
+									</td>
+								</tr>
+								<tr>
+									<td colspan="6" style="height:30px;width:535px;background-image:url('menu_cuts/center_top.png');background-repeat: no-repeat;background-position:top right;">
+										<div style="width:500px;background-color:#ffffff;height:100%;">
+											&nbsp;
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<td colspan="6" style="background-color:#ffffff;text-indent:30px;height:40px;">
+										<H1><xsl:value-of select="pageheading"/></H1>
+									</td>
+								</tr>
+								<tr style="height:100%;">
+									<td colspan="6" style="background-color:#ffffff;padding-left:30px;padding-right:30px;width=535px;height:100%;">
 										<xsl:value-of disable-output-escaping="yes" select="pagetext/markup_code"/>
-							 		</td>
-							 	</tr>
-							 	<tcl>
-							 		<!-- This is the output from any OpenOCD commands -->
-								 	set toggle_details [formfetch toggle_details]
-								 	if {[string length $toggle_details]==0} {
-								 		set toggle_details 0
-								 	}
-								 	set show_details [load_var show_details]
-								 	if {[string length $show_details]==0} {
-								 		set show_details 0
-								 	}
-								 	if {$toggle_details==1} {
-								 		set show_details [expr 1-$show_details]
-								 		save_var show_details $show_details
-								 	}
-								 	
-							 		if {[string length $console]!=0} {
-							 			</tcl>
-									 	<tr style="height:100%;">
-									 		<td colspan="6" style="height:100%;background-color:red;">
+									</td>
+								</tr>
+								<tcl>
+									<!-- This is the output from any OpenOCD commands -->
+									set toggle_details [formfetch toggle_details]
+									if {[string length $toggle_details]==0} {
+										set toggle_details 0
+									}
+									set show_details [load_var show_details]
+									if {[string length $show_details]==0} {
+										set show_details 0
+									}
+									if {$toggle_details==1} {
+										set show_details [expr 1-$show_details]
+										save_var show_details $show_details
+									}
+
+									if {[string length $console]!=0} {
+										</tcl>
+										<tr style="height:100%;">
+											<td colspan="6" style="height:100%;background-color:red;">
 												<table class="textgray" style="padding:0px;border-collapse:collapse;background-color:#ffffff;width:100%">
-											 		<td style="width:25px;">&nbsp;</td>
-											 		<tcl>
-												 		if {$show_details==1} {
-												 			append buffer <xsl:text disable-output-escaping="yes"><![CDATA[<]]></xsl:text>
-												 			append buffer {td style="background-color:#dddddd;padding-left:5px;padding-right:5px;padding-top:3px;padding-bottom:3px;"}
-												 			append buffer <xsl:text disable-output-escaping="yes"><![CDATA[>]]></xsl:text>
-												 		} else {
-												 			append buffer <xsl:text disable-output-escaping="yes"><![CDATA[<]]></xsl:text>
-												 			append buffer {td style="background-image:url('menu_cuts/h_tab_free.png');width:110px;height:29px;background-repeat: no-repeat;background-position:top left;"}
-												 			append buffer <xsl:text disable-output-escaping="yes"><![CDATA[>]]></xsl:text>
-												 		}
-												 	</tcl>
-											 			<a class="openocd">
+													<td style="width:25px;">&nbsp;</td>
+													<tcl>
+														if {$show_details==1} {
+															append buffer <xsl:text disable-output-escaping="yes"><![CDATA[<]]></xsl:text>
+															append buffer {td style="background-color:#dddddd;padding-left:5px;padding-right:5px;padding-top:3px;padding-bottom:3px;"}
+															append buffer <xsl:text disable-output-escaping="yes"><![CDATA[>]]></xsl:text>
+														} else {
+															append buffer <xsl:text disable-output-escaping="yes"><![CDATA[<]]></xsl:text>
+															append buffer {td style="background-image:url('menu_cuts/h_tab_free.png');width:110px;height:29px;background-repeat: no-repeat;background-position:top left;"}
+															append buffer <xsl:text disable-output-escaping="yes"><![CDATA[>]]></xsl:text>
+														}
+													</tcl>
+														<a class="openocd">
 															<xsl:attribute name="href"><xsl:value-of select="$pagetogenerate"/>?toggle_details=1</xsl:attribute>
 															<tcl>
 															if {$show_details==1} {
 																append buffer "Hide details"
-													 			append buffer <br/>
+																append buffer <br/>
 															} else {
 																append buffer {<div style="position:relative;top:7px;text-align:center;">}
 																append buffer "Show details"
 																append buffer {</div>}
 															}
 															</tcl>
-											 			</a>
-											 			<tcl>
-													 		if {$show_details==1} {
-													 			append buffer $console
-													 		}
-													 	</tcl>
+														</a>
+														<tcl>
+															if {$show_details==1} {
+																append buffer $console
+															}
+														</tcl>
 													 <xsl:text disable-output-escaping="yes"><![CDATA[<]]></xsl:text>/td<xsl:text disable-output-escaping="yes"><![CDATA[>]]></xsl:text>
 													 <tcl>
-													 	if {$show_details!=1} {
-													 		append buffer {<td>&nbsp;</td>}
-													 	}
+														if {$show_details!=1} {
+															append buffer {<td>&nbsp;</td>}
+														}
 													 </tcl>
-											 		<td style="width:25px;">&nbsp;</td>
-											 	</table>
-										 	</td>
+													<td style="width:25px;">&nbsp;</td>
+												</table>
+											</td>
 										 </tr>
-									 	<tcl>
+										<tcl>
 									 }
 								</tcl>
-							 	<tr>
-							 		<td colspan="6" style="height:30px;background-image:url('menu_cuts/center_bottom.png');background-repeat: no-repeat;background-position:top right;">
-							 			<div style="width:500px;background-color:#ffffff;height:100%;">
-								 			&nbsp;
-							 			</div>
-							 		</td>
-							 	</tr>
-						 	</table>
+								<tr>
+									<td colspan="6" style="height:30px;background-image:url('menu_cuts/center_bottom.png');background-repeat: no-repeat;background-position:top right;">
+										<div style="width:500px;background-color:#ffffff;height:100%;">
+											&nbsp;
+										</div>
+									</td>
+								</tr>
+							</table>
 						</td>
 						<td style="width:6px;">
 						</td>
@@ -240,56 +240,56 @@
 								<tr>
 									<td style="width:103px;height:29px;background-image:url('menu_cuts/h_tab2_selected.png');background-repeat: no-repeat;">
 										<div class="textgray" style="position:relative;top:7px;;font-weight:bold;text-align:center;width:100px;">
-										    Documentation
+											Documentation
 										 </div>
-								 	</td>
-								 	<td width="40px">
-								 		&nbsp;
-								 	</td>		
-								 	<td>
-								 	</td>	
+									</td>
+									<td width="40px">
+										&nbsp;
+									</td>
+									<td>
+									</td>
+								</tr>
+								<tr>
+									<td colspan="3" style="height:10px;width:245px;background-image:url('menu_cuts/right_top_small.png');"></td>
+								</tr>
+								<tr>
+									<td colspan="3" style="background-color:#d8d7d7;width:245px;padding-left:10px;padding-buttom:10px;line-height:17px;">
+										<a href="http://openocd.berlios.de/doc/openocd.pdf" target="_blank">OpenOCD Manual</a><br/>
+									</td>
 								</tr>
-							 	<tr>
-							 		<td colspan="3" style="height:10px;width:245px;background-image:url('menu_cuts/right_top_small.png');"></td>
-							 	</tr>
-							 	<tr>
-							 		<td colspan="3" style="background-color:#d8d7d7;width:245px;padding-left:10px;padding-buttom:10px;line-height:17px;">
-							 			<a href="http://openocd.berlios.de/doc/openocd.pdf" target="_blank">OpenOCD Manual</a><br/>
-							 		</td>
-							 	</tr>
-							 	<tr><td colspan="3" style="background-color:#d8d7d7;height:15px;"></td></tr>
-							 	<tr>
-							 		<td colspan="3">
-							 			<table style="padding:0px;border-collapse:collapse;">
-							 				<td style="background-color:#d8d7d7;width:10px;height:1px"></td>
-							 				<td style="background-color:#999999;width:225px; height:1px;"></td>
-							 				<td style="background-color:#d8d7d7;width:10px;height:1px"></td>
-							 			</table>
-							 		</td>
-							 	</tr>
-							 	<tr><td colspan="3" style="background-color:#d8d7d7;height:15px;"></td></tr>
-							 	<tr style="height:100%;">
-							 		<td class="textgray" colspan="3"  style="height:100%;background-color:#d8d7d7;padding-left:10px;padding-right:10px;">
+								<tr><td colspan="3" style="background-color:#d8d7d7;height:15px;"></td></tr>
+								<tr>
+									<td colspan="3">
+										<table style="padding:0px;border-collapse:collapse;">
+											<td style="background-color:#d8d7d7;width:10px;height:1px"></td>
+											<td style="background-color:#999999;width:225px; height:1px;"></td>
+											<td style="background-color:#d8d7d7;width:10px;height:1px"></td>
+										</table>
+									</td>
+								</tr>
+								<tr><td colspan="3" style="background-color:#d8d7d7;height:15px;"></td></tr>
+								<tr style="height:100%;">
+									<td class="textgray" colspan="3" style="height:100%;background-color:#d8d7d7;padding-left:10px;padding-right:10px;">
 										<xsl:choose>
 											<xsl:when test="(pagetext/right_column)">
 												<xsl:value-of disable-output-escaping="yes" select="pagetext/right_column"/>
 											</xsl:when>
 											<xsl:otherwise>
-		
+
 											</xsl:otherwise>
 										</xsl:choose>
-							 		</td>
-							 	</tr>
-							 	<tr>
-							 		<td colspan="3" style="height:30px;background-image:url('menu_cuts/right_bottom.png');">
-							 			&nbsp;
-							 		</td>
-							 	</tr>
+									</td>
+								</tr>
+								<tr>
+									<td colspan="3" style="height:30px;background-image:url('menu_cuts/right_bottom.png');">
+										&nbsp;
+									</td>
+								</tr>
 							 </table>
-				
+
 						</td>
 					</tr>
-					
+
 				</table>
 			</body>
 		</html>
diff --git a/src/server/httpd/menuweb.css b/src/server/httpd/menuweb.css
index ac87c85..60c6239 100644
--- a/src/server/httpd/menuweb.css
+++ b/src/server/httpd/menuweb.css
@@ -70,7 +70,7 @@ body
 	font-size: 12px;
 	line-height: 15px;
 	color : #024d67;
-	
+
 }
 
 h1
@@ -86,7 +86,7 @@ td
 {
 	padding: 0px;
 	font-size: 12px;
- 	vertical-align:top;
+	vertical-align:top;
 
 }
 
@@ -95,7 +95,7 @@ td
 	color: #cccccc;
 	padding: 0px;
 	font-size: 12px;
- 	vertical-align:top;
+	vertical-align:top;
 
 }
 
diff --git a/src/server/httpd/readme.txt b/src/server/httpd/readme.txt
index bade32c..7bc80e6 100644
--- a/src/server/httpd/readme....
 
[truncated message content]