Add the new Atmel-ICE, in all of JTAG, PDI, dW, and ISP modes.

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1288 81a1dc3b-b13d-400b-aceb-764788c761c2

ChangeLog

@@ -1,3 +1,11 @@
+2014-02-28  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* avrdude.conf.in (atmelice, atmelice_pdi, atmelice_dw, atmelice_isp):
+	New entries.
+	* avrdude.1: Document the Atmel-ICE addition.
+	* doc/avrdude.texi: (Dito.)
+	* usbdevs.c (USB_DEVICE_ATMEL_ICE): New entry.
+
 2014-02-28  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* main.c: Bump copyright year.

NEWS

@@ -8,7 +8,7 @@ Approximate change log for AVRDUDE by version.
 Current:
 
   * Major changes compared to the previous version:
-    - Atmel EDBG protocol support added (JTAGICE3, XplainedPro)
+    - Atmel EDBG protocol support added (JTAGICE3, XplainedPro, Atmel-ICE)
 
   * New devices supported:
     - ...
@@ -16,6 +16,7 @@ Current:
   * New programmers supported:
     - Atmel DFU, using FLIP protocol version 1 (AT90USB and ATmega*U* devices),
       or version 2 (Xmega devices)
+    - Atmel-ICE (ARM/AVR), JTAG, PDI, debugWIRE, ISP modi
 
   * Bugfixes
     - bug #40055: AVRDUDE segfaults when writing eeprom

avrdude.1

@@ -150,6 +150,9 @@ For ATxmega devices, the JTAG ICE mkII is supported in PDI mode, provided it
 has a revision 1 hardware and firmware version of at least 5.37 (decimal).
 For ATxmega devices, the JTAGICE3 is supported in PDI mode.
 .Pp
+Atmel-ICE (ARM/AVR) is supported in all modes (JTAG, PDI for Xmega, debugWIRE,
+ISP).
+.Pp
 Atmel's XplainedPro boards, using the EDBG protocol (CMSIS-DAP compatible),
 are supported using the "jtag3" programmer type.
 .Pp
@@ -790,7 +793,7 @@ microseconds.
 Note that unlike STK500 settings, this setting will be reverted to
 its default value (approximately 1 microsecond) when the programming
 software signs off from the JTAG ICE.
-This parameter can also be used on the JTAG ICE mkII and JTAGICE3 to specify the
+This parameter can also be used on the JTAG ICE mkII, JTAGICE3, and Atmel-ICE to specify the
 ISP clock period when operating the ICE in ISP mode.
 .It Ar parms
 .Em STK500 and STK600 programmer only:
@@ -889,8 +892,9 @@ versions of the bootloader.
 .Bl -tag -offset indent -width indent
 .It Ar JTAG ICE mkII
 .It Ar JTAGICE3
+.It Ar Atmel-ICE
 .It Ar AVR Dragon
-When using the JTAG ICE mkII, JTAGICE3 or AVR Dragon in JTAG mode, the
+When using the JTAG ICE mkII, JTAGICE3, Atmel-ICE or AVR Dragon in JTAG mode, the
 following extended parameter is accepted:
 .Bl -tag -offset indent -width indent
 .It Ar jtagchain=UB,UA,BB,BA

avrdude.conf.in

@@ -1031,6 +1031,38 @@ programmer
   usbpid = 0x2111;
 ;
 
+programmer
+  id    = "atmelice";
+  desc  = "Atmel-ICE (ARM/AVR) in JTAG mode";
+  type  = "jtagice3";
+  connection_type = usb;
+  usbpid = 0x2141;
+;
+
+programmer
+  id    = "atmelice_pdi";
+  desc  = "Atmel-ICE (ARM/AVR) in PDI mode";
+  type  = "jtagice3_pdi";
+  connection_type = usb;
+  usbpid = 0x2141;
+;
+
+programmer
+  id    = "atmelice_dw";
+  desc  = "Atmel-ICE (ARM/AVR) in debugWIRE mode";
+  type  = "jtagice3_dw";
+  connection_type = usb;
+  usbpid = 0x2141;
+;
+
+programmer
+  id    = "atmelice_isp";
+  desc  = "Atmel-ICE (ARM/AVR) in ISP mode";
+  type  = "jtagice3_isp";
+  connection_type = usb;
+  usbpid = 0x2141;
+;
+
 
 programmer
   id    = "pavr";

doc/avrdude.texi

@@ -213,6 +213,8 @@ See below for the limitations of debugWire.
 For ATxmega devices, the JTAG ICE mkII/3 is supported in PDI mode, provided it
 has a revision 1 hardware and firmware version of at least 5.37 (decimal).
 
+The Atmel-ICE (ARM/AVR) is supported (JTAG, PDI for Xmega, debugWIRE, ISP modes).
+
 Atmel's XplainedPro boards, using EDBG protocol (CMSIS-DAP compliant), are
 supported by teh ``jtag3'' programmer type.
 

usbdevs.h

@@ -33,6 +33,7 @@
 #define USB_DEVICE_JTAGICE3    0x2110
 #define USB_DEVICE_XPLAINEDPRO 0x2111
 #define USB_DEVICE_JTAG3_EDBG  0x2140
+#define USB_DEVICE_ATMEL_ICE   0x2141
 
 #define USB_VENDOR_FTDI        0x0403
 #define USB_DEVICE_FT2232      0x6010