From 2d43c2d82f4764625378a136bcaf2f3fb03bc5d9 Mon Sep 17 00:00:00 2001
From: dankers <dankers>
Date: Fri, 22 Jan 2010 03:54:47 +0000
Subject: [PATCH] Back to real tiny-h

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@135 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg     |  8 ++++----
 flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg.new | 11 -----------
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg.new

diff --git a/flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg b/flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg
index 569dcef59..b6aa952f3 100644
--- a/flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg
+++ b/flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg
@@ -1,11 +1,11 @@
 #
-# Olimex ARM-USB-OCD
+# Olimex ARM-USB-TINY-H
 #
-# http://www.olimex.com/dev/arm-usb-ocd.html
+# http://www.olimex.com/dev/arm-usb-tiny-h.html
 #
 
 interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG"
+ft2232_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
 ft2232_layout olimex-jtag
-ft2232_vid_pid 0x15ba 0x0003
+ft2232_vid_pid 0x15ba 0x002a
 
diff --git a/flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg.new b/flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg.new
deleted file mode 100644
index b6aa952f3..000000000
--- a/flight/Project/OpenOCD/olimex-arm-usb-tiny-h.cfg.new
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Olimex ARM-USB-TINY-H
-#
-# http://www.olimex.com/dev/arm-usb-tiny-h.html
-#
-
-interface ft2232
-ft2232_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
-ft2232_layout olimex-jtag
-ft2232_vid_pid 0x15ba 0x002a
-