From dd318f824366281fcd8690ecae43c1ce54d4df59 Mon Sep 17 00:00:00 2001
From: Jim Paris <jim@jtan.com>
Date: Mon, 22 Aug 2011 16:48:14 -0400
Subject: [PATCH] Fix redbee config files

Currently the board/redbee-*.cfg files incorrectly include the
interface definition.  Move the interfaces to interface/,
and create a single board/redbee.cfg that is common to both boards.
Intended usage is now:
  openocd -f interface/redbee-econotag.cfg -f board/redbee.cfg
---
 tcl/board/redbee-econotag.cfg     | 8 --------
 tcl/board/redbee-usb.cfg          | 8 --------
 tcl/board/redbee.cfg              | 1 +
 tcl/interface/redbee-econotag.cfg | 6 ++++++
 tcl/interface/redbee-usb.cfg      | 6 ++++++
 5 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 tcl/board/redbee-econotag.cfg
 delete mode 100644 tcl/board/redbee-usb.cfg
 create mode 100644 tcl/board/redbee.cfg
 create mode 100644 tcl/interface/redbee-econotag.cfg
 create mode 100644 tcl/interface/redbee-usb.cfg

diff --git a/tcl/board/redbee-econotag.cfg b/tcl/board/redbee-econotag.cfg
deleted file mode 100644
index 7a02ce0d9..000000000
--- a/tcl/board/redbee-econotag.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-source [find target/mc13224v.cfg]
-
-# The redbee-econotag has an onboard ft2232h with channel A wired
-# to the JTAG pins on the mc13224v
-# channel B is wired to UART1
-interface ft2232
-ft2232_layout redbee-econotag
-ft2232_vid_pid 0x0403 0x6010
diff --git a/tcl/board/redbee-usb.cfg b/tcl/board/redbee-usb.cfg
deleted file mode 100644
index 3aa68c10a..000000000
--- a/tcl/board/redbee-usb.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-source [find target/mc13224v.cfg]
-
-# The redbee-econotag has an onboard ft2232h with
-# channel B wired to the JTAG pins on the mc13224v
-# channel A is wired to UART1 on the mc13224v
-interface ft2232
-ft2232_layout redbee-usb
-ft2232_vid_pid 0x0403 0x6010
diff --git a/tcl/board/redbee.cfg b/tcl/board/redbee.cfg
new file mode 100644
index 000000000..046e7a478
--- /dev/null
+++ b/tcl/board/redbee.cfg
@@ -0,0 +1 @@
+source [find target/mc13224v.cfg]
diff --git a/tcl/interface/redbee-econotag.cfg b/tcl/interface/redbee-econotag.cfg
new file mode 100644
index 000000000..2dcd02782
--- /dev/null
+++ b/tcl/interface/redbee-econotag.cfg
@@ -0,0 +1,6 @@
+# The redbee-econotag has an onboard ft2232h with
+# ft2232h channel A wired to mc13224v JTAG
+# ft2232h channel B wired to mc13224v UART1 
+interface ft2232
+ft2232_layout redbee-econotag
+ft2232_vid_pid 0x0403 0x6010
diff --git a/tcl/interface/redbee-usb.cfg b/tcl/interface/redbee-usb.cfg
new file mode 100644
index 000000000..8fa7b0be3
--- /dev/null
+++ b/tcl/interface/redbee-usb.cfg
@@ -0,0 +1,6 @@
+# The redbee-usb has an onboard ft2232h with
+# ft2232h channel B wired to mc13224v JTAG
+# ft2232h channel A wired to mc13224v UART1 
+interface ft2232
+ft2232_layout redbee-usb
+ft2232_vid_pid 0x0403 0x6010