Skip to content

Commit bcce8a3

Browse files
committed
config: use MEMORY_END from mod boards #136
1 parent 2ce5e52 commit bcce8a3

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

os/src/boards/qemu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pub const CLOCK_FREQ: usize = 12500000;
2-
//pub const MEMORY_END: usize = 0x801000000;
2+
pub const MEMORY_END: usize = 0x8800_0000;
33

44
pub const MMIO: &[(usize, usize)] = &[
55
(0x0010_0000, 0x00_2000), // VIRT_TEST/RTC in virt machine

os/src/config.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
pub const USER_STACK_SIZE: usize = 4096 * 2;
44
pub const KERNEL_STACK_SIZE: usize = 4096 * 2;
55
pub const KERNEL_HEAP_SIZE: usize = 0x20_0000;
6-
pub const MEMORY_END: usize = 0x80800000;
76
pub const PAGE_SIZE: usize = 0x1000;
87
pub const PAGE_SIZE_BITS: usize = 0xc;
98

109
pub const TRAMPOLINE: usize = usize::MAX - PAGE_SIZE + 1;
1110
pub const TRAP_CONTEXT_BASE: usize = TRAMPOLINE - PAGE_SIZE;
1211

13-
pub use crate::board::{CLOCK_FREQ, MMIO};
12+
pub use crate::board::{CLOCK_FREQ, MEMORY_END, MMIO};

0 commit comments

Comments
 (0)