Skip to content

Commit

Permalink
[bootloader] Fix booting on newer toolchain versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Yaya-Cout committed Apr 4, 2024
1 parent 5101436 commit 5e83c03
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions bootloader/boot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ void Boot::setMode(BootMode mode) {

void Boot::busError() {
Ion::Device::Flash::ClearInternalFlashErrors();
asm("mov r12, lr");
if (config()->isBooting()) { // Bus error is normal if we are booting, it's triggered when we lock OPTCR
asm("mov lr, r12");
asm("bx lr");
return;
}
Bootloader::Recovery::crash_handler("BusFault");
}
Expand Down

0 comments on commit 5e83c03

Please sign in to comment.