aboutsummaryrefslogtreecommitdiff
path: root/examples/boot/bootloader
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-08-17 17:05:37 +0000
committerGitHub <[email protected]>2022-08-17 17:05:37 +0000
commitd881f3ad9186cf3279aa1ba27093bad94035c186 (patch)
treee9d4cf483195fce6c8c34c514fc9a5e338771ce9 /examples/boot/bootloader
parent16d0ae76782475c0f759c3310e068507a0a9f8ab (diff)
parent67edea41686084a444e1455d17d5482b10c54abd (diff)
Merge #901
901: Update to critical-section 1.0, atomic-polyfill 1.0 r=Dirbaio a=Dirbaio TODO - [x] Wait for cortex-m 0.7.6 release https://github.com/rust-embedded/cortex-m/pull/449 - [x] ~~Wait for defmt-rtt 0.4 release https://github.com/knurling-rs/defmt/pull/689~~ we're still going to use defmt 0.3 for now, which will use the `critical-section` 0.2 default impl, which works. - [x] Wait for critical-secton `std` impl https://github.com/rust-embedded/critical-section/pull/22 Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/boot/bootloader')
-rw-r--r--examples/boot/bootloader/nrf/Cargo.toml2
-rw-r--r--examples/boot/bootloader/stm32/Cargo.toml2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/boot/bootloader/nrf/Cargo.toml b/examples/boot/bootloader/nrf/Cargo.toml
index 9683bff19..aa2a13ecb 100644
--- a/examples/boot/bootloader/nrf/Cargo.toml
+++ b/examples/boot/bootloader/nrf/Cargo.toml
@@ -10,7 +10,7 @@ defmt-rtt = { version = "0.3", optional = true }
10 10
11embassy-nrf = { path = "../../../../embassy-nrf", default-features = false, features = ["nightly"] } 11embassy-nrf = { path = "../../../../embassy-nrf", default-features = false, features = ["nightly"] }
12embassy-boot-nrf = { path = "../../../../embassy-boot/nrf", default-features = false } 12embassy-boot-nrf = { path = "../../../../embassy-boot/nrf", default-features = false }
13cortex-m = { version = "0.7" } 13cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
14cortex-m-rt = { version = "0.7" } 14cortex-m-rt = { version = "0.7" }
15cfg-if = "1.0.0" 15cfg-if = "1.0.0"
16 16
diff --git a/examples/boot/bootloader/stm32/Cargo.toml b/examples/boot/bootloader/stm32/Cargo.toml
index 4a3319528..491777103 100644
--- a/examples/boot/bootloader/stm32/Cargo.toml
+++ b/examples/boot/bootloader/stm32/Cargo.toml
@@ -10,7 +10,7 @@ defmt-rtt = { version = "0.3", optional = true }
10 10
11embassy-stm32 = { path = "../../../../embassy-stm32", default-features = false, features = ["nightly"] } 11embassy-stm32 = { path = "../../../../embassy-stm32", default-features = false, features = ["nightly"] }
12embassy-boot-stm32 = { path = "../../../../embassy-boot/stm32", default-features = false } 12embassy-boot-stm32 = { path = "../../../../embassy-boot/stm32", default-features = false }
13cortex-m = { version = "0.7" } 13cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
14cortex-m-rt = { version = "0.7" } 14cortex-m-rt = { version = "0.7" }
15embedded-storage = "0.3.0" 15embedded-storage = "0.3.0"
16embedded-storage-async = "0.3.0" 16embedded-storage-async = "0.3.0"