From 390f05f762c34d4ce7f2d7c0a5414870f0f0f351 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 23 Jan 2019 16:15:05 +0800 Subject: [PATCH] firmware: use smoltcp release --- artiq/firmware/Cargo.lock | 12 ++++++------ artiq/firmware/bootloader/Cargo.toml | 7 +------ artiq/firmware/libboard_misoc/Cargo.toml | 7 +------ artiq/firmware/runtime/Cargo.toml | 7 +------ 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/artiq/firmware/Cargo.lock b/artiq/firmware/Cargo.lock index de1abb72b..5f68ddb78 100644 --- a/artiq/firmware/Cargo.lock +++ b/artiq/firmware/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=92e970b)", + "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -42,7 +42,7 @@ dependencies = [ "build_misoc 0.0.0", "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=92e970b)", + "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -216,7 +216,7 @@ dependencies = [ "logger_artiq 0.0.0", "managed 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "proto_artiq 0.0.0", - "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=92e970b)", + "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "unwind_backtrace 0.0.0", ] @@ -232,8 +232,8 @@ dependencies = [ [[package]] name = "smoltcp" -version = "0.4.0" -source = "git+https://github.com/m-labs/smoltcp?rev=92e970b#92e970b3798737cfaa2a829d3f1bb7a7353696ee" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -294,7 +294,7 @@ version = "0.0.0" "checksum log_buffer 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f033173c9486b7fe97a79c895c0a3483ae395ab6744c985d10078950e2492419" "checksum managed 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba6713e624266d7600e9feae51b1926c6a6a6bebb18ec5a8e11a5f1d5661baba" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -"checksum smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=92e970b)" = "" +"checksum smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fef582369edb298c6c41319a544ca9c4e83622f226055ccfcb35974fbb55ed34" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" "checksum synstructure 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a761d12e6d8dcb4dcf952a7a89b475e3a9d69e4a69307e01a470977642914bd" diff --git a/artiq/firmware/bootloader/Cargo.toml b/artiq/firmware/bootloader/Cargo.toml index be9ab36e9..2a43b72f5 100644 --- a/artiq/firmware/bootloader/Cargo.toml +++ b/artiq/firmware/bootloader/Cargo.toml @@ -16,9 +16,4 @@ build_misoc = { path = "../libbuild_misoc" } byteorder = { version = "1.0", default-features = false } crc = { version = "1.7", default-features = false } board_misoc = { path = "../libboard_misoc", features = ["uart_console", "smoltcp"] } - -[dependencies.smoltcp] -git = "https://github.com/m-labs/smoltcp" -rev = "92e970b" -default-features = false -features = ["proto-ipv4", "socket-tcp"] +smoltcp = { version = "0.5.0", default-features = false, features = ["proto-ipv4", "socket-tcp"] } diff --git a/artiq/firmware/libboard_misoc/Cargo.toml b/artiq/firmware/libboard_misoc/Cargo.toml index aae40b6b1..8847d0a0d 100644 --- a/artiq/firmware/libboard_misoc/Cargo.toml +++ b/artiq/firmware/libboard_misoc/Cargo.toml @@ -15,12 +15,7 @@ build_misoc = { path = "../libbuild_misoc" } [dependencies] byteorder = { version = "1.0", default-features = false } log = { version = "0.4", default-features = false, optional = true } - -[dependencies.smoltcp] -git = "https://github.com/m-labs/smoltcp" -rev = "92e970b" # NB: also change in runtime/Cargo.toml -default-features = false -optional = true +smoltcp = { version = "0.5.0", default-features = false, optional = true } [features] uart_console = [] diff --git a/artiq/firmware/runtime/Cargo.toml b/artiq/firmware/runtime/Cargo.toml index 1a7da3375..4c187b1ff 100644 --- a/artiq/firmware/runtime/Cargo.toml +++ b/artiq/firmware/runtime/Cargo.toml @@ -27,15 +27,10 @@ board_misoc = { path = "../libboard_misoc", features = ["uart_console", "smoltcp logger_artiq = { path = "../liblogger_artiq" } board_artiq = { path = "../libboard_artiq" } proto_artiq = { path = "../libproto_artiq", features = ["log", "alloc"] } +smoltcp = { version = "0.5.0", default-features = false, features = ["rust-1_28", "alloc", "log", "proto-ipv4", "socket-tcp"] } [dependencies.fringe] git = "https://github.com/m-labs/libfringe" rev = "b8a6d8f" default-features = false features = ["alloc"] - -[dependencies.smoltcp] -git = "https://github.com/m-labs/smoltcp" -rev = "92e970b" # NB: also change in libboard_misoc/Cargo.toml -default-features = false -features = ["rust-1.28", "alloc", "log", "proto-ipv4", "socket-tcp"]