mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
configure xous-log to point to board files
This commit is contained in:
parent
d3691a556c
commit
972a314869
3 changed files with 6 additions and 4 deletions
|
|
@ -41,6 +41,10 @@ cramium-hal = { path = "../../libs/cramium-hal", optional = true, default-featur
|
||||||
[features]
|
[features]
|
||||||
cramium-soc = ["utralib/cramium-soc", "cramium-hal"]
|
cramium-soc = ["utralib/cramium-soc", "cramium-hal"]
|
||||||
cramium-fpga = ["utralib/cramium-fpga"]
|
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"]
|
precursor = ["utralib/precursor"]
|
||||||
hosted = ["utralib/hosted"]
|
hosted = ["utralib/hosted"]
|
||||||
renode = ["utralib/renode"]
|
renode = ["utralib/renode"]
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ impl Uart {
|
||||||
let mut uart = unsafe {
|
let mut uart = unsafe {
|
||||||
udma::Uart::get_handle(
|
udma::Uart::get_handle(
|
||||||
crate::platform::debug::DEFAULT_UART_ADDR as usize,
|
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,
|
crate::implementation::UART_DMA_TX_BUF_VIRT as usize,
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
use core::fmt::{Error, Write};
|
use core::fmt::{Error, Write};
|
||||||
use std::pin::Pin;
|
use std::pin::Pin;
|
||||||
|
|
||||||
|
use cramium_hal::board::UART_DMA_TX_BUF_PHYS;
|
||||||
use cramium_hal::udma;
|
use cramium_hal::udma;
|
||||||
use utralib::generated::*;
|
use utralib::generated::*;
|
||||||
|
|
||||||
|
|
@ -15,9 +16,6 @@ pub static mut UART_IRQ: Option<Pin<Box<cramium_hal::udma::UartIrq>>> = None;
|
||||||
#[cfg(feature = "cramium-soc")]
|
#[cfg(feature = "cramium-soc")]
|
||||||
pub static mut KBD_CONN: u32 = 0;
|
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 {
|
pub fn init() -> Output {
|
||||||
#[cfg(feature = "cramium-fpga")]
|
#[cfg(feature = "cramium-fpga")]
|
||||||
let uart = xous::syscall::map_memory(
|
let uart = xous::syscall::map_memory(
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue