From ac4b97e7169b96b012c7f1c56e83c57c650ebbd2 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Mon, 29 Oct 2007 21:24:28 +0000
Subject: [PATCH] bug #21152: Unable to program atmega324p with avrdude 5.4 and
 AVRISP using default configuration file.

Uncomment the (bogus) stk500_devcode lines for the ATmega164P,
ATmega324P, ATmega644, and ATmega644P definitions.  This only affects
users of STK500v1 firmware.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@750 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 ChangeLog       |  8 ++++++++
 avrdude.conf.in | 12 ++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94f5df8c..39d92459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-29 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	bug #21152: Unable to program atmega324p with avrdude 5.4 and AVRISP
+	using default configuration file.
+	* avrdude.conf.in: Uncomment the (bogus) stk500_devcode lines for
+	the ATmega164P, ATmega324P, ATmega644, and ATmega644P definitions.
+	This only affects users of STK500v1 firmware.
+
 2007-10-29 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	Submitted by <ladyada@gmail.com>:
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 556d9bad..f3cec89e 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -3162,8 +3162,7 @@ part
     id               = "m164p";
     desc             = "ATMEGA164P";
     has_jtag         = yes;
-#   stk500_devcode   = 0x82; # no STK500v1 support
-#   avr910_devcode   = 0x?;  # try the ATmega16 one:^
+    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
     avr910_devcode   = 0x74;
     signature        = 0x1e 0x94 0x0a;
     pagel            = 0xd7;
@@ -3354,8 +3353,7 @@ part
     id               = "m324p";
     desc             = "ATMEGA324P";
     has_jtag         = yes;
-#   stk500_devcode   = 0x82; # no STK500v1 support
-#   avr910_devcode   = 0x?;  # try the ATmega16 one:^
+    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
     avr910_devcode   = 0x74;
     signature        = 0x1e 0x95 0x08;
     pagel            = 0xd7;
@@ -3546,8 +3544,7 @@ part
     id               = "m644";
     desc             = "ATMEGA644";
     has_jtag         = yes;
-#   stk500_devcode   = 0x82; # no STK500v1 support
-#   avr910_devcode   = 0x?;  # try the ATmega16 one:^
+    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
     avr910_devcode   = 0x74;
     signature        = 0x1e 0x96 0x09;
     pagel            = 0xd7;
@@ -3737,8 +3734,7 @@ part
     id               = "m644p";
     desc             = "ATMEGA644P";
     has_jtag         = yes;
-#   stk500_devcode   = 0x82; # no STK500v1 support
-#   avr910_devcode   = 0x?;  # try the ATmega16 one:^
+    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
     avr910_devcode   = 0x74;
     signature        = 0x1e 0x96 0x0a;
     pagel            = 0xd7;