From dd71fc76e9c40b394a923e3007cb69be787d9af9 Mon Sep 17 00:00:00 2001
From: Megan Wachs <megan@sifive.com>
Date: Tue, 24 Jan 2017 10:14:13 -0800
Subject: Use consistent OpenOCD config for Arty and HiFive1

---
 bsp/env/freedom-e300-arty/openocd.cfg    | 16 +++++++++++++++-
 bsp/env/freedom-e300-hifive1/openocd.cfg |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bsp/env/freedom-e300-arty/openocd.cfg b/bsp/env/freedom-e300-arty/openocd.cfg
index 251dc52..f4b28ed 100644
--- a/bsp/env/freedom-e300-arty/openocd.cfg
+++ b/bsp/env/freedom-e300-arty/openocd.cfg
@@ -1,6 +1,16 @@
 adapter_khz     10000
 
-source [find interface/ftdi/olimex-arm-usb-tiny-h.cfg]
+#source [find interface/ftdi/olimex-arm-usb-tiny-h.cfg]
+
+interface ftdi
+ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
+ftdi_vid_pid 0x15ba 0x002a
+
+ftdi_layout_init 0x0808 0x0a1b
+ftdi_layout_signal nSRST -oe 0x0200
+ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
+ftdi_layout_signal LED -data 0x0800
+#
 
 set _CHIPNAME riscv
 jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x10e31913
@@ -12,5 +22,9 @@ $_TARGETNAME configure -work-area-phys 0x80000000 -work-area-size 10000 -work-ar
 flash bank my_first_flash fespi 0x20000000 0 0 0 $_TARGETNAME
 init
 #reset
+if {[ info exists pulse_srst]} {
+  ftdi_set_signal nSRST 0
+  ftdi_set_signal nSRST z
+}
 halt
 #flash protect 0 64 last off
diff --git a/bsp/env/freedom-e300-hifive1/openocd.cfg b/bsp/env/freedom-e300-hifive1/openocd.cfg
index b0a8e26..b531e9c 100644
--- a/bsp/env/freedom-e300-hifive1/openocd.cfg
+++ b/bsp/env/freedom-e300-hifive1/openocd.cfg
@@ -31,4 +31,4 @@ if {[ info exists pulse_srst]} {
   sleep 1500
 }	
 halt
-flash protect 0 64 last off
+#flash protect 0 64 last off
-- 
cgit v1.2.1-18-gbd029