diff --git a/services/xous-log/Cargo.toml b/services/xous-log/Cargo.toml index 0236b683b..6de5fc259 100644 --- a/services/xous-log/Cargo.toml +++ b/services/xous-log/Cargo.toml @@ -41,6 +41,10 @@ cramium-hal = { path = "../../libs/cramium-hal", optional = true, default-featur [features] cramium-soc = ["utralib/cramium-soc", "cramium-hal"] 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-log/src/platform/cramium/debug.rs b/services/xous-log/src/platform/cramium/debug.rs index d3631e14a..a89b7c4a5 100644 --- a/services/xous-log/src/platform/cramium/debug.rs +++ b/services/xous-log/src/platform/cramium/debug.rs @@ -57,7 +57,7 @@ impl Uart { let mut uart = unsafe { udma::Uart::get_handle( crate::platform::debug::DEFAULT_UART_ADDR as usize, - crate::implementation::UART_DMA_TX_BUF_PHYS, + cramium_hal::board::UART_DMA_TX_BUF_PHYS, crate::implementation::UART_DMA_TX_BUF_VIRT as usize, ) }; diff --git a/services/xous-log/src/platform/cramium/implementation.rs b/services/xous-log/src/platform/cramium/implementation.rs index 0592be4c5..b1d689370 100644 --- a/services/xous-log/src/platform/cramium/implementation.rs +++ b/services/xous-log/src/platform/cramium/implementation.rs @@ -1,6 +1,7 @@ use core::fmt::{Error, Write}; use std::pin::Pin; +use cramium_hal::board::UART_DMA_TX_BUF_PHYS; use cramium_hal::udma; use utralib::generated::*; @@ -15,9 +16,6 @@ pub static mut UART_IRQ: Option>> = None; #[cfg(feature = "cramium-soc")] pub static mut KBD_CONN: u32 = 0; -#[cfg(feature = "cramium-soc")] -pub const UART_DMA_TX_BUF_PHYS: usize = utralib::HW_IFRAM0_MEM + utralib::HW_IFRAM0_MEM_LEN - 4096; - pub fn init() -> Output { #[cfg(feature = "cramium-fpga")] let uart = xous::syscall::map_memory(