From c0e66a632c56bb5536459cba2ef481b2c50684e7 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 25 Jun 2020 01:40:42 +0200 Subject: [PATCH] ps7_init: move from experiments to libboard_zynq --- experiments/src/main.rs | 3 +-- libboard_zynq/src/lib.rs | 1 + {experiments => libboard_zynq}/src/ps7_init/mod.rs | 2 +- {experiments => libboard_zynq}/src/ps7_init/zc706.rs | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {experiments => libboard_zynq}/src/ps7_init/mod.rs (99%) rename {experiments => libboard_zynq}/src/ps7_init/zc706.rs (100%) diff --git a/experiments/src/main.rs b/experiments/src/main.rs index fd98250..fa38ab7 100644 --- a/experiments/src/main.rs +++ b/experiments/src/main.rs @@ -15,6 +15,7 @@ use libboard_zynq::{ clocks::source::{ArmPll, ClockSource, IoPll}, clocks::Clocks, print, println, + ps7_init, sdio::sd_card::SdCard, smoltcp::{ self, @@ -34,8 +35,6 @@ use libsupport_zynq::{ }; use log::info; -mod ps7_init; - const HWADDR: [u8; 6] = [0, 0x23, 0xde, 0xea, 0xbe, 0xef]; #[no_mangle] diff --git a/libboard_zynq/src/lib.rs b/libboard_zynq/src/lib.rs index 5c043ab..ee194c3 100644 --- a/libboard_zynq/src/lib.rs +++ b/libboard_zynq/src/lib.rs @@ -21,3 +21,4 @@ pub mod time; pub mod timer; pub mod sdio; pub mod logger; +pub mod ps7_init; diff --git a/experiments/src/ps7_init/mod.rs b/libboard_zynq/src/ps7_init/mod.rs similarity index 99% rename from experiments/src/ps7_init/mod.rs rename to libboard_zynq/src/ps7_init/mod.rs index 51f38cb..1d5373b 100644 --- a/experiments/src/ps7_init/mod.rs +++ b/libboard_zynq/src/ps7_init/mod.rs @@ -1,6 +1,6 @@ #![cfg(feature = "target_zc706")] -use libboard_zynq::println; +use crate::println; mod zc706; // mod cora_z7_10; diff --git a/experiments/src/ps7_init/zc706.rs b/libboard_zynq/src/ps7_init/zc706.rs similarity index 100% rename from experiments/src/ps7_init/zc706.rs rename to libboard_zynq/src/ps7_init/zc706.rs