diff --git a/modules/ruxhal/src/arch/riscv/trap.rs b/modules/ruxhal/src/arch/riscv/trap.rs index ee61b32fc..6519757cb 100644 --- a/modules/ruxhal/src/arch/riscv/trap.rs +++ b/modules/ruxhal/src/arch/riscv/trap.rs @@ -43,18 +43,16 @@ fn riscv_trap_handler(tf: &mut TrapFrame, _from_user: bool) { ], ); tf.regs.a0 = ret as _; - }, + } #[cfg(feature = "paging")] - Trap::Exception(E::LoadPageFault) =>{ - let vaddr =riscv::register::stval::read(); - crate::trap::handle_page_fault(vaddr,crate::trap::PageFaultCause::READ); - - }, + Trap::Exception(E::LoadPageFault) => { + let vaddr = riscv::register::stval::read(); + crate::trap::handle_page_fault(vaddr, crate::trap::PageFaultCause::READ); + } #[cfg(feature = "paging")] - Trap::Exception(E::StorePageFault)=>{ - let vaddr =riscv::register::stval::read(); - crate::trap::handle_page_fault(vaddr,crate::trap::PageFaultCause::WRITE); - + Trap::Exception(E::StorePageFault) => { + let vaddr = riscv::register::stval::read(); + crate::trap::handle_page_fault(vaddr, crate::trap::PageFaultCause::WRITE); } _ => { diff --git a/scripts/prebuild/riscv64.mk b/scripts/prebuild/riscv64.mk index 3a12fbc08..5ffdaea62 100644 --- a/scripts/prebuild/riscv64.mk +++ b/scripts/prebuild/riscv64.mk @@ -1,7 +1,7 @@ # non-musl riscv64 still needs a usable bios # instead of the non-funtioning default one define run_prebuild - git submodule update --init --recursive --remote patches/opensbi +# git submodule update --init --recursive --remote patches/opensbi endef RISCV_BIOS := $(CURDIR)/patches/opensbi/build/platform/generic/firmware/fw_dynamic.bin