arduino/optiboot
1
0
Fork 0
mirror of https://github.com/Optiboot/optiboot.git synced 2025-07-04 16:42:25 +03:00
Code Activity

oops. Last commit had a bug or two, and while every .hex file tha built matched the prvious verion, some of them didn't build at all.

Browse Source
This commit is contained in:
WestfW
2019-08-27 23:39:25 -07:00
parent ba257540f8
commit abbe828f81
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
optiboot/bootloaders/optiboot/optiboot.c
View File

@ -829,7 +829,7 @@ int main(void) {
#if FLASHEND > (128*1024) #if FLASHEND > (128*1024)
#error "Can't use VIRTUAL_BOOT_PARTITION with more than 128k of Flash" #error "Can't use VIRTUAL_BOOT_PARTITION with more than 128k of Flash"
#endif #endif
if (address.word == RSTVECT_ADDRESS) { if (address.word == RSTVEC_ADDRESS) {
// This is the reset vector page. We need to live-patch the // This is the reset vector page. We need to live-patch the
// code so the bootloader runs first. // code so the bootloader runs first.
// //
@ -846,20 +846,21 @@ int main(void) {
// the save_vector is not necessarilly on the same flash page as the reset // the save_vector is not necessarilly on the same flash page as the reset
// vector. If it isn't, we've waiting to actually write it. // vector. If it isn't, we've waiting to actually write it.
} else if (address.word == SAVVEC_ADDRESS) { } else if (address.word == SAVVEC_ADDRESS) {
saveVect0_sav = saveVect1_sav = buff.bptr[saveVect-SAVVEC_ADDRESS]; saveVect0_sav = buff.bptr[saveVect0 - SAVVEC_ADDRESS];
saveVect1_sav = buff.bptr[saveVect1 - SAVVEC_ADDRESS];
// Move RESET jmp target to 'save' vector // Move RESET jmp target to 'save' vector
buff.bptr[saveVect0 - SAVVEC_ADDRESS] = rstVect0_sav; buff.bptr[saveVect0 - SAVVEC_ADDRESS] = rstVect0_sav;
buff.bptr[saveVect1 - SAVVEC_ADDRESS] = rstVect1_sav; buff.bptr[saveVect1 - SAVVEC_ADDRESS] = rstVect1_sav;
} }
#else #else
saveVect0_sav = buff.bptr[saveVect0]; saveVect0_sav = buff.bptr[saveVect0];
saveVect1_sav = buff.bptr[saveVect1]; saveVect1_sav = buff.bptr[saveVect1];
// Move RESET jmp target to 'save' vector // Move RESET jmp target to 'save' vector
buff.bptr[saveVect0] = rstVect0_sav; buff.bptr[saveVect0] = rstVect0_sav;
buff.bptr[saveVect1] = rstVect1_sav; buff.bptr[saveVect1] = rstVect1_sav;
} }
#endif #endif
#else #else