From 6defcb450de605a3179ba6469639f7ad86ed34d3 Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Wed, 31 May 2023 16:38:24 +0100
Subject: [PATCH] Shrink avrdude.conf using memory inheritance for initval and
 bitmask

Also ensures initval and bitmask remains unset for
 - AT43USB320, AT43USB355
 - AT76C711
 - AT86RF401
 - AT89S51, AT89S52
 - AT90C8534
 - AT94K
 - ATtiny3214
 - ATxmega128A4, ATxmega192A1, ATxmega256A1, ATxmega64A4
 - AVR8EA28, AVR8EA32
 - LGT8F168P, LGT8F328P, LGT8F88P
 - M3000
---
 src/avrdude.conf.in  | 1407 ++++++++++--------------------------------
 src/doc/avrdude.texi |   14 +-
 2 files changed, 342 insertions(+), 1079 deletions(-)

diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index e834fa64..1cc82043 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -193,8 +193,8 @@
 #   ;
 #
 # If any of the above parameters are not specified, the default value
-# of 0 is used for numerics (except for mcuid, hvupdi_variant, ocdrev
-# and bitmask, where the default value is -1, and for autobaud_sync
+# of 0 is used for numerics (except for mcuid, hvupdi_variant, ocdrev,
+# initval and bitmask, all of which default to -1, and for autobaud_sync
 # which defaults to 0x30), or the empty string "" for string values. If
 # a required parameter is left empty, AVRDUDE will complain. Almost all
 # occurrences of numbers (with the exception of pin numbers and where
@@ -13381,9 +13381,6 @@ part parent "t44"
         "ATtiny44A-SSU:  SOIC14,  Fmax=20 MHz, T=[-40 C,  85 C], Vcc=[1.8 V, 5.5 V]",
         "ATtiny44A-SSUR: SOIC14N, Fmax=20 MHz, T=[-40 C,  85 C], Vcc=[1.8 V, 5.5 V]";
     mcuid                  = XVII + IV; # 21;
-
-
-
 ;
 
 #------------------------------------------------------------
@@ -15810,18 +15807,21 @@ part
     memory "fuse2"
         size               = 1;
         initval            = 0xff;
+        bitmask            = 0x63;
         offset             = 0x8f0022;
     ;
 
     memory "fuse4"
         size               = 1;
         initval            = 0xff;
+        bitmask            = 0x1e;
         offset             = 0x8f0024;
     ;
 
     memory "fuse5"
         size               = 1;
         initval            = 0xff;
+        bitmask            = 0x3f;
         offset             = 0x8f0025;
     ;
 
@@ -15881,6 +15881,10 @@ part parent ".xmega"
         initval            = 0xff;
         offset             = 0x8f0020;
     ;
+
+    memory "fuse4"
+        bitmask            = 0x1f;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -15941,17 +15945,8 @@ part parent ".xmega-a"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
     memory "fuse4"
         initval            = 0xfe;
-        bitmask            = 0x1f;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
     ;
 
     memory "usersig"
@@ -16100,17 +16095,8 @@ part parent ".xmega-a"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
     memory "fuse4"
         initval            = 0xfe;
-        bitmask            = 0x1f;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
     ;
 
     memory "usersig"
@@ -16259,17 +16245,8 @@ part parent ".xmega-a"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
     memory "fuse4"
         initval            = 0xfe;
-        bitmask            = 0x1f;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
     ;
 
     memory "usersig"
@@ -16518,6 +16495,33 @@ part parent "x64a1"
         "ATxmega64A4: N/A, Fmax=N/A, T=[N/A, N/A], Vcc=[1.6 V, 3.6 V]";
     mcuid                  = 251;
     signature              = 0x1e 0x96 0x46;
+
+    memory "fuse0"
+        initval            = -1;
+    ;
+
+    memory "fuse1"
+        initval            = -1;
+    ;
+
+    memory "fuse2"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse4"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse5"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "lock"
+        initval            = -1;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -16626,18 +16630,6 @@ part parent ".xmega"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
-    memory "fuse4"
-        bitmask            = 0x1e;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
-    ;
-
     memory "usersig"
         size               = 512;
         page_size          = 512;
@@ -16859,6 +16851,29 @@ part parent ".xmega"
         offset             = 0x8f0020;
     ;
 
+    memory "fuse1"
+        initval            = -1;
+    ;
+
+    memory "fuse2"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse4"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse5"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "lock"
+        initval            = -1;
+    ;
+
     memory "usersig"
         size               = 512;
         page_size          = 512;
@@ -16923,17 +16938,8 @@ part parent ".xmega-a"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
     memory "fuse4"
         initval            = 0xfe;
-        bitmask            = 0x1f;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
     ;
 
     memory "usersig"
@@ -17005,18 +17011,10 @@ part parent ".xmega"
         offset             = 0x8f0020;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
     memory "fuse4"
         bitmask            = 0x1f;
     ;
 
-    memory "fuse5"
-        bitmask            = 0x3f;
-    ;
-
     memory "usersig"
         size               = 256;
         page_size          = 256;
@@ -17098,18 +17096,6 @@ part parent ".xmega"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
-    memory "fuse4"
-        bitmask            = 0x1e;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
-    ;
-
     memory "usersig"
         size               = 512;
         page_size          = 512;
@@ -17156,13 +17142,36 @@ part parent "x192c3"
         size               = 1;
         offset             = 0x8f0020;
     ;
+
+    memory "fuse1"
+        initval            = -1;
+    ;
+
+    memory "fuse2"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse4"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse5"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "lock"
+        initval            = -1;
+    ;
 ;
 
 #------------------------------------------------------------
 # ATxmega192A3
 #------------------------------------------------------------
 
-part parent "x192a1"
+part parent "x192c3"
     desc                   = "ATxmega192A3";
     id                     = "x192a3";
     variants               =
@@ -17172,12 +17181,15 @@ part parent "x192a1"
         "ATxmega192A3-MH:  QFN64,  Fmax=32 MHz, T=[-40 C, 85 C], Vcc=[1.6 V, 3.6 V]",
         "ATxmega192A3-MHR: QFN64,  Fmax=32 MHz, T=[-40 C, 85 C], Vcc=[1.6 V, 3.6 V]",
         "ATxmega192A3-MU:  QFN64,  Fmax=32 MHz, T=[N/A,    N/A], Vcc=[1.6 V, 3.6 V]";
+    prog_modes             = PM_SPM | PM_PDI | PM_XMEGAJTAG;
     mcuid                  = 267;
     n_interrupts           = 122;
     signature              = 0x1e 0x97 0x44;
 
     memory "fuse0"
+        size               = 1;
         initval            = 0xff;
+        offset             = 0x8f0020;
     ;
 
     memory "fuse2"
@@ -17213,10 +17225,28 @@ part parent "x192a1"
         initval            = 0xff;
     ;
 
+    memory "fuse1"
+        initval            = 0x00;
+    ;
+
+    memory "fuse2"
+        initval            = 0xff;
+        bitmask            = 0x63;
+    ;
+
     memory "fuse4"
         initval            = 0xfe;
         bitmask            = 0x1f;
     ;
+
+    memory "fuse5"
+        initval            = 0xff;
+        bitmask            = 0x3f;
+    ;
+
+    memory "lock"
+        initval            = 0xff;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -17274,18 +17304,6 @@ part parent ".xmega"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
-    memory "fuse4"
-        bitmask            = 0x1e;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
-    ;
-
     memory "usersig"
         size               = 512;
         page_size          = 512;
@@ -17331,6 +17349,29 @@ part parent "x256c3"
         size               = 1;
         offset             = 0x8f0020;
     ;
+
+    memory "fuse1"
+        initval            = -1;
+    ;
+
+    memory "fuse2"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse4"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse5"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "lock"
+        initval            = -1;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -17355,7 +17396,12 @@ part parent "x256a1"
         initval            = 0xff;
     ;
 
+    memory "fuse1"
+        initval            = 0x00;
+    ;
+
     memory "fuse2"
+        initval            = 0xff;
         bitmask            = 0x43;
     ;
 
@@ -17363,6 +17409,15 @@ part parent "x256a1"
         initval            = 0xfe;
         bitmask            = 0x1f;
     ;
+
+    memory "fuse5"
+        initval            = 0xff;
+        bitmask            = 0x3f;
+    ;
+
+    memory "lock"
+        initval            = 0xff;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -17388,10 +17443,28 @@ part parent "x256a1"
         initval            = 0xff;
     ;
 
+    memory "fuse1"
+        initval            = 0x00;
+    ;
+
+    memory "fuse2"
+        initval            = 0xff;
+        bitmask            = 0x63;
+    ;
+
     memory "fuse4"
         initval            = 0xfe;
         bitmask            = 0x1f;
     ;
+
+    memory "fuse5"
+        initval            = 0xff;
+        bitmask            = 0x3f;
+    ;
+
+    memory "lock"
+        initval            = 0xff;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -17415,7 +17488,12 @@ part parent "x256a1"
         initval            = 0xff;
     ;
 
+    memory "fuse1"
+        initval            = 0x00;
+    ;
+
     memory "fuse2"
+        initval            = 0xff;
         bitmask            = 0x43;
     ;
 
@@ -17423,6 +17501,15 @@ part parent "x256a1"
         initval            = 0xfe;
         bitmask            = 0x1f;
     ;
+
+    memory "fuse5"
+        initval            = 0xff;
+        bitmask            = 0x3f;
+    ;
+
+    memory "lock"
+        initval            = 0xff;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -17445,10 +17532,28 @@ part parent "x256a1"
         initval            = 0xff;
     ;
 
+    memory "fuse1"
+        initval            = 0x00;
+    ;
+
+    memory "fuse2"
+        initval            = 0xff;
+        bitmask            = 0x63;
+    ;
+
     memory "fuse4"
         initval            = 0xfe;
         bitmask            = 0x1f;
     ;
+
+    memory "fuse5"
+        initval            = 0xff;
+        bitmask            = 0x3f;
+    ;
+
+    memory "lock"
+        initval            = 0xff;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -17506,18 +17611,6 @@ part parent ".xmega"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x63;
-    ;
-
-    memory "fuse4"
-        bitmask            = 0x1e;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
-    ;
-
     memory "usersig"
         size               = 512;
         page_size          = 512;
@@ -17607,14 +17700,6 @@ part parent ".xmega-e"
         bitmask            = 0x43;
     ;
 
-    memory "fuse4"
-        bitmask            = 0x1e;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
-    ;
-
     memory "usersig"
         size               = 128;
         page_size          = 128;
@@ -17686,14 +17771,6 @@ part parent ".xmega-e"
         bitmask            = 0x43;
     ;
 
-    memory "fuse4"
-        bitmask            = 0x1e;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
-    ;
-
     memory "usersig"
         size               = 128;
         page_size          = 128;
@@ -17765,14 +17842,6 @@ part parent ".xmega-e"
         bitmask            = 0x43;
     ;
 
-    memory "fuse4"
-        bitmask            = 0x1e;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0x3f;
-    ;
-
     memory "usersig"
         size               = 128;
         page_size          = 128;
@@ -17993,6 +18062,8 @@ part
     memory "fuse"
         size               = 1;
         page_size          = 16;
+        initval            = 0xff;
+        bitmask            = 0x07;
         offset             = 0x3f40;
         blocksize          = 4;
     ;
@@ -18000,6 +18071,8 @@ part
     memory "lockbits"
         size               = 1;
         page_size          = 16;
+        initval            = 0xff;
+        bitmask            = 0x03;
         offset             = 0x3f00;
     ;
 
@@ -18037,16 +18110,6 @@ part parent ".reduced_core_tiny"
         offset             = 0x4000;
         blocksize          = 128;
     ;
-
-    memory "fuse"
-        initval            = 0xff;
-        bitmask            = 0x07;
-    ;
-
-    memory "lockbits"
-        initval            = 0xff;
-        bitmask            = 0x03;
-    ;
 ;
 
 #------------------------------------------------------------
@@ -18086,16 +18149,6 @@ part parent ".reduced_core_tiny"
         offset             = 0x4000;
         blocksize          = 128;
     ;
-
-    memory "fuse"
-        initval            = 0xff;
-        bitmask            = 0x07;
-    ;
-
-    memory "lockbits"
-        initval            = 0xff;
-        bitmask            = 0x03;
-    ;
 ;
 
 #------------------------------------------------------------
@@ -18144,15 +18197,9 @@ part parent ".reduced_core_tiny"
     ;
 
     memory "fuse"
-        initval            = 0xff;
         bitmask            = 0x77;
         n_word_writes      = 2;
     ;
-
-    memory "lockbits"
-        initval            = 0xff;
-        bitmask            = 0x03;
-    ;
 ;
 
 #------------------------------------------------------------
@@ -18182,15 +18229,9 @@ part parent ".reduced_core_tiny"
     ;
 
     memory "fuse"
-        initval            = 0xff;
         bitmask            = 0x77;
         n_word_writes      = 4;
     ;
-
-    memory "lockbits"
-        initval            = 0xff;
-        bitmask            = 0x03;
-    ;
 ;
 
 #------------------------------------------------------------
@@ -18221,15 +18262,9 @@ part parent ".reduced_core_tiny"
     ;
 
     memory "fuse"
-        initval            = 0xff;
         bitmask            = 0x0f;
     ;
 
-    memory "lockbits"
-        initval            = 0xff;
-        bitmask            = 0x03;
-    ;
-
     memory "sigrow"
         size               = 16;
         page_size          = 16;
@@ -18261,15 +18296,9 @@ part parent ".reduced_core_tiny"
     ;
 
     memory "fuse"
-        initval            = 0xff;
         bitmask            = 0x0f;
     ;
 
-    memory "lockbits"
-        initval            = 0xff;
-        bitmask            = 0x03;
-    ;
-
     memory "sigrow"
         size               = 16;
         page_size          = 16;
@@ -18393,6 +18422,7 @@ part
     memory "fuse2"
         size               = 1;
         initval            = 0x7e;
+        bitmask            = 0x83;
         offset             = 0x1282;
         readsize           = 1;
     ;
@@ -18404,6 +18434,7 @@ part
     memory "fuse5"
         size               = 1;
         initval            = 0xf6;
+        bitmask            = 0xcd;
         offset             = 0x1285;
         readsize           = 1;
     ;
@@ -18415,6 +18446,7 @@ part
     memory "fuse6"
         size               = 1;
         initval            = 0xff;
+        bitmask            = 0x07;
         offset             = 0x1286;
         readsize           = 1;
     ;
@@ -18555,6 +18587,10 @@ part parent ".avr8x"
     # Dedicated UPDI pin, no HV
     hvupdi_variant         = 1;
 
+    memory "fuse5"
+        bitmask            = 0xc9;
+    ;
+
     memory "userrow"
         size               = 64;
         page_size          = 64;
@@ -18597,10 +18633,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -18612,14 +18644,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -18655,10 +18679,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -18670,14 +18690,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -18713,10 +18725,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -18728,14 +18736,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -18771,10 +18771,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -18786,14 +18782,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -18831,10 +18819,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -18846,14 +18830,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -18889,18 +18865,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -18940,18 +18904,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -18988,18 +18940,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19035,18 +18975,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19086,18 +19014,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19134,18 +19050,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19181,10 +19085,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19196,14 +19096,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19239,10 +19131,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19254,14 +19142,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19297,10 +19177,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19312,14 +19188,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19355,10 +19223,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19370,14 +19234,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19415,10 +19271,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19430,14 +19282,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19491,10 +19335,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19506,14 +19346,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19550,10 +19382,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19565,14 +19393,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19613,10 +19433,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19628,14 +19444,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19672,10 +19480,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19687,14 +19491,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19730,10 +19526,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19745,14 +19537,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19790,10 +19574,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19805,14 +19585,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19848,10 +19620,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19863,14 +19631,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19906,10 +19666,6 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse4"
         size               = 1;
         initval            = 0x00;
@@ -19921,14 +19677,6 @@ part parent ".avr8x_tiny"
         alias "fuse4";
     ;
 
-    memory "fuse5"
-        bitmask            = 0xcd;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -19990,18 +19738,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20046,18 +19786,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20094,18 +19826,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20146,18 +19870,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20202,18 +19918,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20250,18 +19958,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20302,18 +20002,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20358,18 +20050,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20406,18 +20090,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20458,18 +20134,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20514,18 +20182,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20562,18 +20222,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xdd;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20617,18 +20269,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xc9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20668,18 +20312,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xc9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20723,18 +20359,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xc9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20774,18 +20402,10 @@ part parent ".avr8x_tiny"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
     memory "fuse5"
         bitmask            = 0xc9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20829,18 +20449,6 @@ part parent ".avr8x_mega"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xc9;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20880,18 +20488,6 @@ part parent ".avr8x_mega"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xc9;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20935,18 +20531,6 @@ part parent ".avr8x_mega"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xc9;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -20987,18 +20571,6 @@ part parent ".avr8x_mega"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x83;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xc9;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0xc5;
     ;
@@ -21045,6 +20617,7 @@ part
     memory "fuse2"
         size               = 1;
         initval            = 0x00;
+        bitmask            = 0x07;
         offset             = 0x1052;
         readsize           = 1;
     ;
@@ -21056,6 +20629,7 @@ part
     memory "fuse5"
         size               = 1;
         initval            = 0xc0;
+        bitmask            = 0xed;
         offset             = 0x1055;
         readsize           = 1;
     ;
@@ -21067,6 +20641,7 @@ part
     memory "fuse6"
         size               = 1;
         initval            = 0x08;
+        bitmask            = 0x1f;
         offset             = 0x1056;
         readsize           = 1;
     ;
@@ -21197,14 +20772,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21250,14 +20817,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21303,14 +20862,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21358,14 +20909,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21411,14 +20954,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21464,14 +20999,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21517,14 +21044,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21572,14 +21091,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21625,14 +21136,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21678,14 +21181,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21731,14 +21226,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
     memory "fuse6"
         initval            = 0x00;
         bitmask            = 0x07;
@@ -21785,18 +21272,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -21836,18 +21311,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -21887,18 +21350,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -21940,18 +21391,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -21991,18 +21430,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22042,18 +21469,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22093,18 +21508,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22146,18 +21549,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22197,18 +21588,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22248,18 +21627,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22299,18 +21666,6 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
-    memory "fuse5"
-        bitmask            = 0xed;
-    ;
-
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22344,19 +21699,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22391,19 +21738,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22440,19 +21779,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22487,19 +21818,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22533,19 +21856,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22580,19 +21895,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22629,19 +21936,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22676,19 +21975,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22722,19 +22013,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22768,19 +22051,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22817,19 +22092,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22864,19 +22131,11 @@ part parent ".avrdx"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x07;
-    ;
-
     memory "fuse5"
         initval            = 0xd0;
         bitmask            = 0xf9;
     ;
 
-    memory "fuse6"
-        bitmask            = 0x1f;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -22892,6 +22151,20 @@ part parent ".avrdx"
     # Shared UPDI pin, HV on _RESET
     hvupdi_variant         = 2;
 
+    memory "fuse2"
+        bitmask            = 0x08;
+    ;
+
+    memory "fuse5"
+        initval            = 0xd0;
+        bitmask            = 0xf9;
+    ;
+
+    memory "fuse6"
+        initval            = 0x07;
+        bitmask            = 0x07;
+    ;
+
     memory "userrow"
         size               = 64;
         page_size          = 64;
@@ -22922,6 +22195,37 @@ part parent ".avrex"
         offset             = 0x800000;
         readsize           = 256;
     ;
+
+    memory "fuse0"
+        initval            = -1;
+    ;
+
+    memory "fuse1"
+        initval            = -1;
+    ;
+
+    memory "fuse2"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse5"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse6"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse7"
+        initval            = -1;
+    ;
+
+    memory "fuse8"
+        initval            = -1;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -22947,6 +22251,37 @@ part parent ".avrex"
         offset             = 0x800000;
         readsize           = 256;
     ;
+
+    memory "fuse0"
+        initval            = -1;
+    ;
+
+    memory "fuse1"
+        initval            = -1;
+    ;
+
+    memory "fuse2"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse5"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse6"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "fuse7"
+        initval            = -1;
+    ;
+
+    memory "fuse8"
+        initval            = -1;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -22975,20 +22310,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23020,20 +22341,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23065,20 +22372,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23110,20 +22403,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23155,20 +22434,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23200,20 +22465,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23248,20 +22499,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23296,20 +22533,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23344,20 +22567,6 @@ part parent ".avrex"
         readsize           = 256;
     ;
 
-    memory "fuse2"
-        bitmask            = 0x08;
-    ;
-
-    memory "fuse5"
-        initval            = 0xd0;
-        bitmask            = 0xf9;
-    ;
-
-    memory "fuse6"
-        initval            = 0x07;
-        bitmask            = 0x07;
-    ;
-
     memory "lock"
         initval            = 0x5cc5c55c;
     ;
@@ -23373,6 +22582,24 @@ part parent "m88"
     mcuid                  = 227;
     signature              = 0x1e 0x93 0x0f;
     autobaud_sync          = 0x1c;
+
+    memory "lfuse"
+        initval            = -1;
+    ;
+
+    memory "hfuse"
+        initval            = -1;
+    ;
+
+    memory "efuse"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "lock"
+        initval            = -1;
+        bitmask            = -1;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -23385,6 +22612,24 @@ part parent "m168"
     mcuid                  = 228;
     signature              = 0x1e 0x94 0x0b;
     autobaud_sync          = 0x1c;
+
+    memory "lfuse"
+        initval            = -1;
+    ;
+
+    memory "hfuse"
+        initval            = -1;
+    ;
+
+    memory "efuse"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "lock"
+        initval            = -1;
+        bitmask            = -1;
+    ;
 ;
 
 #------------------------------------------------------------
@@ -23397,4 +22642,22 @@ part parent "m328"
     mcuid                  = 229;
     signature              = 0x1e 0x95 0x0f;
     autobaud_sync          = 0x1c;
+
+    memory "lfuse"
+        initval            = -1;
+    ;
+
+    memory "hfuse"
+        initval            = -1;
+    ;
+
+    memory "efuse"
+        initval            = -1;
+        bitmask            = -1;
+    ;
+
+    memory "lock"
+        initval            = -1;
+        bitmask            = -1;
+    ;
 ;
diff --git a/src/doc/avrdude.texi b/src/doc/avrdude.texi
index 0cabaf6b..d3ac921d 100644
--- a/src/doc/avrdude.texi
+++ b/src/doc/avrdude.texi
@@ -2836,13 +2836,13 @@ part
 @noindent
 If any of the above parameters are not specified, the default value of 0
 is used for numerics (except for @code{mcuid}, @code{hvupdi_variant},
-@code{ocdrev} and @code{bitmask}, where the default value is -1, and for
-@code{autobaud_sync} which defaults to 0x30) or the empty string @code{""}
-for string values. If a required parameter is left empty, AVRDUDE will
-complain. Almost all occurrences of numbers (with the exception of pin
-numbers and where they are separated by space, e.g., in signature and
-readback) can also be given as simple expressions involving arithemtic and
-bitwise operators.
+@code{ocdrev}, @code{initval} and @code{bitmask}, all of which default to
+-1, and for @code{autobaud_sync} which defaults to 0x30) or the empty
+string @code{""} for string values. If a required parameter is left empty,
+AVRDUDE will complain. Almost all occurrences of numbers (with the
+exception of pin numbers and where they are separated by space, e.g., in
+signature and readback) can also be given as simple expressions involving
+arithemtic and bitwise operators.
 
 @menu
 * Parent Part::