From cff1252a19cbe7d20474d4f99e1762af275d7389 Mon Sep 17 00:00:00 2001
From: Simon Renblad <srenblad@m-labs.hk>
Date: Wed, 31 Jul 2024 14:16:09 +0800
Subject: [PATCH] changes

---
 Cargo.lock                 | 18 ++++++++++--------
 Cargo.toml                 |  2 ++
 experiments/Cargo.toml     |  2 +-
 libconfig/Cargo.toml       |  4 ++--
 libcortex_a9/src/lib.rs    |  1 +
 libsupport_zynq/Cargo.toml |  2 +-
 szl/Cargo.toml             |  4 ++--
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f3e1e0d..aa68b4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,10 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "bit_field"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
 
 [[package]]
 name = "bitflags"
@@ -14,9 +16,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 
 [[package]]
 name = "cc"
@@ -70,9 +72,9 @@ dependencies = [
 
 [[package]]
 name = "fatfs"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e18f80a87439240dac45d927fd8f8081b6f1e34c03e97271189fa8a8c2e96c8f"
+checksum = "93079df23039e52059e1f03b4c29fb0c72da2c792aad91bb2236c9fb81d3592e"
 dependencies = [
  "bitflags",
  "byteorder",
@@ -250,9 +252,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "volatile-register"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6"
+checksum = "de437e2a6208b014ab52972a27e59b33fa2920d3e00fe05026167a1c509d19cc"
 dependencies = [
  "vcell",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 8f18210..763de5f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["edition2021"]
+
 [workspace]
 members = [
   "libregister",
diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml
index b8456c8..64ccf21 100644
--- a/experiments/Cargo.toml
+++ b/experiments/Cargo.toml
@@ -13,7 +13,7 @@ target_kasli_soc = ["libboard_zynq/target_kasli_soc", "libsupport_zynq/target_ka
 default = ["target_zc706"]
 
 [dependencies]
-log = "0.4"
+log = "=0.4.14"
 embedded-hal = "0.2"
 libregister = { path = "../libregister" }
 libcortex_a9 = { path = "../libcortex_a9" }
diff --git a/libconfig/Cargo.toml b/libconfig/Cargo.toml
index 43ea995..a83d2bf 100644
--- a/libconfig/Cargo.toml
+++ b/libconfig/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 libboard_zynq = { path = "../libboard_zynq" }
 core_io = { version = "0.1", features = ["collections"] }
-fatfs = { version = "0.3", features = ["core_io"], default-features = false }
+fatfs = { version = "=0.3.4", features = ["core_io"], default-features = false }
 log = "0.4"
 
 [features]
@@ -16,4 +16,4 @@ target_coraz7 = []
 target_redpitaya = []
 target_kasli_soc = []
 ipv6 = []
-fat_lfn = [ "fatfs/alloc" ]
\ No newline at end of file
+fat_lfn = [ "fatfs/alloc" ]
diff --git a/libcortex_a9/src/lib.rs b/libcortex_a9/src/lib.rs
index b124a38..fedb7f3 100644
--- a/libcortex_a9/src/lib.rs
+++ b/libcortex_a9/src/lib.rs
@@ -1,5 +1,6 @@
 #![no_std]
 #![feature(never_type)]
+#![feature(asm, global_asm)]
 
 extern crate alloc;
 
diff --git a/libsupport_zynq/Cargo.toml b/libsupport_zynq/Cargo.toml
index 9adf2f9..093b220 100644
--- a/libsupport_zynq/Cargo.toml
+++ b/libsupport_zynq/Cargo.toml
@@ -26,4 +26,4 @@ libcortex_a9 = { path = "../libcortex_a9" }
 libboard_zynq = { path = "../libboard_zynq" }
 
 [build-dependencies]
-cc = { version = "1.0" }
+cc = { version = "=1.0.73" }
diff --git a/szl/Cargo.toml b/szl/Cargo.toml
index b1a33ae..e3798dc 100644
--- a/szl/Cargo.toml
+++ b/szl/Cargo.toml
@@ -13,8 +13,8 @@ target_kasli_soc = ["libboard_zynq/target_kasli_soc", "libsupport_zynq/target_ka
 default = ["target_zc706"]
 
 [dependencies]
-log = "0.4"
-byteorder = { version = "1.3", default-features = false }
+log = "=0.4.14"
+byteorder = { version = "=1.3", default-features = false }
 core_io = { version = "0.1", features = ["collections"] }
 
 libboard_zynq = { path = "../libboard_zynq" }