5 files changed, 45 insertions, 0 deletions
diff --git a/readme.txt b/readme.txt
index 28a9997f6..fa87282d2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,11 @@
 *****************************************************************************
 
 *** Next ***
+- NEW: Added shared Eclipse debug configurations for OpenOCD under
+       ./tools/eclipse/debug. Now it is no more required to re-create
+       those each time a new workspace is created, just import the global
+       ChibiOS project in it. The configurations will appear under the
+       Eclipse Tools menu.
 - NEW: Added an USB_CDC multi-target demo application showcasing how to
        manage a project with multiple target boards/devices and handle
        portability issues.
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
new file mode 100644
index 000000000..1f94272fa
--- /dev/null
+++ b/tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch
@@ -0,0 +1,10 @@
+<?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>
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
new file mode 100644
index 000000000..c3778ea7b
--- /dev/null
+++ b/tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch
@@ -0,0 +1,10 @@
+<?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>
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
new file mode 100644
index 000000000..01728ced6
--- /dev/null
+++ b/tools/eclipse/debug/OpenOCD on ST-Link V2 (prompts for .cfg target configuration).launch
@@ -0,0 +1,10 @@
+<?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>
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
new file mode 100644
index 000000000..18cf5f345
--- /dev/null
+++ b/tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch
@@ -0,0 +1,10 @@
+<?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>