diff --git a/tcl/target/at91rm9200.cfg b/tcl/target/at91rm9200.cfg
index 58c7318eb..0e672ff3a 100644
--- a/tcl/target/at91rm9200.cfg
+++ b/tcl/target/at91rm9200.cfg
@@ -1,3 +1,5 @@
+# Atmel AT91rm9200
+# http://atmel.com/products/at91/
 
 reset_config trst_and_srst
 
@@ -21,31 +23,27 @@ if { [info exists CPUTAPID ] } {
 
 # Never allow the following!
 if { $_CPUTAPID == 0x15b0203f } {
-   puts "-------------------------------------------------------"
-   puts "- ERROR:                                              -"
-   puts "- ERROR: TapID 0x15b0203f is wrong for at91rm9200      -"
-   puts "- ERROR: The chip/board has a JTAG select pin/jumper  -"
-   puts "- ERROR:                                              -"
-   puts "- ERROR: In one position (0x05b0203f) it selects the   -"
-   puts "- ERROR: ARM CPU, in the other position (0x1b0203f)   -"
-   puts "- ERROR: it selects boundry-scan not the ARM          -"
-   puts "- ERROR:                                              -"
-   puts "-------------------------------------------------------"
+   echo "-------------------------------------------------------"
+   echo "- ERROR:                                              -"
+   echo "- ERROR: TapID 0x15b0203f is wrong for at91rm9200     -"
+   echo "- ERROR: The chip/board has a JTAG select pin/jumper  -"
+   echo "- ERROR:                                              -"
+   echo "- ERROR: In one position (0x05b0203f) it selects the  -"
+   echo "- ERROR: ARM CPU, in the other position (0x1b0203f)   -"
+   echo "- ERROR: it selects boundry-scan not the ARM          -"
+   echo "- ERROR:                                              -"
+   echo "-------------------------------------------------------"
 }
 
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
-
 # Create the GDB Target.
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME 
+
 # AT91RM9200 has a 16K block of sram @ 0x0020.0000
-$_TARGETNAME configure -work-area-virt 0x00200000 -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup 1
+$_TARGETNAME configure -work-area-virt 0x00200000 -work-area-phys 0x00200000 \
+		-work-area-size 0x4000 -work-area-backup 1
 
 # This chip has a DCC ... use it
 arm7_9 dcc_downloads enable
-
-
-
-
-