mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
gate loader features behind flag
This commit is contained in:
parent
32857a70b0
commit
903b2219db
1 changed files with 13 additions and 4 deletions
|
|
@ -22,6 +22,8 @@ mod murmur3;
|
||||||
mod phase1;
|
mod phase1;
|
||||||
mod phase2;
|
mod phase2;
|
||||||
mod platform;
|
mod platform;
|
||||||
|
#[cfg(feature = "swap")]
|
||||||
|
mod swap;
|
||||||
|
|
||||||
use core::{mem, ptr, slice};
|
use core::{mem, ptr, slice};
|
||||||
|
|
||||||
|
|
@ -31,6 +33,8 @@ use consts::*;
|
||||||
use minielf::*;
|
use minielf::*;
|
||||||
use phase1::{phase_1, InitialProcess};
|
use phase1::{phase_1, InitialProcess};
|
||||||
use phase2::{phase_2, ProgramDescription};
|
use phase2::{phase_2, ProgramDescription};
|
||||||
|
#[cfg(feature = "swap")]
|
||||||
|
use platform::SwapHal;
|
||||||
|
|
||||||
pub type XousPid = u8;
|
pub type XousPid = u8;
|
||||||
pub const PAGE_SIZE: usize = 4096;
|
pub const PAGE_SIZE: usize = 4096;
|
||||||
|
|
@ -122,6 +126,9 @@ fn boot_sequence(args: KernelArguments, _signature: u32, fs_prehash: [u8; 64]) -
|
||||||
let mut cfg = BootConfig { base_addr: args.base as *const usize, args, ..Default::default() };
|
let mut cfg = BootConfig { base_addr: args.base as *const usize, args, ..Default::default() };
|
||||||
read_initial_config(&mut cfg);
|
read_initial_config(&mut cfg);
|
||||||
|
|
||||||
|
#[cfg(feature = "swap")]
|
||||||
|
let mut swap = SwapHal::new(&cfg);
|
||||||
|
|
||||||
// check to see if we are recovering from a clean suspend or not
|
// check to see if we are recovering from a clean suspend or not
|
||||||
#[cfg(feature = "resume")]
|
#[cfg(feature = "resume")]
|
||||||
let (clean, was_forced_suspend, susres_pid) = check_resume(&mut cfg);
|
let (clean, was_forced_suspend, susres_pid) = check_resume(&mut cfg);
|
||||||
|
|
@ -354,14 +361,16 @@ pub fn read_initial_config(cfg: &mut BootConfig) {
|
||||||
assert!(!kernel_seen, "kernel appears twice");
|
assert!(!kernel_seen, "kernel appears twice");
|
||||||
assert!(tag.size as usize == mem::size_of::<ProgramDescription>(), "invalid XKrn size");
|
assert!(tag.size as usize == mem::size_of::<ProgramDescription>(), "invalid XKrn size");
|
||||||
kernel_seen = true;
|
kernel_seen = true;
|
||||||
} else if tag.name == u32::from_le_bytes(*b"IniE")
|
} else if tag.name == u32::from_le_bytes(*b"IniE") || tag.name == u32::from_le_bytes(*b"IniF") {
|
||||||
|| tag.name == u32::from_le_bytes(*b"IniF")
|
|
||||||
|| tag.name == u32::from_le_bytes(*b"IniS")
|
|
||||||
{
|
|
||||||
assert!(tag.size >= 4, "invalid Init size");
|
assert!(tag.size >= 4, "invalid Init size");
|
||||||
init_seen = true;
|
init_seen = true;
|
||||||
cfg.init_process_count += 1;
|
cfg.init_process_count += 1;
|
||||||
}
|
}
|
||||||
|
#[cfg(feature = "swap")]
|
||||||
|
if tag.name == u32::from_le_bytes(*b"Swap") {
|
||||||
|
// safety: the image creator guarantees this data is aligned and initialized properly
|
||||||
|
cfg.swap = Some(unsafe { &*(tag.data.as_ptr() as *const crate::swap::SwapDescriptor) });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
assert!(kernel_seen, "no kernel definition");
|
assert!(kernel_seen, "no kernel definition");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue