diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 25194cf6f1..db97ff0dfc 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -16,8 +16,7 @@ tock-registers = { path = "../libraries/tock-register-interface" } tock-cells = { path = "../libraries/tock-cells" } tock-tbf = { path = "../libraries/tock-tbf" } flux_support = { path = "../flux_support" } -# flux-rs = { git = "https://github.com/flux-rs/flux.git" } -flux-rs = { path = "../../flux/lib/flux-rs" } +flux-rs = { git = "https://github.com/flux-rs/flux.git" } # In general, Tock discourages the use of cargo features. However for certain # kernel crate configuration, we have not found reasonable alternatives to diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 93922b8928..00e595944e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,8 @@ +# Licensed under the Apache License, Version 2.0 or the MIT License. +# SPDX-License-Identifier: Apache-2.0 OR MIT +# Copyright Tock Contributors 2023. + [toolchain] -channel = "nightly-2024-08-20" -components = ["rust-src", "rustc-dev", "llvm-tools", "rustfmt"] +channel = "nightly-2024-07-08" +components = ["miri", "llvm-tools", "rust-src", "rustfmt", "clippy"] +targets = ["thumbv6m-none-eabi", "thumbv7em-none-eabi", "thumbv7em-none-eabihf", "riscv32imc-unknown-none-elf", "riscv32imac-unknown-none-elf"]