max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Ulf Lilleengen 2022-02-09 12:46:46 +01:00
parent ed2a87a262
commit e990021b9a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
embassy-boot/nrf/src/lib.rs
View File

@ -100,6 +100,13 @@ impl BootLoader {
trace!("msp = {=u32:x}, rv = {=u32:x}", msp, rv); trace!("msp = {=u32:x}, rv = {=u32:x}", msp, rv);
// These instructions perform the following operations:
//
// * Modify control register to use MSP as stack pointer (clear spsel bit)
// * Synchronize instruction barrier
// * Initialize stack pointer (0x1000)
// * Set link register to not return (0xFF)
// * Jump to softdevice reset vector
core::arch::asm!( core::arch::asm!(
"mrs {tmp}, CONTROL", "mrs {tmp}, CONTROL",
"bics {tmp}, {spsel}", "bics {tmp}, {spsel}",

5
embassy-boot/nrf/src/main.rs
View File

@ -12,6 +12,9 @@ use embassy_nrf::nvmc::Nvmc;
#[entry] #[entry]
fn main() -> ! { fn main() -> ! {
let p = embassy_nrf::init(Default::default()); let p = embassy_nrf::init(Default::default());
// Uncomment this if you are debugging the bootloader with debugger/RTT attached,
// as it prevents a hard fault when accessing flash 'too early' after boot.
/* /*
for i in 0..10000000 { for i in 0..10000000 {
cortex_m::asm::nop(); cortex_m::asm::nop();
@ -40,7 +43,7 @@ unsafe fn DefaultHandler(_: i16) -> ! {
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
unsafe { unsafe {
core::arch::asm!("udf #0"); cortex_m::asm::udf();
core::hint::unreachable_unchecked(); core::hint::unreachable_unchecked();
} }
} }