aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-09-20 17:12:38 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-09-20 17:12:38 +0000
commit41504f2f4adec1cef7db08293c616c6ace7f895f (patch)
tree9ee9bde8b4b4bde4d4419967aa0ce3eebbc1552e /tools
parent3f7dc10eb071ed88f1287366f639df9165dcc5a9 (diff)
downloadChibiOS-41504f2f4adec1cef7db08293c616c6ace7f895f.tar.gz
ChibiOS-41504f2f4adec1cef7db08293c616c6ace7f895f.tar.bz2
ChibiOS-41504f2f4adec1cef7db08293c616c6ace7f895f.zip
Improved OpenOCD launch configurations.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10655 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'tools')
-rw-r--r--tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch19
-rw-r--r--tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch19
-rw-r--r--tools/eclipse/debug/OpenOCD on ST-Link V2 (prompts for .cfg target configuration).launch19
-rw-r--r--tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch19
4 files changed, 36 insertions, 40 deletions
diff --git a/tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch
index 1f94272fa..fd552ce4b 100644
--- a/tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch
+++ b/tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${eclipse_home}\..\tools\openocd\bin\openocd.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -f &quot;interface/olimex-arm-usb-ocd.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${eclipse_home}\..\tools\openocd\bin\"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -f &quot;interface/olimex-arm-usb-ocd.cfg&quot; -f &quot;${file_prompt}&quot;"/>
+</launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch
index c3778ea7b..9c0956353 100644
--- a/tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch
+++ b/tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${eclipse_home}\..\tools\openocd\bin\openocd.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -f &quot;interface/stlink-v1.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${eclipse_home}\..\tools\openocd\bin\"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -f &quot;interface/stlink-v1.cfg&quot; -f &quot;${file_prompt}&quot;"/>
+</launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on ST-Link V2 (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on ST-Link V2 (prompts for .cfg target configuration).launch
index 01728ced6..52a239749 100644
--- a/tools/eclipse/debug/OpenOCD on ST-Link V2 (prompts for .cfg target configuration).launch
+++ b/tools/eclipse/debug/OpenOCD on ST-Link V2 (prompts for .cfg target configuration).launch
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${eclipse_home}\..\tools\openocd\bin\openocd.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;interface/stlink-v2.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${eclipse_home}\..\tools\openocd\bin\"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;interface/stlink-v2.cfg&quot; -f &quot;${file_prompt}&quot;"/>
+</launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch
index 18cf5f345..f316e62f8 100644
--- a/tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch
+++ b/tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${eclipse_home}\..\tools\openocd\bin\openocd.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;interface/stlink-v2-1.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${eclipse_home}\..\tools\openocd\bin\"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;interface/stlink-v2-1.cfg&quot; -f &quot;${file_prompt}&quot;"/>
+</launchConfiguration>