1
0
Fork 0

libboard_zc706: rename to libsupport_zynq

Fixes Gitea issue #9
This commit is contained in:
Astro 2020-01-30 22:54:48 +01:00
parent d3142ab6fa
commit 2b543c18c5
10 changed files with 21 additions and 21 deletions

28
Cargo.lock generated
View File

@ -24,23 +24,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "experiments" name = "experiments"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"libboard_zc706 0.0.0",
"libboard_zynq 0.0.0", "libboard_zynq 0.0.0",
"libcortex_a9 0.0.0", "libcortex_a9 0.0.0",
"libregister 0.0.0", "libregister 0.0.0",
"smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)", "libsupport_zynq 0.0.0",
]
[[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)",
"smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)", "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)", "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]] [[package]]
name = "linked_list_allocator" name = "linked_list_allocator"
version = "0.6.4" version = "0.6.4"

View File

@ -1,7 +1,7 @@
[workspace] [workspace]
members = [ members = [
"libregister", "libcortex_a9", "libregister", "libcortex_a9",
"libboard_zynq", "libboard_zc706", "libboard_zynq", "libsupport_zynq",
"experiments", "experiments",
] ]

View File

@ -6,15 +6,15 @@ authors = ["Astro <astro@spaceboyz.net>"]
edition = "2018" edition = "2018"
[features] [features]
target_zc706 = ["libboard_zynq/target_zc706", "libboard_zc706/target_zc706"] target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706"]
target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10", "libboard_zc706/target_cora_z7_10"] target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10", "libsupport_zynq/target_cora_z7_10"]
default = ["target_zc706"] default = ["target_zc706"]
[dependencies] [dependencies]
libregister = { path = "../libregister" } libregister = { path = "../libregister" }
libcortex_a9 = { path = "../libcortex_a9" } libcortex_a9 = { path = "../libcortex_a9" }
libboard_zynq = { path = "../libboard_zynq" } libboard_zynq = { path = "../libboard_zynq" }
libboard_zc706 = { path = "../libboard_zc706" } libsupport_zynq = { path = "../libsupport_zynq" }
[dependencies.smoltcp] [dependencies.smoltcp]
git = "https://github.com/m-labs/smoltcp.git" git = "https://github.com/m-labs/smoltcp.git"

View File

@ -4,7 +4,7 @@
use core::mem::transmute; use core::mem::transmute;
use libcortex_a9::mutex::Mutex; use libcortex_a9::mutex::Mutex;
use libboard_zynq::{print, println, self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll}}; 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}, ram, alloc::{vec, vec::Vec},
boot, boot,
smoltcp::wire::{EthernetAddress, IpAddress, IpCidr}, smoltcp::wire::{EthernetAddress, IpAddress, IpCidr},

View File

@ -1,6 +1,6 @@
[package] [package]
name = "libboard_zc706" name = "libsupport_zynq"
description = "Software support for running on devboards" description = "Software support for running in the Zynq PS"
version = "0.0.0" version = "0.0.0"
authors = ["Astro <astro@spaceboyz.net>"] authors = ["Astro <astro@spaceboyz.net>"]
edition = "2018" edition = "2018"