diff options
5 files changed, 39 insertions, 41 deletions
diff --git a/readme.txt b/readme.txt index 6d44c2da4..8b925b0be 100644 --- a/readme.txt +++ b/readme.txt @@ -112,7 +112,9 @@ ./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.
+ Eclipse Tools menu. It is required to create an OPENOCD environment
+ variable pointing to the OpenOCD executable. It will be done in
+ ChibiStudio 20 by default.
- NEW: Improved the various rules.mk to handle "touching" of all
included makefiles, now the makefile is no more assumed to
be called "Makefile".
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 "telnet_port 4444" -f "interface/olimex-arm-usb-ocd.cfg" -f "${file_prompt}""/>
-<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 "telnet_port 4444" -f "interface/olimex-arm-usb-ocd.cfg" -f "${file_prompt}""/> +</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 "telnet_port 4444" -f "interface/stlink-v1.cfg" -f "${file_prompt}""/>
-<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 "telnet_port 4444" -f "interface/stlink-v1.cfg" -f "${file_prompt}""/> +</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 "telnet_port 4444" -s "/ChibiStudio/tools/openocd/scripts" -f "interface/stlink-v2.cfg" -f "${file_prompt}""/>
-<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 "telnet_port 4444" -s "/ChibiStudio/tools/openocd/scripts" -f "interface/stlink-v2.cfg" -f "${file_prompt}""/> +</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 "telnet_port 4444" -s "/ChibiStudio/tools/openocd/scripts" -f "interface/stlink-v2-1.cfg" -f "${file_prompt}""/>
-<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 "telnet_port 4444" -s "/ChibiStudio/tools/openocd/scripts" -f "interface/stlink-v2-1.cfg" -f "${file_prompt}""/> +</launchConfiguration> |