From ca04a3ea8255531de2785aa11ea444767131aadb Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 11 May 2025 12:37:51 +0800 Subject: [PATCH] incorporate arch migrations into early-settings --- services/early_settings/Cargo.toml | 1 + services/early_settings/src/main.rs | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/early_settings/Cargo.toml b/services/early_settings/Cargo.toml index fafcfb25c..f4047ee36 100644 --- a/services/early_settings/Cargo.toml +++ b/services/early_settings/Cargo.toml @@ -18,6 +18,7 @@ xous-ipc = "0.10.4" xous-names = { package = "xous-api-names", version = "0.9.65" } susres = { package = "xous-api-susres", version = "0.9.63" } spinor = { path = "../../services/spinor" } +precursor-hal = { path = "../../libs/precursor-hal" } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/early_settings/src/main.rs b/services/early_settings/src/main.rs index b45897f7c..111d0a840 100644 --- a/services/early_settings/src/main.rs +++ b/services/early_settings/src/main.rs @@ -2,6 +2,7 @@ use std::ops::Range; use early_settings::{Opcode, SERVER_NAME_ES}; use num_traits::FromPrimitive; +use precursor_hal::board::*; use spinor::Spinor; use xous::{MemoryRange, msg_blocking_scalar_unpack}; @@ -50,9 +51,7 @@ impl State { return; } - self.spinor - .patch(settings, xous::EARLY_SETTINGS, &data, slot.offset) - .expect("couldn't patch slot data"); + self.spinor.patch(settings, EARLY_SETTINGS, &data, slot.offset).expect("couldn't patch slot data"); } fn get(&self, slot: &Slot) -> u32 { @@ -111,7 +110,7 @@ fn page_provider() -> Option { #[cfg(target_os = "xous")] return Some( 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, 4096, xous::MemoryFlags::R,