M-Labs
/
zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests 1 Releases Wiki Activity

libsupport_zynq: move mod logger to libboard_zynq

This commit is contained in:
Astro 2020-05-01 01:33:00 +02:00
parent 6ab4869d05
commit 619ebf147c
7 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -66,6 +66,7 @@ dependencies = [
"embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"libcortex_a9 0.0.0", "libcortex_a9 0.0.0",
"libregister 0.0.0", "libregister 0.0.0",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -98,7 +99,6 @@ dependencies = [
"libcortex_a9 0.0.0", "libcortex_a9 0.0.0",
"libregister 0.0.0", "libregister 0.0.0",
"linked_list_allocator 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "linked_list_allocator 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"r0 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "r0 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
experiments/src/main.rs
View File

@ -34,7 +34,7 @@ pub fn main_core0() {
// zynq::clocks::CpuClocks::enable_io(1_250_000_000); // zynq::clocks::CpuClocks::enable_io(1_250_000_000);
println!("\nzc706 main"); println!("\nzc706 main");
libsupport_zynq::logger::init().unwrap(); libboard_zynq::logger::init().unwrap();
log::set_max_level(log::LevelFilter::Trace); log::set_max_level(log::LevelFilter::Trace);
info!("Boot mode: {:?}", zynq::slcr::RegisterBlock::new().boot_mode.read().boot_mode_pins()); info!("Boot mode: {:?}", zynq::slcr::RegisterBlock::new().boot_mode.read().boot_mode_pins());

1
libboard_zynq/Cargo.toml
View File

@ -15,6 +15,7 @@ bit_field = "0.10"
embedded-hal = "0.2" embedded-hal = "0.2"
nb = "0.1" nb = "0.1"
void = { version = "1", default-features = false } void = { version = "1", default-features = false }
log = "0.4"
libregister = { path = "../libregister" } libregister = { path = "../libregister" }
libcortex_a9 = { path = "../libcortex_a9" } libcortex_a9 = { path = "../libcortex_a9" }

1
libboard_zynq/src/lib.rs
View File

@ -17,3 +17,4 @@ pub mod flash;
pub mod dmac; pub mod dmac;
pub mod time; pub mod time;
pub mod timer; pub mod timer;
pub mod logger;

2
libsupport_zynq/src/logger.rs → libboard_zynq/src/logger.rs
View File

@ -1,6 +1,6 @@
//! A logger for the `log` crate //! A logger for the `log` crate
use libboard_zynq::{println, stdio, timer::GlobalTimer}; use crate::{println, stdio, timer::GlobalTimer};
pub static LOGGER: Logger = Logger; pub static LOGGER: Logger = Logger;

1
libsupport_zynq/Cargo.toml
View File

@ -12,7 +12,6 @@ target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10"]
[dependencies] [dependencies]
r0 = "1" r0 = "1"
compiler_builtins = "0.1" compiler_builtins = "0.1"
log = "0.4"
linked_list_allocator = { version = "0.8", default-features = false } linked_list_allocator = { version = "0.8", default-features = false }
libregister = { path = "../libregister" } libregister = { path = "../libregister" }
libcortex_a9 = { path = "../libcortex_a9" } libcortex_a9 = { path = "../libcortex_a9" }

1
libsupport_zynq/src/lib.rs
View File

@ -10,5 +10,4 @@ pub extern crate compiler_builtins;
pub mod boot; pub mod boot;
mod abort; mod abort;
mod panic; mod panic;
pub mod logger;
pub mod ram; pub mod ram;