From c2a6fb72f727ebbc2d83b274703dea08c9276c5e Mon Sep 17 00:00:00 2001 From: pca006132 Date: Tue, 26 Jan 2021 12:38:09 +0800 Subject: [PATCH] updated zynq-rs dependency --- default.nix | 2 +- src/Cargo.lock | 14 +++++++------- src/runtime/src/main.rs | 2 ++ zynq-rs.nix | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/default.nix b/default.nix index ae54d004..6e174c56 100644 --- a/default.nix +++ b/default.nix @@ -20,7 +20,7 @@ let name = "firmware"; src = ./src; - cargoSha256 = "11qxy008hb5nsir1qrh42zp8idfmc33lvc4xq9gfgj88zw6qh3d3"; + cargoSha256 = "1h6zm7kq1f24kyjgmmmq7b9jydvs23glsrfij6s86nlwbhd5xrcb"; nativeBuildInputs = [ pkgs.gnumake diff --git a/src/Cargo.lock b/src/Cargo.lock index 561b44f9..9f5a70df 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -56,7 +56,7 @@ checksum = "3748f82c7d366a0b4950257d19db685d4958d2fa27c6d164a3f069fec42b748b" [[package]] name = "core_io" version = "0.1.20200410" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#6e6612bc3e12e50b4f6e61cde47100c3d4ab982a" dependencies = [ "memchr", ] @@ -186,7 +186,7 @@ dependencies = [ [[package]] name = "libasync" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#6e6612bc3e12e50b4f6e61cde47100c3d4ab982a" dependencies = [ "embedded-hal", "libcortex_a9", @@ -198,7 +198,7 @@ dependencies = [ [[package]] name = "libboard_zynq" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#6e6612bc3e12e50b4f6e61cde47100c3d4ab982a" dependencies = [ "bit_field", "embedded-hal", @@ -223,7 +223,7 @@ dependencies = [ [[package]] name = "libconfig" version = "0.1.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#6e6612bc3e12e50b4f6e61cde47100c3d4ab982a" dependencies = [ "core_io", "fatfs", @@ -234,7 +234,7 @@ dependencies = [ [[package]] name = "libcortex_a9" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#6e6612bc3e12e50b4f6e61cde47100c3d4ab982a" dependencies = [ "bit_field", "libregister", @@ -250,7 +250,7 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libregister" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#6e6612bc3e12e50b4f6e61cde47100c3d4ab982a" dependencies = [ "bit_field", "vcell", @@ -260,7 +260,7 @@ dependencies = [ [[package]] name = "libsupport_zynq" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#4aa252546f3559c9060ce731943372ad30d16eef" +source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#6e6612bc3e12e50b4f6e61cde47100c3d4ab982a" dependencies = [ "cc", "compiler_builtins", diff --git a/src/runtime/src/main.rs b/src/runtime/src/main.rs index 5fa0f4af..e846ae4b 100644 --- a/src/runtime/src/main.rs +++ b/src/runtime/src/main.rs @@ -22,6 +22,7 @@ use void::Void; use embedded_hal::blocking::delay::DelayMs; use libconfig::Config; use libregister::RegisterW; +use libcortex_a9::l2c::enable_l2_cache; mod proto_core_io; mod proto_async; @@ -162,6 +163,7 @@ static mut LOG_BUFFER: [u8; 1<<17] = [0; 1<<17]; #[no_mangle] pub fn main_core0() { + enable_l2_cache(0x8); let mut timer = GlobalTimer::start(); let buffer_logger = unsafe { diff --git a/zynq-rs.nix b/zynq-rs.nix index f1899d69..2eba9153 100644 --- a/zynq-rs.nix +++ b/zynq-rs.nix @@ -3,6 +3,6 @@ let in pkgs.fetchgit { url = "https://git.m-labs.hk/M-Labs/zynq-rs.git"; - rev = "4aa252546f3559c9060ce731943372ad30d16eef"; - sha256 = "0q9b75w6mbnsyyryainng27glxwhis325bmpv4bvzm7r9almsvks"; + rev = "6e6612bc3e12e50b4f6e61cde47100c3d4ab982a"; + sha256 = "14hj77n9g2zack6sjgs7337j8yq9r3jrpdsmc62kmxfbbmy8jhlg"; }