From 90e4a54e121bd675dcd4f701c19aa5b26d663db4 Mon Sep 17 00:00:00 2001
From: joerg_wunsch <joerg_wunsch@81a1dc3b-b13d-400b-aceb-764788c761c2>
Date: Thu, 26 Apr 2012 11:01:19 +0000
Subject: [PATCH] Fix for previous fix: add memtype for "flash".

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1088 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 jtagmkII.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jtagmkII.c b/jtagmkII.c
index 68420b92..78b8910b 100644
--- a/jtagmkII.c
+++ b/jtagmkII.c
@@ -1894,6 +1894,7 @@ static int jtagmkII_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
   if (strcmp(m->desc, "flash") == 0) {
     PDATA(pgm)->flash_pageaddr = (unsigned long)-1L;
     page_size = PDATA(pgm)->flash_pagesize;
+    cmd[1] = jtagmkII_memtype(pgm, p, addr);
     if (p->flags & AVRPART_HAS_PDI)
       /* dynamically decide between flash/boot memtype */
       dynamic_memtype = 1;
@@ -2028,6 +2029,7 @@ static int jtagmkII_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
 
   cmd[0] = CMND_READ_MEMORY;
   if (strcmp(m->desc, "flash") == 0) {
+    cmd[1] = jtagmkII_memtype(pgm, p, addr);
     if (p->flags & AVRPART_HAS_PDI)
       /* dynamically decide between flash/boot memtype */
       dynamic_memtype = 1;