aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/TIVA/TM4C123x/GPT
diff options
context:
space:
mode:
authorStephane D'Alu <sdalu@sdalu.com>2016-07-07 21:31:22 +0200
committerStephane D'Alu <sdalu@sdalu.com>2016-07-07 21:31:22 +0200
commit60ce974437bd0cd4f59a7bf2617a81644253aacf (patch)
tree0820df5b36bf7645997df9ed0c17b81585928f0f /testhal/TIVA/TM4C123x/GPT
parentf75abd1037a5c2eb119533eb2f4c7c16d874abf2 (diff)
parentc7f7b70596d200afb76c3c8a24d4ddaaa61a2f1e (diff)
downloadChibiOS-Contrib-60ce974437bd0cd4f59a7bf2617a81644253aacf.tar.gz
ChibiOS-Contrib-60ce974437bd0cd4f59a7bf2617a81644253aacf.tar.bz2
ChibiOS-Contrib-60ce974437bd0cd4f59a7bf2617a81644253aacf.zip
Merge branch 'master' into qei
Diffstat (limited to 'testhal/TIVA/TM4C123x/GPT')
-rw-r--r--testhal/TIVA/TM4C123x/GPT/.project11
-rw-r--r--testhal/TIVA/TM4C123x/GPT/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch2
2 files changed, 4 insertions, 9 deletions
diff --git a/testhal/TIVA/TM4C123x/GPT/.project b/testhal/TIVA/TM4C123x/GPT/.project
index ae2b92b..8a852ff 100644
--- a/testhal/TIVA/TM4C123x/GPT/.project
+++ b/testhal/TIVA/TM4C123x/GPT/.project
@@ -79,22 +79,17 @@
<link>
<name>board</name>
<type>2</type>
- <locationURI>CHIBIOS3/community/os/hal/boards/TI_TM4C123G_LAUNCHPAD</locationURI>
+ <locationURI>PARENT-1-CHIBIOS/ChibiOS-Contrib/os/hal/boards/TI_TM4C123G_LAUNCHPAD</locationURI>
</link>
<link>
<name>community_os</name>
<type>2</type>
- <locationURI>CHIBIOS3/community/os</locationURI>
+ <locationURI>PARENT-1-CHIBIOS/ChibiOS-Contrib/os</locationURI>
</link>
<link>
<name>os</name>
<type>2</type>
- <locationURI>CHIBIOS3/os</locationURI>
- </link>
- <link>
- <name>test</name>
- <type>2</type>
- <locationURI>CHIBIOS3/test</locationURI>
+ <locationURI>CHIBIOS/os</locationURI>
</link>
</linkedResources>
<variableList>
diff --git a/testhal/TIVA/TM4C123x/GPT/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch b/testhal/TIVA/TM4C123x/GPT/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch
index 8772f9c..0af6b44 100644
--- a/testhal/TIVA/TM4C123x/GPT/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch
+++ b/testhal/TIVA/TM4C123x/GPT/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch
@@ -6,5 +6,5 @@
<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/ti-icdi.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${eclipse_home}\..\tools\openocd\bin\"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${eclipse_home}\..\tools\openocd\scripts\"/>
</launchConfiguration>