From 4554b6cb13e6ef361af68bf6211343050b9de209 Mon Sep 17 00:00:00 2001
From: danpetry <daniel.petry@fu-berlin.de>
Date: Tue, 19 Mar 2019 15:32:55 +0100
Subject: [PATCH] doc/mega-xplained: add JTAG/Atmel-ICE instructions

Adds instrucions for the Atmel-ICE with the JTAG header.
---
 boards/mega-xplained/doc.txt | 39 +++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/boards/mega-xplained/doc.txt b/boards/mega-xplained/doc.txt
index 1aa39ac1c809..f75c31197c95 100644
--- a/boards/mega-xplained/doc.txt
+++ b/boards/mega-xplained/doc.txt
@@ -10,21 +10,42 @@ is an evaluation kit by Atmel (now Microchip) for their ATmega1284P microcontrol
 
 ### Flash the board
 
-1. The board may be flashed through JTAG or using a SPI ISP programmer. If
-   the Buspirate is being used, then `make flash` can be used to flash the
-   board:
-```
-     make BOARD=mega-xplained -C examples/hello-world flash
-```
+You can change the fuses and flash the board using an SPI ISP programmer such
+as the Bus Pirate, or using a JTAG programmer such as the Atmel-ICE with a
+JTAG adapter.
+
+If using the Atmel-ICE as a JTAG programmer, connect the adapter with the
+square pin on the adapter connecting with the square pin on the board.
+
+1. First, make sure the default fuse settings are correct.<br/>
+
+   WARNING: setting the fuses incorrectly can brick your board!
 
-2. The default fuse settings must also be changed.<br/>
    If using the Buspirate:
 ```
      avrdude -p m1284p -c buspirate -P /dev/ttyUSB0 -U efuse:w:0xFF:m
      avrdude -p m1284p -c buspirate -P /dev/ttyUSB0 -U hfuse:w:0x99:m
      avrdude -p m1284p -c buspirate -P /dev/ttyUSB0 -U lfuse:w:0xE2:m
 ```
-WARNING: setting the fuses incorrectly can brick your board!
+
+   If using the Atmel-ICE:
+```
+     avrdude -p m1284p -c atmelice -U efuse:w:0xFF:m
+     avrdude -p m1284p -c atmelice -U hfuse:w:0x99:m
+     avrdude -p m1284p -c atmelice -U lfuse:w:0xE2:m
+```
+
+2. After the fuses are set, flash the application.
+
+   If using the Buspirate:
+```
+     BOARD=mega-xplained make -C examples/hello-world flash
+```
+
+   If using the Atmel-ICE:
+```
+     BOARD=mega-xplained PROGRAMMER=atmelice make -C examples/hello-world flash
+```
 
 ### Accessing STDIO via UART
 
@@ -32,6 +53,6 @@ STDIO can be accessed through the USB connector. The on-board UART-USB
 adapter is not affected by flashing. It shows up as /dev/ttyACM0 on Linux.
 It will be used automatically with `make term`:
 ```
-     make BOARD=mega-xplained -C examples/hello-world term
+     BOARD=mega-xplained make -C examples/hello-world term
 ```
  */