From bbc1ffec8eeb7e5129093053177265b51fdf71b3 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 6 Jul 2020 12:31:13 +0800
Subject: [PATCH] szl: disable ps7_init

---
 default.nix         |  2 +-
 src/Cargo.lock      | 10 +++++-----
 src/szl/src/main.rs |  3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index e7b9dc2c..680769ab 100644
--- a/default.nix
+++ b/default.nix
@@ -15,7 +15,7 @@ let
       version = "0.1.0";
 
       src = ./src;
-      cargoSha256 = "0lwsbs1b6538b3zzvazy43xwy4rx1q0chxn3c9529nf3dk6xb22n";
+      cargoSha256 = "1vapk3xjaj4q3xz312nwwbdb7c9fr4439x2rchigh21d5yqfdpr7";
 
       nativeBuildInputs = [
         pkgs.gnumake
diff --git a/src/Cargo.lock b/src/Cargo.lock
index bca9dea5..6fb9bb70 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -200,7 +200,7 @@ dependencies = [
 [[package]]
 name = "libasync"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ae4d3e2455d319308d5a1dd27c06a116c8e951f0"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
 dependencies = [
  "embedded-hal",
  "libcortex_a9",
@@ -212,7 +212,7 @@ dependencies = [
 [[package]]
 name = "libboard_zynq"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ae4d3e2455d319308d5a1dd27c06a116c8e951f0"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
 dependencies = [
  "bit_field",
  "embedded-hal",
@@ -236,7 +236,7 @@ dependencies = [
 [[package]]
 name = "libcortex_a9"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ae4d3e2455d319308d5a1dd27c06a116c8e951f0"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
 dependencies = [
  "bit_field",
  "libregister",
@@ -245,7 +245,7 @@ dependencies = [
 [[package]]
 name = "libregister"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ae4d3e2455d319308d5a1dd27c06a116c8e951f0"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
 dependencies = [
  "bit_field",
  "vcell",
@@ -255,7 +255,7 @@ dependencies = [
 [[package]]
 name = "libsupport_zynq"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ae4d3e2455d319308d5a1dd27c06a116c8e951f0"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#7082e07a1857d811bcf2f6982c655c411c5a1e4f"
 dependencies = [
  "compiler_builtins",
  "libboard_zynq",
diff --git a/src/szl/src/main.rs b/src/szl/src/main.rs
index fc041143..c2823cd0 100644
--- a/src/szl/src/main.rs
+++ b/src/szl/src/main.rs
@@ -11,7 +11,6 @@ use libcortex_a9::{enable_fpu, cache::dcci_slice};
 use libboard_zynq::{
     self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll},
     logger,
-    ps7_init,
     timer::GlobalTimer,
 };
 use libsupport_zynq as _;
@@ -29,8 +28,6 @@ extern fn lzma_error(message: *const u8) {
 
 #[no_mangle]
 pub fn main_core0() {
-    ps7_init::apply();
-
     GlobalTimer::start();
     logger::init().unwrap();
     log::set_max_level(log::LevelFilter::Debug);