From 0cc957bc9c130b408da6742d03302e6cb35ccbc5 Mon Sep 17 00:00:00 2001
From: corvus <corvus>
Date: Fri, 28 Jan 2011 12:31:13 +0000
Subject: [PATCH] reverting bad commit of these files

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2605 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 flight/AHRS/Makefile                       |  2 +-
 flight/OpenPilot/Makefile                  |  2 +-
 flight/Project/OpenOCD/floss-jtag.ahrs.cfg | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flight/AHRS/Makefile b/flight/AHRS/Makefile
index 6e4c544d7..a543dc7fb 100644
--- a/flight/AHRS/Makefile
+++ b/flight/AHRS/Makefile
@@ -26,7 +26,7 @@
 # Set developer code and compile options
 # Set to YES for debugging
 DEBUG ?= NO
-USE_BOOTLOADER ?= YES
+USE_BOOTLOADER ?= NO
 
 # Set to YES when using Code Sourcery toolchain
 CODE_SOURCERY ?= YES
diff --git a/flight/OpenPilot/Makefile b/flight/OpenPilot/Makefile
index aeb7ad645..803bcf995 100644
--- a/flight/OpenPilot/Makefile
+++ b/flight/OpenPilot/Makefile
@@ -34,7 +34,7 @@ ENABLE_DEBUG_PINS ?= NO
 ENABLE_AUX_UART ?= NO
 
 #
-USE_BOOTLOADER ?= YES
+USE_BOOTLOADER ?= NO
 
 
 # Set to YES when using Code Sourcery toolchain
diff --git a/flight/Project/OpenOCD/floss-jtag.ahrs.cfg b/flight/Project/OpenOCD/floss-jtag.ahrs.cfg
index a2214c6f4..f2555e55a 100644
--- a/flight/Project/OpenOCD/floss-jtag.ahrs.cfg
+++ b/flight/Project/OpenOCD/floss-jtag.ahrs.cfg
@@ -1,15 +1,15 @@
 #
-# Floss JTAG OpenPilot
+# Floss JTAG for AHRS
 #
 
 interface ft2232
 ft2232_vid_pid 0x0403 0x6010
-#ft2232_device_desc "Dual RS232-HS"
-#ft2232_bus_addr "002:088"
+ft2232_device_desc "Dual RS232-HS"
+#ft2232_bus_addr "002:103"
 #ft2232_serial "1234567890"
 ft2232_layout "usbjtag"
 ft2232_latency 2
 
 gdb_port 3334
-tcl_port 6666
-telnet_port 4444
+tcl_port 6667
+telnet_port 4445