mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
make it so that bootwait option is skipped if warm boot
this prevents warm boot hold-up in case of latent key press during wakeup option: for warm boot it's assumed that when the user presses a key the intention is to wake up and go to normal operation, not wake up and wait for an update.
This commit is contained in:
parent
6eecc52961
commit
b1870e51ea
1 changed files with 4 additions and 2 deletions
|
|
@ -18,8 +18,8 @@ use core::{
|
||||||
};
|
};
|
||||||
|
|
||||||
use bao1x_api::{BoardTypeCoding, BootWaitCoding, bollard};
|
use bao1x_api::{BoardTypeCoding, BootWaitCoding, bollard};
|
||||||
use bao1x_hal::hardening::*;
|
|
||||||
use bao1x_hal::{board::KeyPress, iox::Iox, usb::driver::UsbDeviceState};
|
use bao1x_hal::{board::KeyPress, iox::Iox, usb::driver::UsbDeviceState};
|
||||||
|
use bao1x_hal::{buram::BackupManager, hardening::*};
|
||||||
use bao1x_hal::{sh1107::Oled128x128, udma::GlobalConfig};
|
use bao1x_hal::{sh1107::Oled128x128, udma::GlobalConfig};
|
||||||
use critical_section::Mutex;
|
use critical_section::Mutex;
|
||||||
use platform::*;
|
use platform::*;
|
||||||
|
|
@ -175,7 +175,9 @@ pub unsafe extern "C" fn rust_entry() -> ! {
|
||||||
|
|
||||||
// Below is our first divergence out of boot1, and thus, all security checks must happen above
|
// Below is our first divergence out of boot1, and thus, all security checks must happen above
|
||||||
// this line!
|
// this line!
|
||||||
if boot_wait == BootWaitCoding::Disable && current_key.is_none() {
|
// If warm boot, always go straight to booting - don't override with key press.
|
||||||
|
let bu = BackupManager::new();
|
||||||
|
if bu.get_flags().warm_boot() || (boot_wait == BootWaitCoding::Disable && current_key.is_none()) {
|
||||||
// diverges if there is code to run
|
// diverges if there is code to run
|
||||||
try_boot(false, &mut csprng);
|
try_boot(false, &mut csprng);
|
||||||
// or_die == false means the rest of this gets run if there is no valid image
|
// or_die == false means the rest of this gets run if there is no valid image
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue