From 92ae487143e24e5fbafd2ee3689603174a8d92d6 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 1 May 2020 02:18:36 +0200
Subject: [PATCH] update zc706 dependencies

---
 firmware/Cargo.lock          | 12 ++++++------
 firmware/cargosha256.nix     |  2 +-
 firmware/runtime/src/main.rs |  4 ++--
 firmware/szl/src/main.rs     |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock
index 53e13092..df29e5c4 100644
--- a/firmware/Cargo.lock
+++ b/firmware/Cargo.lock
@@ -153,7 +153,7 @@ dependencies = [
 [[package]]
 name = "libasync"
 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 = [
  "embedded-hal",
  "libcortex_a9",
@@ -165,12 +165,13 @@ dependencies = [
 [[package]]
 name = "libboard_zynq"
 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 = [
  "bit_field",
  "embedded-hal",
  "libcortex_a9",
  "libregister",
+ "log",
  "nb",
  "smoltcp",
  "void",
@@ -180,7 +181,7 @@ dependencies = [
 [[package]]
 name = "libcortex_a9"
 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 = [
  "bit_field",
  "libregister",
@@ -189,7 +190,7 @@ dependencies = [
 [[package]]
 name = "libregister"
 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 = [
  "bit_field",
  "vcell",
@@ -199,14 +200,13 @@ dependencies = [
 [[package]]
 name = "libsupport_zynq"
 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 = [
  "compiler_builtins",
  "libboard_zynq",
  "libcortex_a9",
  "libregister",
  "linked_list_allocator",
- "log",
  "r0",
 ]
 
diff --git a/firmware/cargosha256.nix b/firmware/cargosha256.nix
index 6fdc18cd..a49548f9 100644
--- a/firmware/cargosha256.nix
+++ b/firmware/cargosha256.nix
@@ -1 +1 @@
-"1mfprkcq4cr4jiihy1qn8q8qymxwhafh90vyr3i4brj4aq5kksn1"
+"199qfs7fbbj8kxkyb0dcns6hdq9hvlppk7l3pnz204j9zkd7dkcp"
diff --git a/firmware/runtime/src/main.rs b/firmware/runtime/src/main.rs
index 85e338b8..1f163a22 100644
--- a/firmware/runtime/src/main.rs
+++ b/firmware/runtime/src/main.rs
@@ -8,8 +8,8 @@ extern crate log;
 use core::{cmp, str};
 use log::info;
 
-use libboard_zynq::timer::GlobalTimer;
-use libsupport_zynq::{logger, ram};
+use libboard_zynq::{logger, timer::GlobalTimer};
+use libsupport_zynq::ram;
 
 mod proto;
 mod comms;
diff --git a/firmware/szl/src/main.rs b/firmware/szl/src/main.rs
index 5d2a245a..8eccac70 100644
--- a/firmware/szl/src/main.rs
+++ b/firmware/szl/src/main.rs
@@ -9,9 +9,10 @@ use cstr_core::CStr;
 
 use libboard_zynq::{
     self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll},
+    logger,
     timer::GlobalTimer,
 };
-use libsupport_zynq::{boot, logger};
+use libsupport_zynq::boot;
 
 
 extern "C" {