From 9e836d79885e1f2ab309037b6ebfb1b718df3654 Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Wed, 21 Sep 2022 12:12:06 +0100
Subject: [PATCH] Ensure avrdude.conf (programmer, part) pairs allow max one
programming mode
---
src/avrdude.conf.in | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index b2e8df33..4c783a6c 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -1709,7 +1709,7 @@ programmer
id = "jtagmkII";
desc = "Atmel JTAG ICE mkII";
type = "jtagmkii";
- prog_modes = PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG;
+ prog_modes = PM_JTAG | PM_XMEGAJTAG | PM_AVR32JTAG;
connection_type = usb;
baudrate = 19200; # default is 19200
;
@@ -1830,7 +1830,7 @@ programmer
id = "dragon_jtag";
desc = "Atmel AVR Dragon in JTAG mode";
type = "dragon_jtag";
- prog_modes = PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG;
+ prog_modes = PM_JTAG | PM_XMEGAJTAG | PM_AVR32JTAG;
connection_type = usb;
baudrate = 115200;
;
@@ -1918,7 +1918,7 @@ programmer
id = "jtag3";
desc = "Atmel AVR JTAGICE3 in JTAG mode";
type = "jtagice3";
- prog_modes = PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG;
+ prog_modes = PM_JTAG | PM_XMEGAJTAG | PM_AVR32JTAG;
connection_type = usb;
usbpid = 0x2110, 0x2140;
;
@@ -1984,7 +1984,7 @@ programmer
id = "xplainedpro";
desc = "Atmel AVR XplainedPro in JTAG mode";
type = "jtagice3";
- prog_modes = PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG;
+ prog_modes = PM_JTAG | PM_XMEGAJTAG | PM_AVR32JTAG;
connection_type = usb;
usbpid = 0x2111;
;
@@ -2051,7 +2051,7 @@ programmer
id = "atmelice";
desc = "Atmel-ICE (ARM/AVR) in JTAG mode";
type = "jtagice3";
- prog_modes = PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG;
+ prog_modes = PM_JTAG | PM_XMEGAJTAG | PM_AVR32JTAG;
connection_type = usb;
usbpid = 0x2141;
;
@@ -2091,7 +2091,7 @@ programmer
id = "atmelice_dw";
desc = "Atmel-ICE (ARM/AVR) in debugWIRE mode";
type = "jtagice3_dw";
- prog_modes = PM_PDI | PM_debugWIRE;
+ prog_modes = PM_debugWIRE;
connection_type = usb;
usbpid = 0x2141;
;
@@ -2117,7 +2117,7 @@ programmer
id = "powerdebugger";
desc = "Atmel PowerDebugger (ARM/AVR) in JTAG mode";
type = "jtagice3";
- prog_modes = PM_JTAG | PM_JTAGmkI | PM_XMEGAJTAG | PM_AVR32JTAG;
+ prog_modes = PM_JTAG | PM_XMEGAJTAG | PM_AVR32JTAG;
connection_type = usb;
usbpid = 0x2144;
;