diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 89019652a..a38fc291e 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -94,7 +94,6 @@ bao1x = [ "debug-print", "bao1x-hal", "rand_chacha", - # "boot-delay", ] board-baosec = [ "bao1x-hal/loader-baosec", diff --git a/loader/src/main.rs b/loader/src/main.rs index ba81fc677..7ba80258c 100644 --- a/loader/src/main.rs +++ b/loader/src/main.rs @@ -264,6 +264,7 @@ pub unsafe extern "C" fn rust_entry(signed_buffer: *const usize, signature: u32) FunctionCode::Developer as u32, ], false, + None, ) { Ok(k) => println!("*** Kernel signature check by key @ {} OK ***", k), Err(e) => { @@ -610,7 +611,7 @@ pub fn read_initial_config(cfg: &mut BootConfig) { #[cfg(feature = "swap")] pub fn read_swap_config(cfg: &mut BootConfig) { // Read in the swap arguments: should be located at beginning of the encrypted image in swap. - let page0 = cfg.swap_hal.as_mut().unwrap().decrypt_src_page_at(0x0); + let page0 = cfg.swap_hal.as_mut().unwrap().decrypt_src_page_at(0x0).unwrap(); let swap_args = KernelArguments::new(page0.as_ptr() as *const usize); for tag in swap_args.iter() { if tag.name == u32::from_le_bytes(*b"IniS") { diff --git a/loader/src/phase1.rs b/loader/src/phase1.rs index 3e8f241cc..d6931dbc4 100644 --- a/loader/src/phase1.rs +++ b/loader/src/phase1.rs @@ -679,7 +679,8 @@ fn copy_processes(cfg: &mut BootConfig) { cfg.swap_hal .as_mut() .expect("swap HAL uninit") - .decrypt_src_page_at(src_swap_img_page); + .decrypt_src_page_at(src_swap_img_page) + .unwrap(); } let decrypt_avail = remaining_in_page(src_swap_img_addr); let dst_page_avail = remaining_in_page(dst_page_vaddr);