From a206c7c2df55d444a3c945619b71f394d55e1a53 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Wed, 25 Jul 2012 14:56:39 +0000
Subject: [PATCH] Return MTYPE_FLASH from jtagmkII_memtype() rather than
 MTYPE_SPM for non-Xmega flash regions.

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

diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index 31f52a0f..7fdda9d9 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-25  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* jtagmkII.c (jtagmkII_memtype): return MTYPE_FLASH rather than
+	MTYPE_SPM for non-Xmega flash regions
+
 2012-07-18  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* configure.ac: check for libelf.h also in libelf/
diff --git a/avrdude/jtagmkII.c b/avrdude/jtagmkII.c
index c96d4ca7..a28281b3 100644
--- a/avrdude/jtagmkII.c
+++ b/avrdude/jtagmkII.c
@@ -2762,7 +2762,7 @@ static unsigned char jtagmkII_memtype(PROGRAMMER * pgm, AVRPART * p, unsigned lo
     else
       return MTYPE_FLASH;
   } else {
-    return MTYPE_SPM;
+    return MTYPE_FLASH_PAGE;
   }
 }