Changes:

- added new erase launch configuration
- added new kits support
- code cleanup

Author: Andriy.Lishchynskyi

tools/export/cdt/__init__.py

@@ -15,7 +15,7 @@
 with open(_eclipse_defs, 'r') as f:
     _CONFIGS_OPTIONS = json.load(f)
 
-supported_launches = ['debug', 'program']
+supported_launches = ['debug', 'program', 'erase']
 
 class Eclipse(Makefile):
     """Generic Eclipse project. Intended to be subclassed by classes that
@@ -37,10 +37,6 @@ def get_target_config(self, ctx, configuration):
 
             eclipse_config.update(target_info)
 
-        #special case for gdbClientOtherOptions param - in some cases it may contain dynamical values, fill in it here
-        eclipse_config['gdbClientOtherOptions'] = eclipse_config['gdbClientOtherOptions'].format(
-                                                    elf_location=ctx['elf_location'])
-
         Eclipsedevice = namedtuple('Eclipsedevice', eclipse_config.keys())
         return Eclipsedevice(**eclipse_config)
 

tools/export/cdt/cdt_definitions.json

@@ -15,21 +15,25 @@
       "gdbServerGdbPortNumber": 3333,
       "gdbServerHaltAtHardFault": "true",
       "gdbServerOther": "",
+      "otherRunCommands": "",
       "secondResetType": "halt",
       "coreLoadImage": "true",
       "coreLoadSymbols": "true",
       "corePortNumber": 3333,
       "setStopAt": "true"
     },
-
     "debug": {
     },
-
     "program": {
+      "doContinue": "false",
+      "otherRunCommands": "continue&
quit",
+      "coreLoadSymbols": "false",
+      "setStopAt": "false"
+    },
+    "erase": {
       "doContinue": "false",
       "doSecondReset": "false",
-      "gdbClientOtherCommands": "set mem inaccessible-by-default off
target remote localhost:3333
mon reset halt
load
mon reset
quit",
-      "gdbClientOtherOptions": "{elf_location}",
+      "otherRunCommands": "mon erase --chip
quit",
       "coreLoadImage": "false",
       "coreLoadSymbols": "false",
       "setStopAt": "false"
@@ -39,19 +43,49 @@
   "targets": {
     "CY8CPROTO_062_4343W": {
       "generic": {
-        "doFirstReset": "false",
-        "doGdbServerAllocateSemihostingConsole": "false",
-        "enableSemihosting": "false",
-        "gdbServerEnableSemihosting": "false",
-        "gdbServerFlashMode": 2,
         "gdbServerGdbPortNumber": 3334,
-        "gdbServerHaltAtHardFault": "false",
         "gdbServerOther": "-p 3333
--no-deprecation-warning",
         "corePortNumber": 3334
-      },
+      }
+    },
+
+    "CY8CMOD_062_4343W": {
+      "generic": {
+        "gdbServerGdbPortNumber": 3334,
+        "gdbServerOther": "-p 3333
--no-deprecation-warning",
+        "corePortNumber": 3334
+      }
+    },
+
+    "CYW943012P6EVB_01": {
+      "generic": {
+        "gdbServerGdbPortNumber": 3334,
+        "gdbServerOther": "-p 3333
--no-deprecation-warning",
+        "corePortNumber": 3334
+      }
+    },
+
+    "CY8CKIT_062_WIFI_BT": {
+      "generic": {
+        "gdbServerGdbPortNumber": 3334,
+        "gdbServerOther": "-p 3333
--no-deprecation-warning",
+        "corePortNumber": 3334
+      }
+    },
+
+    "CY8CKIT_062_BLE": {
+      "generic": {
+        "gdbServerGdbPortNumber": 3334,
+        "gdbServerOther": "-p 3333
--no-deprecation-warning",
+        "corePortNumber": 3334
+      }
+    },
 
-      "program": {
-        "gdbClientOtherCommands": "set mem inaccessible-by-default off
target remote localhost:3334
mon reset halt
load
mon reset
quit"
+    "CY8CKIT_062_4343W": {
+      "generic": {
+        "gdbServerGdbPortNumber": 3334,
+        "gdbServerOther": "-p 3333
--no-deprecation-warning",
+        "corePortNumber": 3334
       }
     }
   }

tools/export/cdt/pyocd_settings_gnu_arm.tmpl

@@ -28,7 +28,7 @@
 <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.otherRunCommands" value="{{device.otherRunCommands}}"/>
 <stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.secondResetType" value="{{device.secondResetType}}"/>
 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>

tools/export/cdt/pyocd_settings_gnu_mcu.tmpl

@@ -29,7 +29,7 @@
 <intAttribute key="ilg.gnumcueclipse.debug.gdbjtag.pyocd.gdbServerTelnetPortNumber" value="4444"/>
 <booleanAttribute key="ilg.gnumcueclipse.debug.gdbjtag.pyocd.gdbServerUseGdbSyscalls" value="false"/>
 <stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.pyocd.otherInitCommands" value=""/>
-<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.pyocd.otherRunCommands" value=""/>
+<stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.pyocd.otherRunCommands" value="{{device.otherRunCommands}}"/>
 <stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.pyocd.secondResetType" value="{{device.secondResetType}}"/>
 <stringAttribute key="ilg.gnumcueclipse.debug.gdbjtag.svdPath" value=""/>
 <stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>