Merge branch 'main' into pddb

This commit is contained in:
bunnie 2025-11-08 09:03:19 +08:00 committed by GitHub
commit e4a4153ff9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -306,6 +306,13 @@ pub fn boot(iox: &Iox, mut oled: Option<Oled128x128>, se0_port: bao1x_api::IoxPo
}
});
// reset instead of boot
#[cfg(feature = "alt-boot1")]
{
let mut rcurst = CSR::new(utra::sysctrl::HW_SYSCTRL_BASE as *mut u32);
rcurst.wo(utra::sysctrl::SFR_RCURST0, 0x55AA);
}
// when we get to this point, there's only two options...
try_boot(true);
unreachable!("`or_die = true` means this should be unreachable");