diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
index 1c2922079a7..d03149064ac 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.gdbjtag.core;singleton:=true
-Bundle-Version: 10.7.0.qualifier
+Bundle-Version: 10.8.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.core.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
index b6b72e96cea..2aed6c2e20f 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
@@ -17,6 +17,7 @@
# John Dallaway - ST-LINK extension, bug 558266
# John Dallaway - PyOCD extension, bug 574928
# John Dallaway - Black Magic Probe extension, bug 535143
+# John Dallaway - NXP LinkServer extension (#496)
###############################################################################
launchConfig.name=GDB Hardware Debugging
pluginName=Eclipse GDB Hardware Debug Core Plug-in
@@ -28,6 +29,7 @@ AbatronBDI2000.name=Abatron BDI2000
BlackMagicProbe.name=Black Magic Probe
MacraigorUsb2Demon.name=Macraigor USB2Demon
GenericSerial.name=Generic Serial
+NXPLinkServer.name=NXP LinkServer
OpenOCDPipe.name=OpenOCD (via pipe)
OpenOCDSocket.name=OpenOCD (via socket)
PEMicro.name=PEmicro
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
index 564fc377770..478be823a32 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
@@ -53,6 +53,13 @@
name="%GenericSerial.name"
protocols="remote,extended-remote">
+
+
commands) {
+ /* not supported */
+ }
+
+ @Override
+ public void doReset(Collection commands) {
+ doResetAndHalt(commands);
+ doContinue(commands);
+ }
+
+ @Override
+ public void doResetAndHalt(Collection commands) {
+ addCmd(commands, "monitor reset"); //$NON-NLS-1$
+ }
+
+}