From 48eeec67cc4c5b51e5f06307dd007cd3e1d392d2 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Wed, 5 Jun 2024 19:30:22 +0100
Subject: [PATCH] Corrected production and user signature modules in some AVR8
 XMEGA and ATMEGA TDFs - they contained descriptions of registers that do not
 exist on those targets

---
 .../AVR8/MEGA/ATMEGA1608.xml                  | 32 -------------------
 .../AVR8/MEGA/ATMEGA1609.xml                  | 32 -------------------
 .../AVR8/MEGA/ATMEGA808.xml                   | 32 -------------------
 .../AVR8/MEGA/ATMEGA809.xml                   | 32 -------------------
 .../AVR8/XMEGA/ATXMEGA128A3U.xml              |  4 ---
 .../AVR8/XMEGA/ATXMEGA16A4U.xml               |  4 ---
 .../AVR8/XMEGA/ATXMEGA192A3U.xml              |  4 ---
 .../AVR8/XMEGA/ATXMEGA256A3BU.xml             |  4 ---
 .../AVR8/XMEGA/ATXMEGA256A3U.xml              |  4 ---
 .../AVR8/XMEGA/ATXMEGA32A4U.xml               |  4 ---
 .../AVR8/XMEGA/ATXMEGA64A3U.xml               |  4 ---
 11 files changed, 156 deletions(-)

diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
index 3129d5e0..f5efd8be 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
@@ -1331,38 +1331,6 @@
                 <register key="userrow29" name="USERROW29" description="User Row Byte 29" offset="0x1D" size="1" access="RW"/>
                 <register key="userrow30" name="USERROW30" description="User Row Byte 30" offset="0x1E" size="1" access="RW"/>
                 <register key="userrow31" name="USERROW31" description="User Row Byte 31" offset="0x1F" size="1" access="RW"/>
-                <register key="userrow32" name="USERROW32" description="User Row Byte 32" offset="0x20" size="1" access="RW"/>
-                <register key="userrow33" name="USERROW33" description="User Row Byte 33" offset="0x21" size="1" access="RW"/>
-                <register key="userrow34" name="USERROW34" description="User Row Byte 34" offset="0x22" size="1" access="RW"/>
-                <register key="userrow35" name="USERROW35" description="User Row Byte 35" offset="0x23" size="1" access="RW"/>
-                <register key="userrow36" name="USERROW36" description="User Row Byte 36" offset="0x24" size="1" access="RW"/>
-                <register key="userrow37" name="USERROW37" description="User Row Byte 37" offset="0x25" size="1" access="RW"/>
-                <register key="userrow38" name="USERROW38" description="User Row Byte 38" offset="0x26" size="1" access="RW"/>
-                <register key="userrow39" name="USERROW39" description="User Row Byte 39" offset="0x27" size="1" access="RW"/>
-                <register key="userrow40" name="USERROW40" description="User Row Byte 40" offset="0x28" size="1" access="RW"/>
-                <register key="userrow41" name="USERROW41" description="User Row Byte 41" offset="0x29" size="1" access="RW"/>
-                <register key="userrow42" name="USERROW42" description="User Row Byte 42" offset="0x2A" size="1" access="RW"/>
-                <register key="userrow43" name="USERROW43" description="User Row Byte 43" offset="0x2B" size="1" access="RW"/>
-                <register key="userrow44" name="USERROW44" description="User Row Byte 44" offset="0x2C" size="1" access="RW"/>
-                <register key="userrow45" name="USERROW45" description="User Row Byte 45" offset="0x2D" size="1" access="RW"/>
-                <register key="userrow46" name="USERROW46" description="User Row Byte 46" offset="0x2E" size="1" access="RW"/>
-                <register key="userrow47" name="USERROW47" description="User Row Byte 47" offset="0x2F" size="1" access="RW"/>
-                <register key="userrow48" name="USERROW48" description="User Row Byte 48" offset="0x30" size="1" access="RW"/>
-                <register key="userrow49" name="USERROW49" description="User Row Byte 49" offset="0x31" size="1" access="RW"/>
-                <register key="userrow50" name="USERROW50" description="User Row Byte 50" offset="0x32" size="1" access="RW"/>
-                <register key="userrow51" name="USERROW51" description="User Row Byte 51" offset="0x33" size="1" access="RW"/>
-                <register key="userrow52" name="USERROW52" description="User Row Byte 52" offset="0x34" size="1" access="RW"/>
-                <register key="userrow53" name="USERROW53" description="User Row Byte 53" offset="0x35" size="1" access="RW"/>
-                <register key="userrow54" name="USERROW54" description="User Row Byte 54" offset="0x36" size="1" access="RW"/>
-                <register key="userrow55" name="USERROW55" description="User Row Byte 55" offset="0x37" size="1" access="RW"/>
-                <register key="userrow56" name="USERROW56" description="User Row Byte 56" offset="0x38" size="1" access="RW"/>
-                <register key="userrow57" name="USERROW57" description="User Row Byte 57" offset="0x39" size="1" access="RW"/>
-                <register key="userrow58" name="USERROW58" description="User Row Byte 58" offset="0x3A" size="1" access="RW"/>
-                <register key="userrow59" name="USERROW59" description="User Row Byte 59" offset="0x3B" size="1" access="RW"/>
-                <register key="userrow60" name="USERROW60" description="User Row Byte 60" offset="0x3C" size="1" access="RW"/>
-                <register key="userrow61" name="USERROW61" description="User Row Byte 61" offset="0x3D" size="1" access="RW"/>
-                <register key="userrow62" name="USERROW62" description="User Row Byte 62" offset="0x3E" size="1" access="RW"/>
-                <register key="userrow63" name="USERROW63" description="User Row Byte 63" offset="0x3F" size="1" access="RW"/>
             </register-group>
         </module>
         <module key="i2103_vport" name="VPORT" description="Virtual Ports">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
index 7f8e648e..37d4c087 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
@@ -1408,38 +1408,6 @@
                 <register key="userrow29" name="USERROW29" description="User Row Byte 29" offset="0x1D" size="1" access="RW"/>
                 <register key="userrow30" name="USERROW30" description="User Row Byte 30" offset="0x1E" size="1" access="RW"/>
                 <register key="userrow31" name="USERROW31" description="User Row Byte 31" offset="0x1F" size="1" access="RW"/>
-                <register key="userrow32" name="USERROW32" description="User Row Byte 32" offset="0x20" size="1" access="RW"/>
-                <register key="userrow33" name="USERROW33" description="User Row Byte 33" offset="0x21" size="1" access="RW"/>
-                <register key="userrow34" name="USERROW34" description="User Row Byte 34" offset="0x22" size="1" access="RW"/>
-                <register key="userrow35" name="USERROW35" description="User Row Byte 35" offset="0x23" size="1" access="RW"/>
-                <register key="userrow36" name="USERROW36" description="User Row Byte 36" offset="0x24" size="1" access="RW"/>
-                <register key="userrow37" name="USERROW37" description="User Row Byte 37" offset="0x25" size="1" access="RW"/>
-                <register key="userrow38" name="USERROW38" description="User Row Byte 38" offset="0x26" size="1" access="RW"/>
-                <register key="userrow39" name="USERROW39" description="User Row Byte 39" offset="0x27" size="1" access="RW"/>
-                <register key="userrow40" name="USERROW40" description="User Row Byte 40" offset="0x28" size="1" access="RW"/>
-                <register key="userrow41" name="USERROW41" description="User Row Byte 41" offset="0x29" size="1" access="RW"/>
-                <register key="userrow42" name="USERROW42" description="User Row Byte 42" offset="0x2A" size="1" access="RW"/>
-                <register key="userrow43" name="USERROW43" description="User Row Byte 43" offset="0x2B" size="1" access="RW"/>
-                <register key="userrow44" name="USERROW44" description="User Row Byte 44" offset="0x2C" size="1" access="RW"/>
-                <register key="userrow45" name="USERROW45" description="User Row Byte 45" offset="0x2D" size="1" access="RW"/>
-                <register key="userrow46" name="USERROW46" description="User Row Byte 46" offset="0x2E" size="1" access="RW"/>
-                <register key="userrow47" name="USERROW47" description="User Row Byte 47" offset="0x2F" size="1" access="RW"/>
-                <register key="userrow48" name="USERROW48" description="User Row Byte 48" offset="0x30" size="1" access="RW"/>
-                <register key="userrow49" name="USERROW49" description="User Row Byte 49" offset="0x31" size="1" access="RW"/>
-                <register key="userrow50" name="USERROW50" description="User Row Byte 50" offset="0x32" size="1" access="RW"/>
-                <register key="userrow51" name="USERROW51" description="User Row Byte 51" offset="0x33" size="1" access="RW"/>
-                <register key="userrow52" name="USERROW52" description="User Row Byte 52" offset="0x34" size="1" access="RW"/>
-                <register key="userrow53" name="USERROW53" description="User Row Byte 53" offset="0x35" size="1" access="RW"/>
-                <register key="userrow54" name="USERROW54" description="User Row Byte 54" offset="0x36" size="1" access="RW"/>
-                <register key="userrow55" name="USERROW55" description="User Row Byte 55" offset="0x37" size="1" access="RW"/>
-                <register key="userrow56" name="USERROW56" description="User Row Byte 56" offset="0x38" size="1" access="RW"/>
-                <register key="userrow57" name="USERROW57" description="User Row Byte 57" offset="0x39" size="1" access="RW"/>
-                <register key="userrow58" name="USERROW58" description="User Row Byte 58" offset="0x3A" size="1" access="RW"/>
-                <register key="userrow59" name="USERROW59" description="User Row Byte 59" offset="0x3B" size="1" access="RW"/>
-                <register key="userrow60" name="USERROW60" description="User Row Byte 60" offset="0x3C" size="1" access="RW"/>
-                <register key="userrow61" name="USERROW61" description="User Row Byte 61" offset="0x3D" size="1" access="RW"/>
-                <register key="userrow62" name="USERROW62" description="User Row Byte 62" offset="0x3E" size="1" access="RW"/>
-                <register key="userrow63" name="USERROW63" description="User Row Byte 63" offset="0x3F" size="1" access="RW"/>
             </register-group>
         </module>
         <module key="i2103_vport" name="VPORT" description="Virtual Ports">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
index 5a55b5f7..8ea46c4b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
@@ -1331,38 +1331,6 @@
                 <register key="userrow29" name="USERROW29" description="User Row Byte 29" offset="0x1D" size="1" access="RW"/>
                 <register key="userrow30" name="USERROW30" description="User Row Byte 30" offset="0x1E" size="1" access="RW"/>
                 <register key="userrow31" name="USERROW31" description="User Row Byte 31" offset="0x1F" size="1" access="RW"/>
-                <register key="userrow32" name="USERROW32" description="User Row Byte 32" offset="0x20" size="1" access="RW"/>
-                <register key="userrow33" name="USERROW33" description="User Row Byte 33" offset="0x21" size="1" access="RW"/>
-                <register key="userrow34" name="USERROW34" description="User Row Byte 34" offset="0x22" size="1" access="RW"/>
-                <register key="userrow35" name="USERROW35" description="User Row Byte 35" offset="0x23" size="1" access="RW"/>
-                <register key="userrow36" name="USERROW36" description="User Row Byte 36" offset="0x24" size="1" access="RW"/>
-                <register key="userrow37" name="USERROW37" description="User Row Byte 37" offset="0x25" size="1" access="RW"/>
-                <register key="userrow38" name="USERROW38" description="User Row Byte 38" offset="0x26" size="1" access="RW"/>
-                <register key="userrow39" name="USERROW39" description="User Row Byte 39" offset="0x27" size="1" access="RW"/>
-                <register key="userrow40" name="USERROW40" description="User Row Byte 40" offset="0x28" size="1" access="RW"/>
-                <register key="userrow41" name="USERROW41" description="User Row Byte 41" offset="0x29" size="1" access="RW"/>
-                <register key="userrow42" name="USERROW42" description="User Row Byte 42" offset="0x2A" size="1" access="RW"/>
-                <register key="userrow43" name="USERROW43" description="User Row Byte 43" offset="0x2B" size="1" access="RW"/>
-                <register key="userrow44" name="USERROW44" description="User Row Byte 44" offset="0x2C" size="1" access="RW"/>
-                <register key="userrow45" name="USERROW45" description="User Row Byte 45" offset="0x2D" size="1" access="RW"/>
-                <register key="userrow46" name="USERROW46" description="User Row Byte 46" offset="0x2E" size="1" access="RW"/>
-                <register key="userrow47" name="USERROW47" description="User Row Byte 47" offset="0x2F" size="1" access="RW"/>
-                <register key="userrow48" name="USERROW48" description="User Row Byte 48" offset="0x30" size="1" access="RW"/>
-                <register key="userrow49" name="USERROW49" description="User Row Byte 49" offset="0x31" size="1" access="RW"/>
-                <register key="userrow50" name="USERROW50" description="User Row Byte 50" offset="0x32" size="1" access="RW"/>
-                <register key="userrow51" name="USERROW51" description="User Row Byte 51" offset="0x33" size="1" access="RW"/>
-                <register key="userrow52" name="USERROW52" description="User Row Byte 52" offset="0x34" size="1" access="RW"/>
-                <register key="userrow53" name="USERROW53" description="User Row Byte 53" offset="0x35" size="1" access="RW"/>
-                <register key="userrow54" name="USERROW54" description="User Row Byte 54" offset="0x36" size="1" access="RW"/>
-                <register key="userrow55" name="USERROW55" description="User Row Byte 55" offset="0x37" size="1" access="RW"/>
-                <register key="userrow56" name="USERROW56" description="User Row Byte 56" offset="0x38" size="1" access="RW"/>
-                <register key="userrow57" name="USERROW57" description="User Row Byte 57" offset="0x39" size="1" access="RW"/>
-                <register key="userrow58" name="USERROW58" description="User Row Byte 58" offset="0x3A" size="1" access="RW"/>
-                <register key="userrow59" name="USERROW59" description="User Row Byte 59" offset="0x3B" size="1" access="RW"/>
-                <register key="userrow60" name="USERROW60" description="User Row Byte 60" offset="0x3C" size="1" access="RW"/>
-                <register key="userrow61" name="USERROW61" description="User Row Byte 61" offset="0x3D" size="1" access="RW"/>
-                <register key="userrow62" name="USERROW62" description="User Row Byte 62" offset="0x3E" size="1" access="RW"/>
-                <register key="userrow63" name="USERROW63" description="User Row Byte 63" offset="0x3F" size="1" access="RW"/>
             </register-group>
         </module>
         <module key="i2103_vport" name="VPORT" description="Virtual Ports">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
index 022bcd27..11b35242 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
@@ -1408,38 +1408,6 @@
                 <register key="userrow29" name="USERROW29" description="User Row Byte 29" offset="0x1D" size="1" access="RW"/>
                 <register key="userrow30" name="USERROW30" description="User Row Byte 30" offset="0x1E" size="1" access="RW"/>
                 <register key="userrow31" name="USERROW31" description="User Row Byte 31" offset="0x1F" size="1" access="RW"/>
-                <register key="userrow32" name="USERROW32" description="User Row Byte 32" offset="0x20" size="1" access="RW"/>
-                <register key="userrow33" name="USERROW33" description="User Row Byte 33" offset="0x21" size="1" access="RW"/>
-                <register key="userrow34" name="USERROW34" description="User Row Byte 34" offset="0x22" size="1" access="RW"/>
-                <register key="userrow35" name="USERROW35" description="User Row Byte 35" offset="0x23" size="1" access="RW"/>
-                <register key="userrow36" name="USERROW36" description="User Row Byte 36" offset="0x24" size="1" access="RW"/>
-                <register key="userrow37" name="USERROW37" description="User Row Byte 37" offset="0x25" size="1" access="RW"/>
-                <register key="userrow38" name="USERROW38" description="User Row Byte 38" offset="0x26" size="1" access="RW"/>
-                <register key="userrow39" name="USERROW39" description="User Row Byte 39" offset="0x27" size="1" access="RW"/>
-                <register key="userrow40" name="USERROW40" description="User Row Byte 40" offset="0x28" size="1" access="RW"/>
-                <register key="userrow41" name="USERROW41" description="User Row Byte 41" offset="0x29" size="1" access="RW"/>
-                <register key="userrow42" name="USERROW42" description="User Row Byte 42" offset="0x2A" size="1" access="RW"/>
-                <register key="userrow43" name="USERROW43" description="User Row Byte 43" offset="0x2B" size="1" access="RW"/>
-                <register key="userrow44" name="USERROW44" description="User Row Byte 44" offset="0x2C" size="1" access="RW"/>
-                <register key="userrow45" name="USERROW45" description="User Row Byte 45" offset="0x2D" size="1" access="RW"/>
-                <register key="userrow46" name="USERROW46" description="User Row Byte 46" offset="0x2E" size="1" access="RW"/>
-                <register key="userrow47" name="USERROW47" description="User Row Byte 47" offset="0x2F" size="1" access="RW"/>
-                <register key="userrow48" name="USERROW48" description="User Row Byte 48" offset="0x30" size="1" access="RW"/>
-                <register key="userrow49" name="USERROW49" description="User Row Byte 49" offset="0x31" size="1" access="RW"/>
-                <register key="userrow50" name="USERROW50" description="User Row Byte 50" offset="0x32" size="1" access="RW"/>
-                <register key="userrow51" name="USERROW51" description="User Row Byte 51" offset="0x33" size="1" access="RW"/>
-                <register key="userrow52" name="USERROW52" description="User Row Byte 52" offset="0x34" size="1" access="RW"/>
-                <register key="userrow53" name="USERROW53" description="User Row Byte 53" offset="0x35" size="1" access="RW"/>
-                <register key="userrow54" name="USERROW54" description="User Row Byte 54" offset="0x36" size="1" access="RW"/>
-                <register key="userrow55" name="USERROW55" description="User Row Byte 55" offset="0x37" size="1" access="RW"/>
-                <register key="userrow56" name="USERROW56" description="User Row Byte 56" offset="0x38" size="1" access="RW"/>
-                <register key="userrow57" name="USERROW57" description="User Row Byte 57" offset="0x39" size="1" access="RW"/>
-                <register key="userrow58" name="USERROW58" description="User Row Byte 58" offset="0x3A" size="1" access="RW"/>
-                <register key="userrow59" name="USERROW59" description="User Row Byte 59" offset="0x3B" size="1" access="RW"/>
-                <register key="userrow60" name="USERROW60" description="User Row Byte 60" offset="0x3C" size="1" access="RW"/>
-                <register key="userrow61" name="USERROW61" description="User Row Byte 61" offset="0x3D" size="1" access="RW"/>
-                <register key="userrow62" name="USERROW62" description="User Row Byte 62" offset="0x3E" size="1" access="RW"/>
-                <register key="userrow63" name="USERROW63" description="User Row Byte 63" offset="0x3F" size="1" access="RW"/>
             </register-group>
         </module>
         <module key="i2103_vport" name="VPORT" description="Virtual Ports">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
index bdd7d5bb..cb7f49d9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
@@ -1975,10 +1975,6 @@
                 <register key="daca0gaincal" name="DACA0GAINCAL" description="DACA0 Calibration Byte 1" offset="0x31" size="1"/>
                 <register key="dacb0offcal" name="DACB0OFFCAL" description="DACB0 Calibration Byte 0" offset="0x32" size="1"/>
                 <register key="dacb0gaincal" name="DACB0GAINCAL" description="DACB0 Calibration Byte 1" offset="0x33" size="1"/>
-                <register key="daca1offcal" name="DACA1OFFCAL" description="DACA1 Calibration Byte 0" offset="0x34" size="1"/>
-                <register key="daca1gaincal" name="DACA1GAINCAL" description="DACA1 Calibration Byte 1" offset="0x35" size="1"/>
-                <register key="dacb1offcal" name="DACB1OFFCAL" description="DACB1 Calibration Byte 0" offset="0x36" size="1"/>
-                <register key="dacb1gaincal" name="DACB1GAINCAL" description="DACB1 Calibration Byte 1" offset="0x37" size="1"/>
             </register-group>
         </module>
     </modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
index 397d08f9..832d403c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
@@ -1806,10 +1806,6 @@
                 <register key="daca0gaincal" name="DACA0GAINCAL" description="DACA0 Calibration Byte 1" offset="0x31" size="1"/>
                 <register key="dacb0offcal" name="DACB0OFFCAL" description="DACB0 Calibration Byte 0" offset="0x32" size="1"/>
                 <register key="dacb0gaincal" name="DACB0GAINCAL" description="DACB0 Calibration Byte 1" offset="0x33" size="1"/>
-                <register key="daca1offcal" name="DACA1OFFCAL" description="DACA1 Calibration Byte 0" offset="0x34" size="1"/>
-                <register key="daca1gaincal" name="DACA1GAINCAL" description="DACA1 Calibration Byte 1" offset="0x35" size="1"/>
-                <register key="dacb1offcal" name="DACB1OFFCAL" description="DACB1 Calibration Byte 0" offset="0x36" size="1"/>
-                <register key="dacb1gaincal" name="DACB1GAINCAL" description="DACB1 Calibration Byte 1" offset="0x37" size="1"/>
             </register-group>
         </module>
     </modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
index cb013c9a..fd13f488 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
@@ -1975,10 +1975,6 @@
                 <register key="daca0gaincal" name="DACA0GAINCAL" description="DACA0 Calibration Byte 1" offset="0x31" size="1"/>
                 <register key="dacb0offcal" name="DACB0OFFCAL" description="DACB0 Calibration Byte 0" offset="0x32" size="1"/>
                 <register key="dacb0gaincal" name="DACB0GAINCAL" description="DACB0 Calibration Byte 1" offset="0x33" size="1"/>
-                <register key="daca1offcal" name="DACA1OFFCAL" description="DACA1 Calibration Byte 0" offset="0x34" size="1"/>
-                <register key="daca1gaincal" name="DACA1GAINCAL" description="DACA1 Calibration Byte 1" offset="0x35" size="1"/>
-                <register key="dacb1offcal" name="DACB1OFFCAL" description="DACB1 Calibration Byte 0" offset="0x36" size="1"/>
-                <register key="dacb1gaincal" name="DACB1GAINCAL" description="DACB1 Calibration Byte 1" offset="0x37" size="1"/>
             </register-group>
         </module>
     </modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
index a025791e..0e8937c7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
@@ -1925,10 +1925,6 @@
                 <register key="daca0gaincal" name="DACA0GAINCAL" description="DACA0 Calibration Byte 1" offset="0x31" size="1"/>
                 <register key="dacb0offcal" name="DACB0OFFCAL" description="DACB0 Calibration Byte 0" offset="0x32" size="1"/>
                 <register key="dacb0gaincal" name="DACB0GAINCAL" description="DACB0 Calibration Byte 1" offset="0x33" size="1"/>
-                <register key="daca1offcal" name="DACA1OFFCAL" description="DACA1 Calibration Byte 0" offset="0x34" size="1"/>
-                <register key="daca1gaincal" name="DACA1GAINCAL" description="DACA1 Calibration Byte 1" offset="0x35" size="1"/>
-                <register key="dacb1offcal" name="DACB1OFFCAL" description="DACB1 Calibration Byte 0" offset="0x36" size="1"/>
-                <register key="dacb1gaincal" name="DACB1GAINCAL" description="DACB1 Calibration Byte 1" offset="0x37" size="1"/>
             </register-group>
         </module>
     </modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
index 3e2a2e6b..53200871 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
@@ -1975,10 +1975,6 @@
                 <register key="daca0gaincal" name="DACA0GAINCAL" description="DACA0 Calibration Byte 1" offset="0x31" size="1"/>
                 <register key="dacb0offcal" name="DACB0OFFCAL" description="DACB0 Calibration Byte 0" offset="0x32" size="1"/>
                 <register key="dacb0gaincal" name="DACB0GAINCAL" description="DACB0 Calibration Byte 1" offset="0x33" size="1"/>
-                <register key="daca1offcal" name="DACA1OFFCAL" description="DACA1 Calibration Byte 0" offset="0x34" size="1"/>
-                <register key="daca1gaincal" name="DACA1GAINCAL" description="DACA1 Calibration Byte 1" offset="0x35" size="1"/>
-                <register key="dacb1offcal" name="DACB1OFFCAL" description="DACB1 Calibration Byte 0" offset="0x36" size="1"/>
-                <register key="dacb1gaincal" name="DACB1GAINCAL" description="DACB1 Calibration Byte 1" offset="0x37" size="1"/>
             </register-group>
         </module>
     </modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
index ab900cc9..6582ec88 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
@@ -1806,10 +1806,6 @@
                 <register key="daca0gaincal" name="DACA0GAINCAL" description="DACA0 Calibration Byte 1" offset="0x31" size="1"/>
                 <register key="dacb0offcal" name="DACB0OFFCAL" description="DACB0 Calibration Byte 0" offset="0x32" size="1"/>
                 <register key="dacb0gaincal" name="DACB0GAINCAL" description="DACB0 Calibration Byte 1" offset="0x33" size="1"/>
-                <register key="daca1offcal" name="DACA1OFFCAL" description="DACA1 Calibration Byte 0" offset="0x34" size="1"/>
-                <register key="daca1gaincal" name="DACA1GAINCAL" description="DACA1 Calibration Byte 1" offset="0x35" size="1"/>
-                <register key="dacb1offcal" name="DACB1OFFCAL" description="DACB1 Calibration Byte 0" offset="0x36" size="1"/>
-                <register key="dacb1gaincal" name="DACB1GAINCAL" description="DACB1 Calibration Byte 1" offset="0x37" size="1"/>
             </register-group>
         </module>
     </modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
index 88a19058..4b80434e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
@@ -1975,10 +1975,6 @@
                 <register key="daca0gaincal" name="DACA0GAINCAL" description="DACA0 Calibration Byte 1" offset="0x31" size="1"/>
                 <register key="dacb0offcal" name="DACB0OFFCAL" description="DACB0 Calibration Byte 0" offset="0x32" size="1"/>
                 <register key="dacb0gaincal" name="DACB0GAINCAL" description="DACB0 Calibration Byte 1" offset="0x33" size="1"/>
-                <register key="daca1offcal" name="DACA1OFFCAL" description="DACA1 Calibration Byte 0" offset="0x34" size="1"/>
-                <register key="daca1gaincal" name="DACA1GAINCAL" description="DACA1 Calibration Byte 1" offset="0x35" size="1"/>
-                <register key="dacb1offcal" name="DACB1OFFCAL" description="DACB1 Calibration Byte 0" offset="0x36" size="1"/>
-                <register key="dacb1gaincal" name="DACB1GAINCAL" description="DACB1 Calibration Byte 1" offset="0x37" size="1"/>
             </register-group>
         </module>
     </modules>