From f949a6d4f8f2de193a5e57449feb09b7cd7504ea Mon Sep 17 00:00:00 2001
From: Sarah Marsh <Sarah.Marsh@arm.com>
Date: Tue, 27 Sep 2016 16:08:17 -0500
Subject: [PATCH 1/4] Initial Eclipse suport

---
 tools/export/__init__.py                 |  4 +-
 tools/export/cdt/.cproject.tmpl          | 84 ++++++++++++++++++++++++
 tools/export/cdt/.project.tmpl           | 27 ++++++++
 tools/export/cdt/necessary_software.tmpl | 16 +++++
 tools/export/cdt/py_ocd_settings.tmpl    | 67 +++++++++++++++++++
 5 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100644 tools/export/cdt/.cproject.tmpl
 create mode 100644 tools/export/cdt/.project.tmpl
 create mode 100644 tools/export/cdt/necessary_software.tmpl
 create mode 100644 tools/export/cdt/py_ocd_settings.tmpl

diff --git a/tools/export/__init__.py b/tools/export/__init__.py
index 4b0a29471e..3728eb5a96 100644
--- a/tools/export/__init__.py
+++ b/tools/export/__init__.py
@@ -21,7 +21,7 @@ import yaml
 
 from tools.export import uvision4, uvision5, codered, makefile, ds5_5, iar
 from tools.export import emblocks, coide, kds, simplicityv3, atmelstudio
-from tools.export import sw4stm32, e2studio, zip
+from tools.export import sw4stm32, e2studio, zip, eclipse
 from tools.export.exporters import OldLibrariesException, FailedBuildException
 from tools.targets import TARGET_NAMES, EXPORT_MAP, TARGET_MAP
 
@@ -45,7 +45,7 @@ EXPORTERS = {
     'atmelstudio' : atmelstudio.AtmelStudio,
     'sw4stm32'    : sw4stm32.Sw4STM32,
     'e2studio' : e2studio.E2Studio,
-    'zip' : zip.ZIP,
+    'zip' : zip.ZIP
 }
 
 ERROR_MESSAGE_UNSUPPORTED_TOOLCHAIN = """
diff --git a/tools/export/cdt/.cproject.tmpl b/tools/export/cdt/.cproject.tmpl
new file mode 100644
index 0000000000..9635abfbcb
--- /dev/null
+++ b/tools/export/cdt/.cproject.tmpl
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="0.936619452">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.936619452" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration buildProperties="" description="" id="0.936619452" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+					<folderInfo id="0.936619452." name="/" resourcePath="">
+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.957782855" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.957782855.1870418474" name=""/>
+							<builder arguments="compile -j0 -t GCC_ARM -m {{target}} -o debug-info" command="mbed-cli" id="org.eclipse.cdt.build.core.settings.default.builder.1415080330" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.445325914" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.302788810" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1008027188" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
+									{% for p in include_paths %}
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/{{p}}}&quot;"/>
+								    {% endfor %}
+								</option>
+								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1670933615" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
+									{% for symbol in asm_symbols %}
+                                    <listOptionValue builtIn="false" value="{{symbol}}"/>
+                                    {% endfor %}
+								</option>
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.775336684" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.162714252" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1406944528" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
+									{% for p in include_paths %}
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/{{p}}}&quot;"/>
+								    {% endfor %}
+								</option>
+								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.496389156" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
+									{% for symbol in c_symbols %}
+                                    <listOptionValue builtIn="false" value="{{symbol}}"/>
+                                    {% endfor %}
+								</option>
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.869095164" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.460204758" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.867151072" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
+									{% for p in include_paths %}
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/{{p}}}&quot;"/>
+								    {% endfor %}
+								</option>
+								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1395532696" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
+									{% for symbol in c_symbols %}
+                                    <listOptionValue builtIn="false" value="{{symbol}}"/>
+                                    {% endfor %}
+								</option>
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1704200665" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="{{name}}.null.1423711414" name="{{name}}"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="0.936619452">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Default">
+			<resource resourceType="PROJECT" workspacePath="/mbed-os-example-blinky"/>
+		</configuration>
+	</storageModule>
+</cproject>
diff --git a/tools/export/cdt/.project.tmpl b/tools/export/cdt/.project.tmpl
new file mode 100644
index 0000000000..ce4e268083
--- /dev/null
+++ b/tools/export/cdt/.project.tmpl
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>{{name}}</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/export/cdt/necessary_software.tmpl b/tools/export/cdt/necessary_software.tmpl
new file mode 100644
index 0000000000..e3c0b3c4a0
--- /dev/null
+++ b/tools/export/cdt/necessary_software.tmpl
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?p2f version='1.0.0'?>
+<p2f version='1.0.0'>
+  <ius size='2'>
+    <iu id='ilg.gnuarmeclipse.managedbuild.cross.feature.group' name='GNU ARM C/C++ Cross Compiler' version='2.2.1.201606210758'>
+      <repositories size='1'>
+        <repository location='http://gnuarmeclipse.sourceforge.net/updates'/>
+      </repositories>
+    </iu>
+    <iu id='ilg.gnuarmeclipse.debug.gdbjtag.openocd.feature.group' name='GNU ARM C/C++ OpenOCD Debugging' version='4.1.1.201606210758'>
+      <repositories size='1'>
+        <repository location='http://gnuarmeclipse.sourceforge.net/updates'/>
+      </repositories>
+    </iu>
+  </ius>
+</p2f>
diff --git a/tools/export/cdt/py_ocd_settings.tmpl b/tools/export/cdt/py_ocd_settings.tmpl
new file mode 100644
index 0000000000..29ed6f419b
--- /dev/null
+++ b/tools/export/cdt/py_ocd_settings.tmpl
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.launchConfigurationType">
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.doContinue" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.doDebugInRam" value="false"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.doFirstReset" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.doGdbServerAllocateConsole" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.doGdbServerAllocateSemihostingConsole" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.doSecondReset" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.doStartGdbServer" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.enableSemihosting" value="true"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.firstResetType" value="init"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbClientOtherCommands" value="set mem inaccessible-by-default off"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbClientOtherOptions" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerConnectionAddress" value=""/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerEnableSemihosting" value="true"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerExecutable" value="${pyocd_path}/${pyocd_executable}"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerFlashFastVerify" value="false"/>
+<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerFlashMode" value="0"/>
+<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerGdbPortNumber" value="3333"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerHaltAtHardFault" value="true"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerLog" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerOther" value=""/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerOverrideTarget" value="false"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerStepIntoInterrutps" value="false"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerTargetName" value=""/>
+<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerTelnetPortNumber" value="4444"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerUseGdbSyscalls" value="false"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.otherInitCommands" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.otherRunCommands" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.secondResetType" value="halt"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="GNU ARM PyOCD"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="3333"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useRemoteTarget" value="true"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="arm-none-eabi-gdb.exe"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="{{elf_location}}"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="{{name}}"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1710152939"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/{{name}}"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;Context string&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>

From 32b1203b6ccd088de7d2cae18619f79bc0a786a8 Mon Sep 17 00:00:00 2001
From: Sarah Marsh <Sarah.Marsh@arm.com>
Date: Wed, 24 Aug 2016 12:54:34 -0500
Subject: [PATCH 2/4] Generic makefile in eclipse

---
 tools/export/__init__.py                 |  5 ++-
 tools/export/cdt/.cproject.tmpl          |  2 +-
 tools/export/cdt/__init__.py             | 47 ++++++++++++++++++++++++
 tools/export/cdt/necessary_software.tmpl |  9 +----
 4 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 tools/export/cdt/__init__.py

diff --git a/tools/export/__init__.py b/tools/export/__init__.py
index 3728eb5a96..16e5d48563 100644
--- a/tools/export/__init__.py
+++ b/tools/export/__init__.py
@@ -21,7 +21,7 @@ import yaml
 
 from tools.export import uvision4, uvision5, codered, makefile, ds5_5, iar
 from tools.export import emblocks, coide, kds, simplicityv3, atmelstudio
-from tools.export import sw4stm32, e2studio, zip, eclipse
+from tools.export import sw4stm32, e2studio, zip, cdt
 from tools.export.exporters import OldLibrariesException, FailedBuildException
 from tools.targets import TARGET_NAMES, EXPORT_MAP, TARGET_MAP
 
@@ -45,6 +45,9 @@ EXPORTERS = {
     'atmelstudio' : atmelstudio.AtmelStudio,
     'sw4stm32'    : sw4stm32.Sw4STM32,
     'e2studio' : e2studio.E2Studio,
+    'eclipse_gcc_arm'  : cdt.EclipseGcc,
+    'eclipse_iar'      : cdt.EclipseIAR,
+    'eclipse_armc5'    : cdt.EclipseArmc5,
     'zip' : zip.ZIP
 }
 
diff --git a/tools/export/cdt/.cproject.tmpl b/tools/export/cdt/.cproject.tmpl
index 9635abfbcb..53cd29cfb3 100644
--- a/tools/export/cdt/.cproject.tmpl
+++ b/tools/export/cdt/.cproject.tmpl
@@ -18,7 +18,7 @@
 					<folderInfo id="0.936619452." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.957782855" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.957782855.1870418474" name=""/>
-							<builder arguments="compile -j0 -t GCC_ARM -m {{target}} -o debug-info" command="mbed-cli" id="org.eclipse.cdt.build.core.settings.default.builder.1415080330" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-j" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1415080330" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.445325914" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.302788810" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1008027188" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
diff --git a/tools/export/cdt/__init__.py b/tools/export/cdt/__init__.py
new file mode 100644
index 0000000000..39a06cd057
--- /dev/null
+++ b/tools/export/cdt/__init__.py
@@ -0,0 +1,47 @@
+from os.path import join, exists, realpath, relpath, basename
+from os import makedirs
+
+from tools.export.makefile import Makefile, GccArm, Armc5, IAR
+
+class Eclipse(Makefile):
+    """Generic Eclipse project. Intended to be subclassed by classes that
+    specify a type of Makefile.
+    """
+    def generate(self):
+        """Generate Makefile, .cproject & .project Eclipse project file,
+        py_ocd_settings launch file, and software link .p2f file
+        """
+        super(Eclipse, self).generate()
+        ctx = {
+            'name': self.project_name,
+            'elf_location': join('.build',self.project_name)+'.elf',
+            'c_symbols': self.toolchain.get_symbols(),
+            'asm_symbols': self.toolchain.get_symbols(True),
+            'target': self.target,
+            'include_paths': self.resources.inc_dirs
+        }
+
+        if not exists(join(self.export_dir,'eclipse-extras')):
+            makedirs(join(self.export_dir,'eclipse-extras'))
+
+
+        self.gen_file('cdt/py_ocd_settings.tmpl', ctx,
+                      join('eclipse-extras',self.target+'_py_ocd_settings.launch'))
+        self.gen_file('cdt/necessary_software.tmpl', ctx,
+                      join('eclipse-extras','necessary_software.p2f'))
+
+        cproj = relpath('.cproject',self.export_dir)
+        self.gen_file('cdt/.cproject.tmpl', ctx,
+                      cproj)
+        proj = relpath('.project',self.export_dir)
+        self.gen_file('cdt/.project.tmpl', ctx,
+                      proj)
+
+
+class EclipseGcc(Eclipse, GccArm): pass
+
+class EclipseArmc5(Eclipse, Armc5): pass
+
+class EclipseIAR(Eclipse, IAR): pass
+
+
diff --git a/tools/export/cdt/necessary_software.tmpl b/tools/export/cdt/necessary_software.tmpl
index e3c0b3c4a0..8807d07492 100644
--- a/tools/export/cdt/necessary_software.tmpl
+++ b/tools/export/cdt/necessary_software.tmpl
@@ -1,13 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?p2f version='1.0.0'?>
 <p2f version='1.0.0'>
-  <ius size='2'>
-    <iu id='ilg.gnuarmeclipse.managedbuild.cross.feature.group' name='GNU ARM C/C++ Cross Compiler' version='2.2.1.201606210758'>
-      <repositories size='1'>
-        <repository location='http://gnuarmeclipse.sourceforge.net/updates'/>
-      </repositories>
-    </iu>
-    <iu id='ilg.gnuarmeclipse.debug.gdbjtag.openocd.feature.group' name='GNU ARM C/C++ OpenOCD Debugging' version='4.1.1.201606210758'>
+  <ius size='1'>
+    <iu id='ilg.gnuarmeclipse.debug.gdbjtag.pyocd.feature.group' name='GNU ARM C/C++ PyOCD Debugging' version='1.1.1.201606210758'>
       <repositories size='1'>
         <repository location='http://gnuarmeclipse.sourceforge.net/updates'/>
       </repositories>

From a8213e7441df1cc81fa6ba6a7b433aa5bf11e8c1 Mon Sep 17 00:00:00 2001
From: Sarah Marsh <Sarah.Marsh@arm.com>
Date: Thu, 8 Sep 2016 10:08:58 -0500
Subject: [PATCH 3/4] ARMC5 pyocd settings do not load executable

---
 tools/export/cdt/__init__.py          | 12 ++++++++----
 tools/export/cdt/py_ocd_settings.tmpl |  8 +++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tools/export/cdt/__init__.py b/tools/export/cdt/__init__.py
index 39a06cd057..7f221beada 100644
--- a/tools/export/cdt/__init__.py
+++ b/tools/export/cdt/__init__.py
@@ -18,7 +18,8 @@ class Eclipse(Makefile):
             'c_symbols': self.toolchain.get_symbols(),
             'asm_symbols': self.toolchain.get_symbols(True),
             'target': self.target,
-            'include_paths': self.resources.inc_dirs
+            'include_paths': self.resources.inc_dirs,
+            'load_exe': str(self.LOAD_EXE).lower()
         }
 
         if not exists(join(self.export_dir,'eclipse-extras')):
@@ -38,10 +39,13 @@ class Eclipse(Makefile):
                       proj)
 
 
-class EclipseGcc(Eclipse, GccArm): pass
+class EclipseGcc(Eclipse, GccArm):
+    LOAD_EXE = True
 
-class EclipseArmc5(Eclipse, Armc5): pass
+class EclipseArmc5(Eclipse, Armc5):
+    LOAD_EXE = False
 
-class EclipseIAR(Eclipse, IAR): pass
+class EclipseIAR(Eclipse, IAR):
+    LOAD_EXE = True
 
 
diff --git a/tools/export/cdt/py_ocd_settings.tmpl b/tools/export/cdt/py_ocd_settings.tmpl
index 29ed6f419b..a34c0dbbd4 100644
--- a/tools/export/cdt/py_ocd_settings.tmpl
+++ b/tools/export/cdt/py_ocd_settings.tmpl
@@ -11,6 +11,8 @@
 <stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.firstResetType" value="init"/>
 <stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbClientOtherCommands" value="set mem inaccessible-by-default off"/>
 <stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbClientOtherOptions" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerBoardId" value=""/>
+<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerBusSpeed" value="1000000"/>
 <stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerConnectionAddress" value=""/>
 <booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerEnableSemihosting" value="true"/>
 <stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.gdbServerExecutable" value="${pyocd_path}/${pyocd_executable}"/>
@@ -32,8 +34,8 @@
 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="GNU ARM PyOCD"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="{{load_exe}}"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="false"/>
 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
 <intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="3333"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
@@ -55,7 +57,7 @@
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="{{elf_location}}"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="{{name}}"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1710152939"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/{{name}}"/>
 </listAttribute>

From 3cf4d02293822eddbcc536991adb75f13c565cae Mon Sep 17 00:00:00 2001
From: Sarah Marsh <Sarah.Marsh@arm.com>
Date: Fri, 30 Sep 2016 10:15:26 -0500
Subject: [PATCH 4/4] [Eclipse] pyocd settings renamed

---
 tools/export/cdt/__init__.py                                  | 4 ++--
 .../export/cdt/{py_ocd_settings.tmpl => pyocd_settings.tmpl}  | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename tools/export/cdt/{py_ocd_settings.tmpl => pyocd_settings.tmpl} (100%)

diff --git a/tools/export/cdt/__init__.py b/tools/export/cdt/__init__.py
index 7f221beada..d62d88773e 100644
--- a/tools/export/cdt/__init__.py
+++ b/tools/export/cdt/__init__.py
@@ -26,8 +26,8 @@ class Eclipse(Makefile):
             makedirs(join(self.export_dir,'eclipse-extras'))
 
 
-        self.gen_file('cdt/py_ocd_settings.tmpl', ctx,
-                      join('eclipse-extras',self.target+'_py_ocd_settings.launch'))
+        self.gen_file('cdt/pyocd_settings.tmpl', ctx,
+                      join('eclipse-extras',self.target+'_pyocd_settings.launch'))
         self.gen_file('cdt/necessary_software.tmpl', ctx,
                       join('eclipse-extras','necessary_software.p2f'))
 
diff --git a/tools/export/cdt/py_ocd_settings.tmpl b/tools/export/cdt/pyocd_settings.tmpl
similarity index 100%
rename from tools/export/cdt/py_ocd_settings.tmpl
rename to tools/export/cdt/pyocd_settings.tmpl