mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
fix hosted build
This commit is contained in:
parent
d4a713b1ac
commit
23c2b77ace
2 changed files with 5 additions and 4 deletions
|
|
@ -55,6 +55,7 @@ cramium-fpga = ["utralib/cramium-fpga", "rand_chacha"]
|
||||||
board-baosec = ["cramium-hal/kernel-baosec", "memmap-flash", "swap"]
|
board-baosec = ["cramium-hal/kernel-baosec", "memmap-flash", "swap"]
|
||||||
board-baosor = ["cramium-hal/kernel-baosor"]
|
board-baosor = ["cramium-hal/kernel-baosor"]
|
||||||
board-dabao = ["cramium-hal/kernel-dabao"]
|
board-dabao = ["cramium-hal/kernel-dabao"]
|
||||||
|
hosted-baosec = []
|
||||||
|
|
||||||
atsama5d27 = ["utralib/atsama5d27"]
|
atsama5d27 = ["utralib/atsama5d27"]
|
||||||
precursor = ["utralib/precursor"]
|
precursor = ["utralib/precursor"]
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,9 @@ use core::fmt;
|
||||||
use xous_kernel::{MemoryFlags, MemoryRange, PID, arch::*};
|
use xous_kernel::{MemoryFlags, MemoryRange, PID, arch::*};
|
||||||
|
|
||||||
pub use crate::arch::mem::MemoryMapping;
|
pub use crate::arch::mem::MemoryMapping;
|
||||||
use crate::arch::{
|
#[cfg(baremetal)]
|
||||||
mem::{MMUFlags, flush_mmu, pagetable_entry},
|
use crate::arch::mem::{MMUFlags, flush_mmu, pagetable_entry};
|
||||||
process::Process,
|
use crate::arch::process::Process;
|
||||||
};
|
|
||||||
#[cfg(feature = "swap")]
|
#[cfg(feature = "swap")]
|
||||||
use crate::swap::SwapAlloc;
|
use crate::swap::SwapAlloc;
|
||||||
|
|
||||||
|
|
@ -621,6 +620,7 @@ impl MemoryManager {
|
||||||
// just allocate the region as "swapped". No further checks is done on the validity of the requested
|
// just allocate the region as "swapped". No further checks is done on the validity of the requested
|
||||||
// range - if the range is out of bounds, it will be caught as a runtime error in the resolver
|
// range - if the range is out of bounds, it will be caught as a runtime error in the resolver
|
||||||
// that attempts to find the physical page that corresponds to a virtual mapping.
|
// that attempts to find the physical page that corresponds to a virtual mapping.
|
||||||
|
#[cfg(baremetal)]
|
||||||
if phys == 0
|
if phys == 0
|
||||||
&& (flags & MemoryFlags::VIRT == MemoryFlags::VIRT)
|
&& (flags & MemoryFlags::VIRT == MemoryFlags::VIRT)
|
||||||
&& ((virt_ptr as usize & MMAP_VIRT_BASE) == MMAP_VIRT_BASE)
|
&& ((virt_ptr as usize & MMAP_VIRT_BASE) == MMAP_VIRT_BASE)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue