From 9e4cd6180ded9af97bcb266d9b8b3622f0be65a4 Mon Sep 17 00:00:00 2001
From: Michael Lasevich <michael@legrig.com>
Date: Fri, 27 Jul 2018 11:59:34 -0700
Subject: [PATCH] Fix stk500v2 READ_EEPROM to properly read EEPROM

---
 bootloaders/stk500v2/stk500boot.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bootloaders/stk500v2/stk500boot.c b/bootloaders/stk500v2/stk500boot.c
index 0b49dffc5..c2dad4a88 100644
--- a/bootloaders/stk500v2/stk500boot.c
+++ b/bootloaders/stk500v2/stk500boot.c
@@ -1063,10 +1063,13 @@ int main(void)
 						else
 						{
 							/* Read EEPROM */
+							uint16_t ii = address >> 1;
 							do {
-								EEARL	=	address;			// Setup EEPROM address
-								EEARH	=	((address >> 8));
-								address++;					// Select next EEPROM byte
+								EEARL	=	ii;			// Setup EEPROM address
+								EEARH	=	((ii >> 8));
+								address += 2; // Select next EEPROM byte
+								ii++;
+
 								EECR	|=	(1<<EERE);			// Read EEPROM
 								*p++	=	EEDR;				// Send EEPROM data
 								size--;