avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make urclock.c iron out a bug in some bootloaders

This commit is contained in:
Stefan Rueger 2022-11-09 21:00:16 +00:00
parent d5d0b940cc
commit afa408e2c6
No known key found for this signature in database
GPG Key ID: B0B4F1FD86B1EC55
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/urclock.c
View File

@ -1397,6 +1397,7 @@ static int urclock_load_baddr(const PROGRAMMER *pgm, const AVRPART *p, char memc
// For classic parts (think optiboot, avrisp) use word addr, otherwise byte addr (optiboot_x etc) // For classic parts (think optiboot, avrisp) use word addr, otherwise byte addr (optiboot_x etc)
int classic = !(p->prog_modes & (PM_UPDI | PM_PDI | PM_aWire)); int classic = !(p->prog_modes & (PM_UPDI | PM_PDI | PM_aWire));
unsigned int addr = classic? baddr/2: baddr; unsigned int addr = classic? baddr/2: baddr;
int effpgsiz = classic? ur.uP.pagesize/2: ur.uP.pagesize;
// STK500 protocol: support flash > 64k words/bytes with the correct extended-address byte // STK500 protocol: support flash > 64k words/bytes with the correct extended-address byte
if(memchr == 'F' && ur.uP.flashsize > (classic? 128*1024: 64*1024)) { if(memchr == 'F' && ur.uP.flashsize > (classic? 128*1024: 64*1024)) {
@ -1410,6 +1411,12 @@ static int urclock_load_baddr(const PROGRAMMER *pgm, const AVRPART *p, char memc
urclock_cmd(pgm, buf, buf); urclock_cmd(pgm, buf, buf);
ur.ext_addr_byte = ext_byte; ur.ext_addr_byte = ext_byte;
} }
/*
* Ensure next paged r/w will reload ext addr if page is just below a 64k boundary
* to iron out a bug in some bootloaders
*/
if((addr & 0xffff0000) != ((addr+effpgsiz) & 0xffff0000))
ur.ext_addr_byte = 0xff;
} }
buf[0] = Cmnd_STK_LOAD_ADDRESS; buf[0] = Cmnd_STK_LOAD_ADDRESS;