From 1c94c95f1c15d8d627bb12fd9873699543af3c6e Mon Sep 17 00:00:00 2001
From: MCUdude <hansibull@gmail.com>
Date: Tue, 8 Mar 2022 12:32:41 +0100
Subject: [PATCH 1/4] Fix target names not following the standard

---
 src/avrdude.conf.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 6366de5c..4e711558 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -5980,7 +5980,7 @@ part
 
 part parent "m329"
     id               = "m329a";
-    desc             = "ATmega329a";
+    desc             = "ATmega329A";
   ;
 
 #------------------------------------------------------------
@@ -12549,7 +12549,7 @@ part parent "t84"
 
 part
     id            = "t43u";
-    desc          = "ATtiny43u";
+    desc          = "ATtiny43U";
     has_debugwire = yes;
     flash_instr   = 0xB4, 0x07, 0x17;
     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
@@ -16513,7 +16513,7 @@ part parent ".reduced_core_tiny"
 
 part
     id				= "m406";
-    desc			= "ATMEGA406";
+    desc			= "ATmega406";
     has_jtag			= yes;
     signature			= 0x1e 0x95 0x07;
 

From fde7881611737b29bb2d384734efb2f9941c7aad Mon Sep 17 00:00:00 2001
From: MCUdude <hansibull@gmail.com>
Date: Tue, 8 Mar 2022 12:34:06 +0100
Subject: [PATCH 2/4] Fix incorrect ATmega64M1 flash and eeprom size #897
 related

---
 src/avrdude.conf.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 4e711558..0f9d6d33 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -9776,6 +9776,18 @@ part parent "m328"
     signature       = 0x1e 0x96 0x84;
     bs2             = 0xe2;
 
+    memory "eeprom"
+        size            = 2048;
+        page_size       = 8;
+    ;
+
+    memory "flash"
+        paged           = yes;
+        size            = 65536;
+        page_size       = 256;
+        num_pages       = 256;
+    ;
+
     memory "efuse"
         size            = 1;
         min_write_delay = 4500;

From 5ebb9047be41d829fc21c89d16dde25fda2d5986 Mon Sep 17 00:00:00 2001
From: MCUdude <hansibull@gmail.com>
Date: Tue, 8 Mar 2022 12:50:17 +0100
Subject: [PATCH 3/4] Fix incorrect ATxmega128D4 flash page size

---
 src/avrdude.conf.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 0f9d6d33..66622e67 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -15457,6 +15457,13 @@ part parent "x128c3"
     id		= "x128d4";
     desc	= "ATxmega128D4";
     signature	= 0x1e 0x97 0x47;
+
+    memory "flash"
+        size		= 0x22000;
+        offset		= 0x800000;
+        page_size	= 0x100;
+        readsize	= 0x100;
+    ;
 ;
 
 #------------------------------------------------------------

From 41f524c1ba8001b5a356de09056a2b6f7823aebc Mon Sep 17 00:00:00 2001
From: MCUdude <hansibull@gmail.com>
Date: Tue, 8 Mar 2022 13:17:01 +0100
Subject: [PATCH 4/4] Use the same device signature on ATmega165 and ATmega165A

---
 src/avrdude.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 66622e67..e4a7c6d5 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -14275,7 +14275,7 @@ part
 part
     id               = "m165";
     desc             = "ATmega165";
-    signature        = 0x1e 0x94 0x07;
+    signature        = 0x1e 0x94 0x10;
     has_jtag         = yes;
 #   stk500_devcode   = 0x??;
 #   avr910_devcode   = 0x??;