andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-25 01:16:18 +04:00
Code Issues Projects Releases Wiki Activity

Add conditional compilation for mipsel, fix heap size for thinpad

Browse Source 
Signed-off-by: Harry Chen <i@harrychen.xyz>
This commit is contained in:
Harry Chen 2019-05-14 00:21:04 +08:00
parent 22d29a6257
commit fbca9a6e3a
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
build build
target target
/kernel/src/arch/x86_64/interrupt/vector.asm /kernel/src/arch/x86_64/interrupt/vector.asm
/kernel/src/arch/mipsel/boot/linker.ld
*.gen.s *.gen.s
*.dtb *.dtb

1
kernel/Makefile
View File

@ -348,6 +348,7 @@ else ifeq ($(arch), mipsel)
@for file in context entry trap ; do \ @for file in context entry trap ; do \
$(hostcc) -Dboard_$(board) -E src/arch/$(arch)/boot/$${file}.S -o src/arch/$(arch)/boot/$${file}.gen.s ; \ $(hostcc) -Dboard_$(board) -E src/arch/$(arch)/boot/$${file}.S -o src/arch/$(arch)/boot/$${file}.gen.s ; \
done done
$(hostcc) -Dboard_$(board) -E src/arch/$(arch)/boot/linker.ld.S -o src/arch/$(arch)/boot/linker.ld
@cargo xbuild $(build_args) @cargo xbuild $(build_args)
endif endif

2
kernel/src/arch/mipsel/board/thinpad/consts.rs
View File

@ -1,3 +1,3 @@
/// board specific constants /// board specific constants
pub const MEMORY_END: usize = 0x8080_0000; pub const MEMORY_END: usize = 0x8080_0000;
pub const KERNEL_HEAP_SIZE: usize = 0x0044_0000; pub const KERNEL_HEAP_SIZE: usize = 0x0038_0000;

4
kernel/src/arch/mipsel/boot/linker.ld → kernel/src/arch/mipsel/boot/linker.ld.S
View File

@ -4,7 +4,11 @@
OUTPUT_ARCH(riscv) OUTPUT_ARCH(riscv)
ENTRY(_start) ENTRY(_start)
#ifdef board_thinpad
BASE_ADDRESS = 0x80000000;
#else
BASE_ADDRESS = 0x80100000; BASE_ADDRESS = 0x80100000;
#endif
SECTIONS SECTIONS
{ {

13
kernel/src/arch/mipsel/consts.rs
View File

@ -2,11 +2,16 @@
/// ///
pub use super::board::consts::*; pub use super::board::consts::*;
pub const MEMORY_OFFSET: usize = 0x80000000; pub const MEMORY_OFFSET: usize = 0x8000_0000;
pub const KERNEL_OFFSET: usize = 0x80100000;
pub const PHYSICAL_MEMORY_OFFSET: usize = 0x80000000;
pub const USER_STACK_OFFSET: usize = 0x70000000 - USER_STACK_SIZE; #[cfg(feature = "board_thinpad")]
pub const KERNEL_OFFSET: usize = 0x8000_0000;
#[cfg(feature = "board_malta")]
pub const KERNEL_OFFSET: usize = 0x8010_0000;
pub const PHYSICAL_MEMORY_OFFSET: usize = 0x8000_0000;
pub const USER_STACK_OFFSET: usize = 0x7000_0000 - USER_STACK_SIZE;
pub const USER_STACK_SIZE: usize = 0x10000; pub const USER_STACK_SIZE: usize = 0x10000;
pub const MAX_DTB_SIZE: usize = 0x2000; pub const MAX_DTB_SIZE: usize = 0x2000;

2
kernel/src/arch/mipsel/driver/mod.rs
View File

@ -10,7 +10,7 @@ pub mod console;
/// Initialize common drivers /// Initialize common drivers
pub fn init() { pub fn init() {
board::init_driver(); board::init_driver();
// console::init(); console::init();
if let Some(con) = console::CONSOLE.lock().as_mut() { if let Some(con) = console::CONSOLE.lock().as_mut() {
con.clear(); con.clear();
} }