diff options
author | marcoveeneman <marco-veeneman@hotmail.com> | 2016-07-05 23:15:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-05 23:15:35 +0200 |
commit | 0131027151415075106a82984b441ebe26d90047 (patch) | |
tree | d87057000c4b3bea5ddf3a4fffabc838a2695b4b /testhal/TIVA/TM4C123x/SPI | |
parent | 2de67e2f4a268eae072c5fd76a1b160124cee4f6 (diff) | |
parent | 0e86736605157335b7df60d8629739451d478646 (diff) | |
download | ChibiOS-Contrib-0131027151415075106a82984b441ebe26d90047.tar.gz ChibiOS-Contrib-0131027151415075106a82984b441ebe26d90047.tar.bz2 ChibiOS-Contrib-0131027151415075106a82984b441ebe26d90047.zip |
Merge pull request #86 from marcoveeneman/master
Various Tiva fixes
Diffstat (limited to 'testhal/TIVA/TM4C123x/SPI')
-rw-r--r-- | testhal/TIVA/TM4C123x/SPI/.cproject | 3 | ||||
-rw-r--r-- | testhal/TIVA/TM4C123x/SPI/.project | 11 | ||||
-rw-r--r-- | testhal/TIVA/TM4C123x/SPI/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/testhal/TIVA/TM4C123x/SPI/.cproject b/testhal/TIVA/TM4C123x/SPI/.cproject index 483936f..d3a2482 100644 --- a/testhal/TIVA/TM4C123x/SPI/.cproject +++ b/testhal/TIVA/TM4C123x/SPI/.cproject @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?fileVersion 4.0.0?> -<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> +<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> <storageModule moduleId="org.eclipse.cdt.core.settings"> <cconfiguration id="0.114656749"> <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.114656749" moduleId="org.eclipse.cdt.core.settings" name="Default"> diff --git a/testhal/TIVA/TM4C123x/SPI/.project b/testhal/TIVA/TM4C123x/SPI/.project index 150ab22..6301d40 100644 --- a/testhal/TIVA/TM4C123x/SPI/.project +++ b/testhal/TIVA/TM4C123x/SPI/.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/SPI/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch b/testhal/TIVA/TM4C123x/SPI/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch index 8772f9c..0af6b44 100644 --- a/testhal/TIVA/TM4C123x/SPI/debug/OpenOCD on ICDI (prompts for .cfg target configuration).launch +++ b/testhal/TIVA/TM4C123x/SPI/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 "telnet_port 4444" -f "interface/ti-icdi.cfg" -f "${file_prompt}""/> -<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> |