[bootloader] Boot other slot if a slot is invalid

This commit is contained in:
M4x1m3
2022-02-28 09:13:29 +01:00
parent 1c04949336
commit 227ca616ca
4 changed files with 38 additions and 13 deletions

View File

@@ -1,19 +1,20 @@
#include <ion.h>
#include <assert.h>
#include <ion/src/device/shared/drivers/board.h>
#include <bootloader/boot.h>
void ion_main(int argc, const char * const argv[]) {
__attribute__ ((noreturn)) void ion_main(int argc, const char * const argv[]) {
// Clear the screen
Ion::Display::pushRectUniform(KDRect(0,0,320,240), KDColorBlack);
// Initialize the backlight
Ion::Backlight::init();
// Set the mode to slot A if undefined
if (Bootloader::Boot::mode() == Bootloader::BootMode::Unknown)
Bootloader::Boot::setMode(Bootloader::BootMode::SlotA);
// Handle rebooting to bootloader
if (Bootloader::Boot::mode() == Bootloader::BootMode::SlotABootloader) {
Bootloader::Boot::setMode(Bootloader::BootMode::SlotA);
Bootloader::Boot::bootloader();
@@ -24,14 +25,17 @@ void ion_main(int argc, const char * const argv[]) {
uint64_t scan = Ion::Keyboard::scan();
// Reset+4 => Launch bootloader
if (scan == Ion::Keyboard::State(Ion::Keyboard::Key::Four)) {
Bootloader::Boot::bootloader();
// Reset+1 => Launch slot A
} else if (scan == Ion::Keyboard::State(Ion::Keyboard::Key::One)) {
Bootloader::Boot::setMode(Bootloader::BootMode::SlotA);
// Reset+2 => Launch slot B
} else if (scan == Ion::Keyboard::State(Ion::Keyboard::Key::Two)) {
Bootloader::Boot::setMode(Bootloader::BootMode::SlotB);
}
Ion::Device::Board::bootloaderMPU();
// Boot the firmware
Bootloader::Boot::boot();
}