Merge pull request #2359 from thomaseichinger/nucleo-l1_openocd_futureproof

boards/nucleo-l1: use upstream openocd configuration

boards/nucleo-l1/dist/debug-server.sh

@@ -4,7 +4,9 @@ echo "##"
 echo "## Starting debug server"
 echo "##"
 
-openocd -f "${RIOTBOARD}/${BOARD}/dist/openocd.cfg" \
+# Needs OpenOCD version 0.9.0 built after Jan. 26th 2015
+
+openocd -f "board/st_nucleo_l1.cfg" \
     -c "init" \
     -c "targets" \
     -c "reset halt"

boards/nucleo-l1/dist/flash.sh

@@ -4,7 +4,9 @@ echo "##"
 echo "## Flashing $1"
 echo "##"
 
-openocd -f "${RIOTBOARD}/${BOARD}/dist/openocd.cfg" \
+# Needs OpenOCD version 0.9.0 built after Jan. 26th 2015
+
+openocd -f "board/st_nucleo_l1.cfg" \
     -c "init" \
     -c "targets" \
     -c "reset halt" \

boards/nucleo-l1/dist/openocd.cfg

@@ -1,18 +0,0 @@
-# stml1 Target
-source [find interface/stlink-v2-1.cfg]
-
-transport select hla_swd
-
-# during development of openocd the existing configuration
-# for this board's MCU got renamed. This tries to test against
-# the different versions.
-# See https://github.com/RIOT-OS/RIOT/pull/2343
-# Should be obsolete with http://openocd.zylin.com/#/c/2489/
-
-if [catch {find target/stm32l.cfg}] {
-    source [find target/stm32l1.cfg]
-    reset_config srst_only
-} else {
-    source [find target/stm32l.cfg]
-    reset_config srst_only srst_nogate
-}

boards/nucleo-l1/dist/reset.sh

@@ -4,7 +4,9 @@ echo "##"
 echo "## Resetting $1"
 echo "##"
 
-openocd -f "${RIOTBOARD}/${BOARD}/dist/openocd.cfg" \
+# Needs OpenOCD version 0.9.0 built after Jan. 26th 2015
+
+openocd -f "board/st_nucleo_l1.cfg" \
     -c "init" \
     -c "reset run"\
     -c "shutdown"