srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

satman: fix PMP and L2 flush

This commit is contained in:
Spaqin 2023-04-20 15:45:15 +08:00 committed by GitHub
parent aed47d79ff
commit 2f35869eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq/firmware/satman/main.rs
View File

@ -466,8 +466,7 @@ pub extern fn main() -> i32 {
unsafe { unsafe {
ALLOC.add_range(&mut _fheap, &mut _eheap); ALLOC.add_range(&mut _fheap, &mut _eheap);
// stack guard disabled, see https://github.com/m-labs/artiq/issues/2067 pmp::init_stack_guard(&_sstack_guard as *const u8 as usize);
// pmp::init_stack_guard(&_sstack_guard as *const u8 as usize);
} }
clock::init(); clock::init();

1
artiq/firmware/satman/satman.ld
View File

@ -12,6 +12,7 @@ SECTIONS
.text : .text :
{ {
*(.text .text.*) *(.text .text.*)
. = ALIGN(0x40000);
} > main_ram } > main_ram
.eh_frame : .eh_frame :