configure xous-swapper to point to board files

This commit is contained in:
bunnie 2024-10-02 01:45:47 +08:00
parent 972a314869
commit 84f88e9e65
3 changed files with 7 additions and 6 deletions

View file

@ -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"]

View file

@ -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,
)
};

View file

@ -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,