diff --git a/kernel/src/arch/mipsel/boot/entry.S b/kernel/src/arch/mipsel/boot/entry.S index 019006c..7be682d 100644 --- a/kernel/src/arch/mipsel/boot/entry.S +++ b/kernel/src/arch/mipsel/boot/entry.S @@ -22,7 +22,7 @@ _start: mtc0 t0, $12 # directly jump to main function - b rust_main + j rust_main nop .section .bss.stack diff --git a/kernel/src/arch/mipsel/boot/linker.ld b/kernel/src/arch/mipsel/boot/linker.ld index 0e4d0bb..420430d 100644 --- a/kernel/src/arch/mipsel/boot/linker.ld +++ b/kernel/src/arch/mipsel/boot/linker.ld @@ -4,7 +4,7 @@ OUTPUT_ARCH(riscv) ENTRY(_start) -BASE_ADDRESS = 0x80000000; +BASE_ADDRESS = 0x80100000; SECTIONS { diff --git a/kernel/src/arch/mipsel/consts.rs b/kernel/src/arch/mipsel/consts.rs index 1bc6aa5..a008f2e 100644 --- a/kernel/src/arch/mipsel/consts.rs +++ b/kernel/src/arch/mipsel/consts.rs @@ -3,7 +3,7 @@ pub use super::board::consts::*; -pub const KERNEL_OFFSET: usize = 0x80000000; +pub const KERNEL_OFFSET: usize = 0x80100000; pub const MEMORY_OFFSET: usize = 0x8000_0000; diff --git a/kernel/src/fs/mod.rs b/kernel/src/fs/mod.rs index 9414c47..dd5c6da 100644 --- a/kernel/src/fs/mod.rs +++ b/kernel/src/fs/mod.rs @@ -54,9 +54,9 @@ lazy_static! { fn _user_img_start(); fn _user_img_end(); } + println!("Sfs start {:x}, end {:x}", _user_img_start as usize, _user_img_end as usize); Arc::new(unsafe { device::MemBuf::new(_user_img_start, _user_img_end) }) }; - let sfs = SimpleFileSystem::open(device).expect("failed to open SFS"); sfs.root_inode() };