From f8635451a23246239ba95c1e3b223151d3180edc Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Tue, 3 Jan 2023 00:06:37 +0000
Subject: [PATCH] Change avdude.conf.in into canonical form

avrdude -p*/s -c*/s outputs how avrdude understands the programmers
and parts defined in avrdude.conf.in that syntax (the canonical
form). This commit ensures that avrdude.conf.in is in canonical
form, typically removing assignments that are redundant owing to
inheritance.

Also changes a couple of comments and one programmer description
string to be more expressive.
---
 src/avrdude.conf.in | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 56ecc8ab..440b0db1 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -403,6 +403,7 @@ default_spi        = "@DEFAULT_SPI_PORT@";
 # default_bitclock = 2.5;
 
 @HAVE_PARPORT_BEGIN@
+
 # Parallel port programmers
 
 #------------------------------------------------------------
@@ -845,7 +846,7 @@ programmer parent "ft2232h"
 
 programmer parent "ft2232h"
     id                     = "2232hio";
-    desc                   = "FT2232H based generic programmer";
+    desc                   = "2232hio based on FT2232H with buffer and LEDs";
     buff                   = ~4;
 # LED SIGNALs
     errled                 = ~11;
@@ -858,18 +859,15 @@ programmer parent "ft2232h"
 # tigard
 #------------------------------------------------------------
 
-# Tigard - FT2232H based multi-protocol tool for hardware hacking.
+# Tigard - FT2232H based multi-protocol tool for hardware hacking
 # https://github.com/tigard-tools/tigard
 
 programmer parent "ft2232h"
     id                     = "tigard";
     desc                   = "Tigard interface board";
     usbdev                 = "B";
-# ISP-signals
+# Reset is different to the FT2232H; sck, sdo, sdi remain at 0, 1, 2
     reset                  = 5; # BD5 (GPIOL1)
-    sck                    = 0; # BD0 (TCK)
-    sdo                    = 1; # BD1 (TDI)
-    sdi                    = 2; # BD2 (TDO)
 ;
 
 #------------------------------------------------------------
@@ -891,7 +889,6 @@ programmer parent "ft2232h"
 
 programmer parent "ft4232h"
     id                     = "4232h";
-    desc                   = "FT4232H based generic programmer";
 ;
 
 #------------------------------------------------------------
@@ -954,7 +951,6 @@ programmer
 programmer parent "ft232h"
     id                     = "um232h";
     desc                   = "UM232H module from FTDI";
-    usbpid                 = 0x6014;
 ;
 
 #------------------------------------------------------------
@@ -972,7 +968,6 @@ programmer parent "ft232h"
 programmer parent "ft232h"
     id                     = "c232hm";
     desc                   = "C232HM cable from FTDI";
-    usbpid                 = 0x6014;
 ;
 
 #------------------------------------------------------------
@@ -13641,11 +13636,7 @@ part parent ".reduced_core_tiny"
     ;
 
     memory "fuse"
-        size               = 1;
-        page_size          = 16;
         n_word_writes      = 2;
-        offset             = 0x3f40;
-        blocksize          = 4;
     ;
 ;
 
@@ -13669,11 +13660,7 @@ part parent ".reduced_core_tiny"
     ;
 
     memory "fuse"
-        size               = 1;
-        page_size          = 16;
         n_word_writes      = 4;
-        offset             = 0x3f40;
-        blocksize          = 4;
     ;
 ;
 
@@ -13784,10 +13771,6 @@ part
         size               = 1;
     ;
 
-    memory "lockbits"
-        size               = 1;
-    ;
-
     memory "signature"
         size               = 3;
     ;