diff --git a/services/xous-swapper/Cargo.toml b/services/xous-swapper/Cargo.toml index 9614ce4b3..3357ed91b 100644 --- a/services/xous-swapper/Cargo.toml +++ b/services/xous-swapper/Cargo.toml @@ -29,8 +29,11 @@ utralib = { version = "0.1.25", optional = true, default-features = false } [features] cramium-soc = ["utralib/cramium-soc", "cramium-hal", "loader/cramium-soc"] -spi-alt-channel = [] # needs to match loader setting! cramium-fpga = ["utralib/cramium-fpga"] +board-baosec = ["cramium-hal/board-baosec"] +board-baosor = ["cramium-hal/board-baosor"] +board-dabao = ["cramium-hal/board-dabao"] + precursor = ["utralib/precursor"] hosted = ["utralib/hosted"] renode = ["utralib/renode"] diff --git a/services/xous-swapper/src/debug.rs b/services/xous-swapper/src/debug.rs index a1c669772..e44834b01 100644 --- a/services/xous-swapper/src/debug.rs +++ b/services/xous-swapper/src/debug.rs @@ -22,7 +22,7 @@ impl DebugUart { let mut uart = unsafe { udma::Uart::get_handle( loader::swap::SWAP_APP_UART_VADDR as usize, - loader::APP_UART_IFRAM_ADDR as usize, + cramium_hal::board::APP_UART_IFRAM_ADDR as usize, loader::swap::SWAP_APP_UART_IFRAM_VADDR as usize, ) }; diff --git a/services/xous-swapper/src/platform/cramium/hw.rs b/services/xous-swapper/src/platform/cramium/hw.rs index 08f091d7e..01ed61c56 100644 --- a/services/xous-swapper/src/platform/cramium/hw.rs +++ b/services/xous-swapper/src/platform/cramium/hw.rs @@ -2,9 +2,10 @@ use core::fmt::Write; use core::mem::size_of; use aes_gcm_siv::{AeadInPlace, Aes256GcmSiv, Error, KeyInit, Nonce, Tag}; +use cramium_hal::board::SPIM_RAM_IFRAM_ADDR; use cramium_hal::ifram::IframRange; use cramium_hal::udma::*; -use loader::swap::{SPIM_RAM_IFRAM_ADDR, SWAP_HAL_VADDR, SwapSpec}; +use loader::swap::{SWAP_HAL_VADDR, SwapSpec}; use crate::debug::*; @@ -26,9 +27,6 @@ impl SwapHal { // because once we remove the MAC area, we need even less storage, but it's a small error. let ram_size_actual = loader::swap::derive_usable_swap(spec.swap_len as usize); - #[cfg(feature = "spi-alt-channel")] - let channel = SpimChannel::Channel0; - #[cfg(not(feature = "spi-alt-channel"))] let channel = SpimChannel::Channel1; Self { swap_mac_start: ram_size_actual,