From 5e83c03f8d57ea463b1d73390800d25858ae30a6 Mon Sep 17 00:00:00 2001 From: Yaya-Cout Date: Thu, 4 Apr 2024 19:22:56 +0200 Subject: [PATCH] [bootloader] Fix booting on newer toolchain versions --- bootloader/boot.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bootloader/boot.cpp b/bootloader/boot.cpp index 6e4e2cb88..ca994c73e 100644 --- a/bootloader/boot.cpp +++ b/bootloader/boot.cpp @@ -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"); }