From 056b5f6e77815f7892993e6cbf756e28219425b1 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Fri, 30 Aug 2013 06:49:40 +0000 Subject: [PATCH] bug #39893: Verification failure with AVRISPmkII and Xmega * stk500v2.c (stk600_xprog_page_erase): Fix argument that is passed to stk600_xprog_memtype() git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1188 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 6 ++++++ NEWS | 1 + stk500v2.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7109e5a4..a1b26f85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-08-30 Joerg Wunsch + + bug #39893: Verification failure with AVRISPmkII and Xmega + * stk500v2.c (stk600_xprog_page_erase): Fix argument that is + passed to stk600_xprog_memtype() + 2013-07-11 Joerg Wunsch * fileio.c (elf2b): replace elf_getshstrndx() by diff --git a/NEWS b/NEWS index fc21a494..3f43bda1 100644 --- a/NEWS +++ b/NEWS @@ -80,6 +80,7 @@ Current: - bug #37942: Latest SVN can't program in dragon_jtag mode - patch #7876 JTAGICE mkII fails to connect to attiny if debugwire is enabled AND target has a very slow clock + - bug #39893: Verification failure with AVRISPmkII and Xmega * Keep track of input file contents diff --git a/stk500v2.c b/stk500v2.c index a9ac44c6..1a730c81 100644 --- a/stk500v2.c +++ b/stk500v2.c @@ -4313,7 +4313,7 @@ static int stk600_xprog_page_erase(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, unsigned char b[6]; if (strcmp(m->desc, "flash") == 0) { - b[1] = stk600_xprog_memtype(pgm, addr - m->offset) == XPRG_MEM_TYPE_APPL? + b[1] = stk600_xprog_memtype(pgm, addr) == XPRG_MEM_TYPE_APPL? XPRG_ERASE_APP_PAGE: XPRG_ERASE_BOOT_PAGE; } else if (strcmp(m->desc, "application") == 0 || strcmp(m->desc, "apptable") == 0) {