From: Bill Traynor <wmat@alphatroop.com>
Date: Tue, 8 May 2012 13:32:35 +0000 (-0400)
Subject: cfg: Deleted duplicate busblaster.cfg and renamed original.
X-Git-Tag: v0.6.0-rc1~109
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=dcb222e072f75b1a723dada56f4f3e5adbeeb673

cfg: Deleted duplicate busblaster.cfg and renamed original.

The busblaster.cfg was contributed on April 23, 2012 and is a
duplicate of dp_busblaster.cfg that was contributed on Oct. 23,
2011.  Therefore, deleting the second version.  Also, renaming
the original dp_busblaster.cfg to simply busblaster.cfg, as this
name is more concise.

Change-Id: Iccb1f10f53dbbb248b1ff4c6295eaf67c32247c1
Signed-off-by: Bill Traynor <wmat@alphatroop.com>
Reviewed-on: http://openocd.zylin.com/622
Tested-by: jenkins
Reviewed-by: Peter Stuge <peter@stuge.se>
---

diff --git a/tcl/interface/busblaster.cfg b/tcl/interface/busblaster.cfg
index e93b07de2e..f87a482e3d 100644
--- a/tcl/interface/busblaster.cfg
+++ b/tcl/interface/busblaster.cfg
@@ -1,10 +1,14 @@
 #
-# Dangerous Prototypes Bus Blaster
+# Dangerous Prototypes - Bus Blaster
 #
-# http://dangerousprototypes.com/
+# The Bus Blaster has a configurable buffer between the FTDI FT2232H and the
+# JTAG header which allows it to emulate various debugger types. It comes
+# configured as a JTAGkey device.
+#
+# http://dangerousprototypes.com/docs/Bus_Blaster
 #
 
 interface ft2232
-ft2232_vid_pid 0x0403 0x6010
 ft2232_device_desc "Dual RS232-HS"
 ft2232_layout jtagkey
+ft2232_vid_pid 0x0403 0x6010
diff --git a/tcl/interface/dp_busblaster.cfg b/tcl/interface/dp_busblaster.cfg
deleted file mode 100644
index f87a482e3d..0000000000
--- a/tcl/interface/dp_busblaster.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Dangerous Prototypes - Bus Blaster
-#
-# The Bus Blaster has a configurable buffer between the FTDI FT2232H and the
-# JTAG header which allows it to emulate various debugger types. It comes
-# configured as a JTAGkey device.
-#
-# http://dangerousprototypes.com/docs/Bus_Blaster
-#
-
-interface ft2232
-ft2232_device_desc "Dual RS232-HS"
-ft2232_layout jtagkey
-ft2232_vid_pid 0x0403 0x6010