Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-06-02 09:46:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1466 from stefanrueger/usersig-offset

Browse Source 
Consider classic part usersig memory offset for jtag3
This commit is contained in:
Stefan Rueger
2023-07-15 00:26:55 +01:00
committed by GitHub
parent 824860cc8a 1bb6afea67
commit bc4a164200
5 changed files with 103 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/avrdude.1
View File

@@ -758,6 +758,18 @@ High fuse byte
Low fuse byte
.It lock
Lock byte
.It usersig
Three extra flash pages for firmware settings; this memory is not erased
during a chip erase. Only some classic parts,
ATmega(64|128|256|644|1284|2564)RFR2, have a usersig memory. Usersig is
different to flash in the sense that it can neither be accessed with ISP
serial programming nor written to by bootloaders;
.Nm
offers JTAG programming of classic-part usersig memories. As with all
flash-type memories the -U option can only write 0-bits but not 1-bits.
Hence, usersig needs to be erased before a file can be uploaded to this
memory region, e.g., using -T "erase usersig" -U
usersig:w:parameters.hex:i
.El
.Pp
ATxmega devices have the following memory types in addition to eeprom, flash, signature and lock:
@@ -781,7 +793,8 @@ is 2, 4 or 5, for system configuration
.It prodsig
Production signature (calibration) area
.It usersig
User signature area of ATxmega devices
Additional flash memory page that can be used for firmware settings; this
memory is not erased during a chip erase
.El
.Pp
Modern 8-bit AVR devices have the following memory types in addition to eeprom, flash, signature and lock:
@@ -820,7 +833,8 @@ Serial number with a unique ID for the part (10 bytes)
.It tempsense
Temperature sensor calibration values
.It userrow
Extra page of EEPROM memory that can be used for firmware settings
Extra page of EEPROM memory that can be used for firmware settings; this
memory is not erased during a chip erase
.El
.Pp
The
@@ -894,7 +908,7 @@ formats will use the same code for reading lists of numbers separated by
white space and/or commas. The read routine handles decimal, hexadecimal,
octal or binary numbers on a number-by-number basis, and the list of
numbers can therefore be of mixed type. In fact the syntax, is the same as
for data used by the terminal write command, ie, the file's input data can
for data used by the terminal write command, i.e., the file's input data can
also be 2-byte short integers, 4-byte long integers or 8-byte long long
integers, 4-byte floating point numbers, 8-byte double precision numbers,
C-type strings with a terminating nul or C-like characters such as '\t'.
@@ -1029,7 +1043,7 @@ or C-style strings and characters. If nothing matches,
.Ar data
will be interpreted as the name of a file containing data, which will be
read and inserted at this point. In order to force the interpretation of a
data item as file, eg, when the file name would be understood as a number
data item as file, e.g., when the file name would be understood as a number
otherwise, the file name can be given a
.Ar :f
format specifier. In absence of a format suffix, the terminal will try
@@ -1039,7 +1053,7 @@ For integers, an optional case-insensitive suffix specifies the data size: HH
8 bit, H/S 16 bit, L 32 bit, LL 64 bit. Suffix D indicates a 64-bit double, F
a 32-bit float, whilst a floating point number without suffix defaults to
32-bit float. Hexadecimal floating point notation is supported. An ambiguous
trailing suffix, eg, 0x1.8D, is read as no-suffix float where D is part of
trailing suffix, e.g., 0x1.8D, is read as no-suffix float where D is part of
the mantissa; use a zero exponent 0x1.8p0D to clarify.
.Pp
An optional U suffix makes integers unsigned. Ordinary 0x hexadecimal and 0b
@@ -1105,7 +1119,7 @@ EEPROM, too) looks like a NOR memory, i.e., a write can only clear bits,
never set them. For NOR memories a page erase or, if not available, a chip
erase needs to be issued before writing arbitrary data. Usersig is
generally unaffected by a chip erase. When a memory looks like a NOR
memory, either page erase is deployed (eg, with parts that have PDI/UPDI
memory, either page erase is deployed (e.g., with parts that have PDI/UPDI
interfaces), or if that is not available, both EEPROM and flash caches are
fully read in, a chip erase command is issued and both EEPROM and flash
are written back to the device. Hence, it can take minutes to ensure that
@@ -1152,7 +1166,7 @@ and lock bits, to brick a part, i.e., make it unresponsive to further
programming with the chosen programmer: here be dragons.
.It Ar include [<opts>] <file>
Include contents of the named file as if it was typed. This is useful for
batch scripts, eg, recurring initialisation code for fuses. The include
batch scripts, e.g., recurring initialisation code for fuses. The include
option -e prints the lines of the file as comments before processing them;
on a non-zero verbosity level the line numbers are printed, too.
.It Ar sig
@@ -1185,7 +1199,7 @@ Leave terminal mode and thus
.It Ar q
Can be used as an alias for quit.
.It Ar !<line>
Run the shell <line> in a subshell, eg, !ls *.hex. Subshell commands take the
Run the shell <line> in a subshell, e.g., !ls *.hex. Subshell commands take the
rest of the line as their command. For security reasons, they must
explictly be enabled by putting
.Pa allow_subshells = yes;
@@ -1534,7 +1548,7 @@ Show the part for which the bootloader was compiled, then exit.
.It Ar bootsize=<size>
Manual override for bootloader size. Urboot bootloaders put the number of
used bootloader pages into a table at the top of the bootloader section,
ie, typically top of flash, so the urclock programmer can look up the
i.e., typically top of flash, so the urclock programmer can look up the
bootloader size itself. In backward-compatibility mode, when programming
via other bootloaders, this option can be used to tell the programmer the
size, and therefore the location, of the bootloader.

67
src/avrdude.conf.in
View File

@@ -12906,28 +12906,6 @@ part parent "m2561"
min_write_delay = 4500;
max_write_delay = 4500;
;
#####
# Three separate flash pages
# - Offset 0x100 in signature row
# - Only programmable with JTAG or HVPP
# - Readable from an application
# - Cannot be read using ISP
# - Not erased by chip erase
#
memory "usersig"
paged = yes;
size = 768;
page_size = 256;
num_pages = 3;
offset = 0x100;
min_write_delay = 4500;
max_write_delay = 4500;
mode = 0x41;
delay = 50;
blocksize = 256;
readsize = 256;
;
;
#------------------------------------------------------------
@@ -12964,13 +12942,35 @@ part parent "m128rfa1"
memory "efuse"
initval = 0xfe;
;
#####
# Three separate flash pages
# - Offset 0x100 in signature row
# - Only programmable with JTAG or HVPP
# - Readable from an application
# - Cannot be read using ISP
# - Not erased by chip erase
#
memory "usersig"
paged = yes;
size = 768;
page_size = 256;
num_pages = 3;
offset = 0x100;
min_write_delay = 4500;
max_write_delay = 4500;
mode = 0x41;
delay = 50;
blocksize = 256;
readsize = 256;
;
;
#------------------------------------------------------------
# ATmega128RFR2
#------------------------------------------------------------
part parent "m128rfa1"
part parent "m256rfr2"
desc = "ATmega128RFR2";
id = "m128rfr2";
variants =
@@ -12979,12 +12979,17 @@ part parent "m128rfa1"
"ATmega128RFR2-ZU: VFQFN64, Fmax=16 MHz, T=[-40 C, 85 C], Vcc=[1.8 V, 3.6 V]",
"ATmega128RFR2-ZUR: VFQFN64, Fmax=16 MHz, T=[-40 C, 85 C], Vcc=[1.8 V, 3.6 V]";
mcuid = 88;
n_interrupts = 77;
signature = 0x1e 0xa7 0x02;
chiperasepolltimeout = 20;
ocdrev = 3;
memory "efuse"
initval = 0xfe;
memory "eeprom"
size = 4096;
;
memory "flash"
size = 0x20000;
num_pages = 512;
load_ext_addr = NULL;
;
;
@@ -12992,7 +12997,7 @@ part parent "m128rfa1"
# ATmega64RFR2
#------------------------------------------------------------
part parent "m128rfa1"
part parent "m128rfr2"
desc = "ATmega64RFR2";
id = "m64rfr2";
variants =
@@ -13001,9 +13006,7 @@ part parent "m128rfa1"
"ATmega64RFR2-ZU: VFQFN64, Fmax=16 MHz, T=[-40 C, 85 C], Vcc=[1.8 V, 3.6 V]",
"ATmega64RFR2-ZUR: VFQFN64, Fmax=16 MHz, T=[-40 C, 85 C], Vcc=[1.8 V, 3.6 V]";
mcuid = 78;
n_interrupts = 77;
signature = 0x1e 0xa6 0x02;
chiperasepolltimeout = 20;
memory "eeprom"
size = 2048;
@@ -13019,10 +13022,6 @@ part parent "m128rfa1"
read_hi = "0010.1000--0aaa.aaaa--aaaa.aaaa--oooo.oooo";
writepage = "0100.1100--0aaa.aaaa--axxx.xxxx--xxxx.xxxx";
;
memory "efuse"
initval = 0xfe;
;
;
#------------------------------------------------------------

33
src/doc/avrdude.texi
View File

@@ -794,7 +794,7 @@ Classic devices may have the following memory types in addition to
@code{eeprom}, @code{flash}, @code{signature} and @code{lock}:
@table @code
@item calibration
One or more bytes of RC oscillator calibration data.
One or more bytes of RC oscillator calibration data
@item efuse
Extended fuse byte
@item fuse
@@ -803,6 +803,17 @@ Fuse byte in devices that have only a single fuse byte
High fuse byte
@item lfuse
Low fuse byte
@item usersig
Three extra flash pages for firmware settings; this memory is not erased
during a chip erase. Only some classic parts,
ATmega(64|128|256|644|1284|2564)RFR2, have a usersig memory. Usersig is
different to flash in the sense that it can neither be accessed with ISP
serial programming nor written to by bootloaders. AVRDUDE offers JTAG
programming of classic-part usersig memories. As with all flash-type
memories the @code{-U} option can only write 0-bits but not 1-bits.
Hence, usersig needs to be erased before a file can be uploaded to this
memory region, e.g., using @code{-T "erase usersig" -U
usersig:w:parameters.hex:i}
@end table
ATxmega devices have the following memory types in addition to
@@ -825,7 +836,8 @@ Other fuse bytes of ATxmega devices, where @emph{N} is 2, 4 or 5, for system con
@item prodsig
Production signature (calibration) area
@item usersig
User signature area of ATxmega devices
Additional flash memory page that can be used for firmware settings; this
memory is not erased during a chip erase
@end table
Modern 8-bit AVR devices have the following memory types in addition to
@@ -864,7 +876,8 @@ Serial number with a unique ID for the pary (10 bytes)
@item tempsense
Temperature sensor calibration values
@item userrow
Extra page of EEPROM memory that can be used for firmware settings
Extra page of EEPROM memory that can be used for firmware settings; this
memory is not erased during a chip erase
@end table
@@ -935,7 +948,7 @@ When used as input, the @code{m}, @code{d}, @code{h}, @code{o} and
separated by white space and/or commas. The read routine handles decimal,
hexadecimal, octal or binary numbers on a number-by-number basis, and the
list of numbers can therefore be of mixed type. In fact the syntax, is the
same as for data used by the terminal write command, ie, the file's input
same as for data used by the terminal write command, i.e., the file's input
data can also be 2-byte short integers, 4-byte long integers or 8-byte
long long integers, 4-byte floating point numbers, 8-byte double precision
numbers, C-type strings with a terminating nul or C-like characters such
@@ -1191,7 +1204,7 @@ Show the part for which the bootloader was compiled, then exit.
@item @samp{bootsize=<size>}
Manual override for bootloader size. Urboot bootloaders put the number of
used bootloader pages into a table at the top of the bootloader section,
ie, typically top of flash, so the urclock programmer can look up the
i.e., typically top of flash, so the urclock programmer can look up the
bootloader size itself. In backward-compatibility mode, when programming
via other bootloaders, this option can be used to tell the programmer the
size, and therefore the location, of the bootloader.
@@ -2132,7 +2145,7 @@ can be binary, octal, decimal or hexadecimal integers, floating point
numbers or C-style strings and characters. If nothing matches, @code{data}
will be interpreted as a name of a file containing data, which will be
read and inserted at this point. In order to force the interpretation of a
data item as file, eg, when the file name would be understood as a number
data item as file, e.g., when the file name would be understood as a number
otherwise, the file name can be given a @code{:}@emph{f} format specifier.
In absence of a format suffix, the terminal will try to auto-detect
the file format.
@@ -2220,7 +2233,7 @@ EEPROM, too) looks like a NOR memory, i.e., a write can only clear bits,
never set them. For NOR memories a page erase or, if not available, a chip
erase needs to be issued before writing arbitrary data. Usersig is
generally unaffected by a chip erase. When a memory looks like a NOR
memory, either page erase is deployed (eg, with parts that have PDI/UPDI
memory, either page erase is deployed (e.g., with parts that have PDI/UPDI
interfaces), or if that is not available, both EEPROM and flash caches are
fully read in, a chip erase command is issued and both EEPROM and flash
are written back to the device. Hence, it can take minutes to ensure that
@@ -2271,7 +2284,7 @@ programming with the chosen programmer: here be dragons.
@item include [@var{opts}] @var{file}
Include contents of the named file @var{file} as if it was typed. This is
useful for batch scripts, eg, recurring initialisation code for fuses. The
useful for batch scripts, e.g., recurring initialisation code for fuses. The
include option @code{-e} prints the lines of the file as comments before
processing them; on a non-zero verbosity level the line numbers are
printed, too.
@@ -2307,7 +2320,7 @@ Leave terminal mode and thus AVRDUDE.
Can be used as an alias for @code{quit}.
@item !@var{line}
Run the shell @var{line} in a subshell, eg, @code{!ls *.hex}. Subshell
Run the shell @var{line} in a subshell, e.g., @code{!ls *.hex}. Subshell
commands take the rest of the line as their command. For security reasons,
they must be enabled explictly by putting @code{allow_subshells = yes;}
into your @code{$@{HOME@}/.config/avrdude/avrdude.rc} or
@@ -2738,7 +2751,7 @@ option.
@item allow_subshells = @var{no};
Whether or not AVRDUDE's interactive terminal is allowed to use subshell
@code{!} commands. This defaults to no for security reasons, eg, in the
@code{!} commands. This defaults to no for security reasons, e.g., in the
rare case @code{avrdude -t} is set up with attached hardware to provide a
web service, remote ssh or a login on a PC instead of a shell, say, for
demo or training purposes. In almost all other cases this can be

44
src/jtag3.c
View File

@@ -1474,10 +1474,10 @@ static void jtag3_disable(const PROGRAMMER *pgm) {
}
static void jtag3_enable(PROGRAMMER *pgm, const AVRPART *p) {
// Page erase only useful for classic parts with usersig mem or AVR8X/XMEGAs
if(!(p->prog_modes & (PM_PDI | PM_UPDI)))
pgm->page_erase = NULL;
return;
if(!avr_locate_mem(p, "usersig"))
pgm->page_erase = NULL;
}
static int jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
@@ -1833,8 +1833,8 @@ static int jtag3_page_erase(const PROGRAMMER *pgm, const AVRPART *p, const AVRME
pmsg_notice2("jtag3_page_erase(.., %s, 0x%x)\n", m->desc, addr);
if (!(p->prog_modes & (PM_PDI | PM_UPDI))) {
pmsg_error("page erase not supported\n");
if(!(p->prog_modes & (PM_PDI | PM_UPDI)) && !str_eq(m->desc, "usersig")) {
pmsg_error("page erase only available for AVR8X/XMEGAs or classic-part usersig mem\n");
return -1;
}
@@ -2689,29 +2689,21 @@ static unsigned char jtag3_memtype(const PROGRAMMER *pgm, const AVRPART *p, unsi
static unsigned int jtag3_memaddr(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *m, unsigned long addr) {
if (p->prog_modes & PM_PDI) {
if (addr >= PDATA(pgm)->boot_start)
/*
* all memories but "flash" are smaller than boot_start anyway, so
* no need for an extra check we are operating on "flash"
*/
return addr - PDATA(pgm)->boot_start;
else
/* normal flash, or anything else */
return addr;
/*
* All memories but "flash" are smaller than boot_start anyway, so
* no need for an extra check we are operating on "flash"
*/
if(addr >= PDATA(pgm)->boot_start)
addr -= PDATA(pgm)->boot_start;
} else if(p->prog_modes & PM_UPDI) { // Modern AVR8X part
if(!str_eq(m->desc, "flash"))
if(m->size >= 1)
addr += m->offset;
} else { // Classic part
if(str_eq(m->desc, "usersig"))
addr += m->offset;
}
// Non-Xmega device
if (p->prog_modes & PM_UPDI) {
if (strcmp(m->desc, "flash") == 0) {
return addr;
}
else if (m->size == 1) {
addr = m->offset;
}
else if (m->size > 1) {
addr += m->offset;
}
}
return addr;
}

10
src/jtagmkII.c
View File

@@ -1372,9 +1372,11 @@ static void jtagmkII_disable(const PROGRAMMER *pgm) {
}
static void jtagmkII_enable(PROGRAMMER *pgm, const AVRPART *p) {
// Unset page_erase when part or programmer not capable of it
// Page erase only useful for classic parts with usersig mem or AVR8X/XMEGAs
if(!(p->prog_modes & (PM_PDI | PM_UPDI)))
pgm->page_erase = NULL;
if(!avr_locate_mem(p, "usersig"))
pgm->page_erase = NULL;
if(pgm->flag & PGM_FL_IS_DW)
pgm->page_erase = NULL;
@@ -1835,8 +1837,8 @@ static int jtagmkII_page_erase(const PROGRAMMER *pgm, const AVRPART *p, const AV
pmsg_notice2("jtagmkII_page_erase(.., %s, 0x%x)\n", m->desc, addr);
if (!(p->prog_modes & (PM_PDI | PM_UPDI))) {
pmsg_error("not an Xmega nor a UPDI device\n");
if (!(p->prog_modes & (PM_PDI | PM_UPDI)) && !str_eq(m->desc, "usersig")) {
pmsg_error("page erase only available for AVR8X/XMEGAs or classic-part usersig mem\n");
return -1;
}
if ((pgm->flag & PGM_FL_IS_DW)) {