From 8b484ba88e16ec8a01482d94f27407966cecdaea Mon Sep 17 00:00:00 2001
From: Karl Palsson <karlp@tweak.net.au>
Date: Tue, 27 Sep 2016 22:23:57 +0000
Subject: oocd: move stm32f1 config file to common

---
 tests/adc-power/Makefile.stm32f103-generic    |  2 +-
 tests/adc-power/openocd.stm32f103-generic.cfg | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 tests/adc-power/openocd.stm32f103-generic.cfg

(limited to 'tests')

diff --git a/tests/adc-power/Makefile.stm32f103-generic b/tests/adc-power/Makefile.stm32f103-generic
index f71e4b5..845affa 100644
--- a/tests/adc-power/Makefile.stm32f103-generic
+++ b/tests/adc-power/Makefile.stm32f103-generic
@@ -34,5 +34,5 @@ OPENCM3_DIR=../../libopencm3
 DEVICE=stm32f103x8
 #OOCD_INTERFACE = jlink
 #OOCD_TARGET = stm32f1x
-OOCD_FILE = openocd.stm32f103-generic.cfg
+OOCD_FILE = ../../openocd/openocd.stm32f103-generic.cfg
 include ../../rules.mk
diff --git a/tests/adc-power/openocd.stm32f103-generic.cfg b/tests/adc-power/openocd.stm32f103-generic.cfg
deleted file mode 100644
index f2da08c..0000000
--- a/tests/adc-power/openocd.stm32f103-generic.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-# Unfortunately, with no f103 disco, we're currently
-# using a separate disco board
-source [find interface/stlink-v2.cfg]
-set WORKAREASIZE 0x2000
-source [find target/stm32f1x.cfg]
-
-# Serial of my l1 disco used as stlink here.
-#hla_serial "S?l\x06H?WQ%\x10\x18?"
-# if f4 disco
-hla_serial "W?k\x06IgHV0H\x10?"
-
-tpiu config internal swodump.stm32f103-generic.log uart off 72000000
-
-# Uncomment to reset on connect, for grabbing under WFI et al
-reset_config srst_only srst_nogate
-# reset_config srst_only srst_nogate connect_assert_srst
-
-- 
cgit