diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml index 50f04a8..52850ca 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/libboard_zynq/Cargo.toml b/libboard_zynq/Cargo.toml index 1307609..dd7d733 100644 --- a/libboard_zynq/Cargo.toml +++ b/libboard_zynq/Cargo.toml @@ -18,7 +18,7 @@ bit_field = "0.10" embedded-hal = "0.2" nb = "0.1" void = { version = "1", default-features = false } -log = "0.4" +log = "0.4.14" libregister = { path = "../libregister" } libcortex_a9 = { path = "../libcortex_a9" } libasync = { path = "../libasync" } diff --git a/libconfig/Cargo.toml b/libconfig/Cargo.toml index 48f1293..ab509ba 100644 --- a/libconfig/Cargo.toml +++ b/libconfig/Cargo.toml @@ -6,9 +6,10 @@ edition = "2021" [dependencies] libboard_zynq = { path = "../libboard_zynq" } +<<<<<<< HEAD core_io = { version = "0.1", features = ["collections"] } fatfs = { version = "0.3", features = ["core_io"], default-features = false } -log = "0.4" +log = "=0.4.14" [features] target_zc706 = [] @@ -16,4 +17,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/libsupport_zynq/Cargo.toml b/libsupport_zynq/Cargo.toml index d520575..86e2bd7 100644 --- a/libsupport_zynq/Cargo.toml +++ b/libsupport_zynq/Cargo.toml @@ -19,11 +19,11 @@ default = ["panic_handler", "dummy_irq_handler", "dummy_fiq_handler"] [dependencies] r0 = "1" -compiler_builtins = "=0.1.39" +compiler_builtins = "=0.1.49" linked_list_allocator = { version = "0.8", default-features = false, features = ["const_mut_refs"] } libregister = { path = "../libregister" } libcortex_a9 = { path = "../libcortex_a9" } libboard_zynq = { path = "../libboard_zynq" } [build-dependencies] -cc = { version = "1.0" } +cc = { version = "=1.0.73" }