mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
incorporate arch migrations into early-settings
This commit is contained in:
parent
ee6fb3ef4f
commit
ca04a3ea82
2 changed files with 4 additions and 4 deletions
|
|
@ -18,6 +18,7 @@ xous-ipc = "0.10.4"
|
||||||
xous-names = { package = "xous-api-names", version = "0.9.65" }
|
xous-names = { package = "xous-api-names", version = "0.9.65" }
|
||||||
susres = { package = "xous-api-susres", version = "0.9.63" }
|
susres = { package = "xous-api-susres", version = "0.9.63" }
|
||||||
spinor = { path = "../../services/spinor" }
|
spinor = { path = "../../services/spinor" }
|
||||||
|
precursor-hal = { path = "../../libs/precursor-hal" }
|
||||||
|
|
||||||
num-derive = { version = "0.4.2", default-features = false }
|
num-derive = { version = "0.4.2", default-features = false }
|
||||||
num-traits = { version = "0.2.14", default-features = false }
|
num-traits = { version = "0.2.14", default-features = false }
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ use std::ops::Range;
|
||||||
|
|
||||||
use early_settings::{Opcode, SERVER_NAME_ES};
|
use early_settings::{Opcode, SERVER_NAME_ES};
|
||||||
use num_traits::FromPrimitive;
|
use num_traits::FromPrimitive;
|
||||||
|
use precursor_hal::board::*;
|
||||||
use spinor::Spinor;
|
use spinor::Spinor;
|
||||||
use xous::{MemoryRange, msg_blocking_scalar_unpack};
|
use xous::{MemoryRange, msg_blocking_scalar_unpack};
|
||||||
|
|
||||||
|
|
@ -50,9 +51,7 @@ impl State {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
self.spinor
|
self.spinor.patch(settings, EARLY_SETTINGS, &data, slot.offset).expect("couldn't patch slot data");
|
||||||
.patch(settings, xous::EARLY_SETTINGS, &data, slot.offset)
|
|
||||||
.expect("couldn't patch slot data");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get(&self, slot: &Slot) -> u32 {
|
fn get(&self, slot: &Slot) -> u32 {
|
||||||
|
|
@ -111,7 +110,7 @@ fn page_provider() -> Option<xous::MemoryRange> {
|
||||||
#[cfg(target_os = "xous")]
|
#[cfg(target_os = "xous")]
|
||||||
return Some(
|
return Some(
|
||||||
xous::syscall::map_memory(
|
xous::syscall::map_memory(
|
||||||
xous::MemoryAddress::new((xous::EARLY_SETTINGS + xous::FLASH_PHYS_BASE) as usize),
|
xous::MemoryAddress::new((EARLY_SETTINGS + FLASH_PHYS_BASE) as usize),
|
||||||
None,
|
None,
|
||||||
4096,
|
4096,
|
||||||
xous::MemoryFlags::R,
|
xous::MemoryFlags::R,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue