M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

update zc706 dependencies

Browse Source
This commit is contained in:
Astro 2020-05-01 02:18:36 +02:00
parent 48025339b3
commit 92ae487143
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/Cargo.lock generated
View File

@ -153,7 +153,7 @@ dependencies = [
[[package]] [[package]]
name = "libasync" name = "libasync"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#008a9954292980b34fc20cc519a19e92b4ac077d" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#d86f69a2539a9b76575caee0f665829c488ea962"
dependencies = [ dependencies = [
"embedded-hal", "embedded-hal",
"libcortex_a9", "libcortex_a9",
@ -165,12 +165,13 @@ dependencies = [
[[package]] [[package]]
name = "libboard_zynq" name = "libboard_zynq"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#008a9954292980b34fc20cc519a19e92b4ac077d" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#d86f69a2539a9b76575caee0f665829c488ea962"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"embedded-hal", "embedded-hal",
"libcortex_a9", "libcortex_a9",
"libregister", "libregister",
"log",
"nb", "nb",
"smoltcp", "smoltcp",
"void", "void",
@ -180,7 +181,7 @@ dependencies = [
[[package]] [[package]]
name = "libcortex_a9" name = "libcortex_a9"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#008a9954292980b34fc20cc519a19e92b4ac077d" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#d86f69a2539a9b76575caee0f665829c488ea962"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"libregister", "libregister",
@ -189,7 +190,7 @@ dependencies = [
[[package]] [[package]]
name = "libregister" name = "libregister"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#008a9954292980b34fc20cc519a19e92b4ac077d" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#d86f69a2539a9b76575caee0f665829c488ea962"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"vcell", "vcell",
@ -199,14 +200,13 @@ dependencies = [
[[package]] [[package]]
name = "libsupport_zynq" name = "libsupport_zynq"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#008a9954292980b34fc20cc519a19e92b4ac077d" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#d86f69a2539a9b76575caee0f665829c488ea962"
dependencies = [ dependencies = [
"compiler_builtins", "compiler_builtins",
"libboard_zynq", "libboard_zynq",
"libcortex_a9", "libcortex_a9",
"libregister", "libregister",
"linked_list_allocator", "linked_list_allocator",
"log",
"r0", "r0",
] ]

2
firmware/cargosha256.nix
View File

@ -1 +1 @@
"1mfprkcq4cr4jiihy1qn8q8qymxwhafh90vyr3i4brj4aq5kksn1" "199qfs7fbbj8kxkyb0dcns6hdq9hvlppk7l3pnz204j9zkd7dkcp"

4
firmware/runtime/src/main.rs
View File

@ -8,8 +8,8 @@ extern crate log;
use core::{cmp, str}; use core::{cmp, str};
use log::info; use log::info;
use libboard_zynq::timer::GlobalTimer; use libboard_zynq::{logger, timer::GlobalTimer};
use libsupport_zynq::{logger, ram}; use libsupport_zynq::ram;
mod proto; mod proto;
mod comms; mod comms;

3
firmware/szl/src/main.rs
View File

@ -9,9 +9,10 @@ use cstr_core::CStr;
use libboard_zynq::{ use libboard_zynq::{
self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll}, self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll},
logger,
timer::GlobalTimer, timer::GlobalTimer,
}; };
use libsupport_zynq::{boot, logger}; use libsupport_zynq::boot;
extern "C" { extern "C" {