From 2b543c18c5213571adf7ce1cdab410674423dd5f Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 30 Jan 2020 22:54:48 +0100 Subject: [PATCH] libboard_zc706: rename to libsupport_zynq Fixes Gitea issue #9 --- Cargo.lock | 28 +++++++++---------- Cargo.toml | 2 +- experiments/Cargo.toml | 6 ++-- experiments/src/main.rs | 2 +- .../Cargo.toml | 4 +-- .../src/abort.rs | 0 .../src/boot.rs | 0 .../src/lib.rs | 0 .../src/panic.rs | 0 .../src/ram.rs | 0 10 files changed, 21 insertions(+), 21 deletions(-) rename {libboard_zc706 => libsupport_zynq}/Cargo.toml (88%) rename {libboard_zc706 => libsupport_zynq}/src/abort.rs (100%) rename {libboard_zc706 => libsupport_zynq}/src/boot.rs (100%) rename {libboard_zc706 => libsupport_zynq}/src/lib.rs (100%) rename {libboard_zc706 => libsupport_zynq}/src/panic.rs (100%) rename {libboard_zc706 => libsupport_zynq}/src/ram.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 6c21925..4df19f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,23 +24,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "experiments" version = "0.0.0" dependencies = [ - "libboard_zc706 0.0.0", "libboard_zynq 0.0.0", "libcortex_a9 0.0.0", "libregister 0.0.0", - "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)", -] - -[[package]] -name = "libboard_zc706" -version = "0.0.0" -dependencies = [ - "compiler_builtins 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", - "libboard_zynq 0.0.0", - "libcortex_a9 0.0.0", - "libregister 0.0.0", - "linked_list_allocator 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libsupport_zynq 0.0.0", "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)", ] @@ -79,6 +66,19 @@ dependencies = [ "volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "libsupport_zynq" +version = "0.0.0" +dependencies = [ + "compiler_builtins 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", + "libboard_zynq 0.0.0", + "libcortex_a9 0.0.0", + "libregister 0.0.0", + "linked_list_allocator 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)", +] + [[package]] name = "linked_list_allocator" version = "0.6.4" diff --git a/Cargo.toml b/Cargo.toml index 68cd5aa..8e18349 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ "libregister", "libcortex_a9", - "libboard_zynq", "libboard_zc706", + "libboard_zynq", "libsupport_zynq", "experiments", ] diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml index 763dbfe..08056b1 100644 --- a/experiments/Cargo.toml +++ b/experiments/Cargo.toml @@ -6,15 +6,15 @@ authors = ["Astro "] edition = "2018" [features] -target_zc706 = ["libboard_zynq/target_zc706", "libboard_zc706/target_zc706"] -target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10", "libboard_zc706/target_cora_z7_10"] +target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706"] +target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10", "libsupport_zynq/target_cora_z7_10"] default = ["target_zc706"] [dependencies] libregister = { path = "../libregister" } libcortex_a9 = { path = "../libcortex_a9" } libboard_zynq = { path = "../libboard_zynq" } -libboard_zc706 = { path = "../libboard_zc706" } +libsupport_zynq = { path = "../libsupport_zynq" } [dependencies.smoltcp] git = "https://github.com/m-labs/smoltcp.git" diff --git a/experiments/src/main.rs b/experiments/src/main.rs index 18e0200..dcaecc1 100644 --- a/experiments/src/main.rs +++ b/experiments/src/main.rs @@ -4,7 +4,7 @@ use core::mem::transmute; use libcortex_a9::mutex::Mutex; use libboard_zynq::{print, println, self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll}}; -use libboard_zc706::{ +use libsupport_zynq::{ ram, alloc::{vec, vec::Vec}, boot, smoltcp::wire::{EthernetAddress, IpAddress, IpCidr}, diff --git a/libboard_zc706/Cargo.toml b/libsupport_zynq/Cargo.toml similarity index 88% rename from libboard_zc706/Cargo.toml rename to libsupport_zynq/Cargo.toml index 9de4a30..f44025b 100644 --- a/libboard_zc706/Cargo.toml +++ b/libsupport_zynq/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "libboard_zc706" -description = "Software support for running on devboards" +name = "libsupport_zynq" +description = "Software support for running in the Zynq PS" version = "0.0.0" authors = ["Astro "] edition = "2018" diff --git a/libboard_zc706/src/abort.rs b/libsupport_zynq/src/abort.rs similarity index 100% rename from libboard_zc706/src/abort.rs rename to libsupport_zynq/src/abort.rs diff --git a/libboard_zc706/src/boot.rs b/libsupport_zynq/src/boot.rs similarity index 100% rename from libboard_zc706/src/boot.rs rename to libsupport_zynq/src/boot.rs diff --git a/libboard_zc706/src/lib.rs b/libsupport_zynq/src/lib.rs similarity index 100% rename from libboard_zc706/src/lib.rs rename to libsupport_zynq/src/lib.rs diff --git a/libboard_zc706/src/panic.rs b/libsupport_zynq/src/panic.rs similarity index 100% rename from libboard_zc706/src/panic.rs rename to libsupport_zynq/src/panic.rs diff --git a/libboard_zc706/src/ram.rs b/libsupport_zynq/src/ram.rs similarity index 100% rename from libboard_zc706/src/ram.rs rename to libsupport_zynq/src/ram.rs