From d3aeb45fb31f8fff7a9cfef7035f4ad79b70d046 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Thu, 19 Aug 2021 00:56:11 +0200
Subject: [PATCH] Update cortex-m-rt to v0.7 for stm32, rp.

---
 embassy-nrf/Cargo.toml        | 2 +-
 embassy-rp/Cargo.toml         | 4 ++--
 embassy-stm32/Cargo.toml      | 2 +-
 examples/rp/Cargo.toml        | 3 +--
 examples/stm32f0/Cargo.toml   | 2 +-
 examples/stm32f4/Cargo.toml   | 2 +-
 examples/stm32h7/Cargo.toml   | 2 +-
 examples/stm32wb55/Cargo.toml | 2 +-
 stm32-metapac/Cargo.toml      | 2 +-
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml
index c76e5171f..7a6963f9b 100644
--- a/embassy-nrf/Cargo.toml
+++ b/embassy-nrf/Cargo.toml
@@ -34,7 +34,7 @@ embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
 
 defmt = { version = "0.2.0", optional = true }
 log = { version = "0.4.11", optional = true }
-cortex-m-rt = "0.6.13"
+cortex-m-rt = ">=0.6.15,<0.8"
 cortex-m = "0.7.1"
 embedded-hal    = { version = "0.2.4" }
 embedded-dma    = { version = "0.1.2" }
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index 5f0784071..3702404b8 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -25,10 +25,10 @@ embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["r
 atomic-polyfill = { version = "0.1.2" }
 defmt = { version = "0.2.0", optional = true }
 log = { version = "0.4.11", optional = true }
-cortex-m-rt = "0.6.13"
+cortex-m-rt = ">=0.6.15,<0.8"
 cortex-m = "0.7.1"
 critical-section = "0.2.1"
 
-rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="2ce29ba58ad904d3995ce65bb46807e853f1fbf9", features = ["rt"] }
+rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="9ad7223a48a065e612bc7dc7be5bf5bd0b41cfc4", features = ["rt"] }
 #rp2040-pac2 = { path = "../../rp/rp2040-pac2", features = ["rt"] }
 embedded-hal = { version = "0.2.4", features = [ "unproven" ] }
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index e0c16b46c..38cc12d16 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -14,7 +14,7 @@ embassy-net = { version = "0.1.0", path = "../embassy-net", default-features = f
 
 defmt = { version = "0.2.0", optional = true }
 log = { version = "0.4.11", optional = true }
-cortex-m-rt = { version = "0.6.13", features = ["device"] }
+cortex-m-rt = ">=0.6.15,<0.8"
 cortex-m = "0.7.1"
 embedded-hal = { version = "0.2.4", features = ["unproven"] }
 futures = { version = "0.3.5", default-features = false, features = ["async-await"] }
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml
index 4c4f983fc..db222e071 100644
--- a/examples/rp/Cargo.toml
+++ b/examples/rp/Cargo.toml
@@ -19,14 +19,13 @@ defmt-error = []
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
 embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "defmt-trace"] }
-rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="e8635fd05f43b6c21ec462fb8c06140e1fb26961" }
 atomic-polyfill = { version = "0.1.1" }
 
 defmt = "0.2.0"
 defmt-rtt = "0.2.0"
 
 cortex-m = { version = "0.7.1", features = ["inline-asm"] }
-cortex-m-rt = "0.6.13"
+cortex-m-rt = "0.7.0"
 embedded-hal    = { version = "0.2.4" }
 panic-probe = { version = "0.2.0", features = ["print-defmt"] }
 futures = { version = "0.3.8", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
diff --git a/examples/stm32f0/Cargo.toml b/examples/stm32f0/Cargo.toml
index c5730de80..d37391e4f 100644
--- a/examples/stm32f0/Cargo.toml
+++ b/examples/stm32f0/Cargo.toml
@@ -9,7 +9,7 @@ resolver = "2"
 
 [dependencies]
 cortex-m = { version = "0.7.1", features = ["inline-asm"] }
-cortex-m-rt = "0.6.13"
+cortex-m-rt = "0.7.0"
 defmt = "0.2.0"
 defmt-rtt = "0.2.0"
 panic-probe = { version = "0.2.0" }
diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml
index 95c8441d9..8a7f45877 100644
--- a/examples/stm32f4/Cargo.toml
+++ b/examples/stm32f4/Cargo.toml
@@ -26,7 +26,7 @@ defmt = "0.2.0"
 defmt-rtt = "0.2.0"
 
 cortex-m = "0.7.1"
-cortex-m-rt = "0.6.14"
+cortex-m-rt = "0.7.0"
 embedded-hal = { version = "0.2.4" }
 panic-probe = { version = "0.2.0", features= ["print-defmt"] }
 futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index 9cacd4aaa..1370cd9ab 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -28,7 +28,7 @@ defmt = "0.2.0"
 defmt-rtt = "0.2.0"
 
 cortex-m = "0.7.1"
-cortex-m-rt = "0.6.14"
+cortex-m-rt = "0.7.0"
 embedded-hal = { version = "0.2.4" }
 panic-probe = { version = "0.2.0", features= ["print-defmt"] }
 futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
diff --git a/examples/stm32wb55/Cargo.toml b/examples/stm32wb55/Cargo.toml
index ee2432cb2..c12e489f7 100644
--- a/examples/stm32wb55/Cargo.toml
+++ b/examples/stm32wb55/Cargo.toml
@@ -26,7 +26,7 @@ defmt = "0.2.0"
 defmt-rtt = "0.2.0"
 
 cortex-m = "0.7.1"
-cortex-m-rt = "0.6.14"
+cortex-m-rt = "0.7.0"
 embedded-hal = { version = "0.2.4" }
 panic-probe = { version = "0.2.0", features= ["print-defmt"] }
 futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
diff --git a/stm32-metapac/Cargo.toml b/stm32-metapac/Cargo.toml
index fabd95664..894b101e0 100644
--- a/stm32-metapac/Cargo.toml
+++ b/stm32-metapac/Cargo.toml
@@ -6,7 +6,7 @@ resolver = "2"
 
 [dependencies]
 cortex-m = "0.7.2"
-cortex-m-rt = { version = "0.6.8", optional = true }
+cortex-m-rt = { version = ">=0.6.15,<0.8", optional = true }
 
 # BEGIN BUILD DEPENDENCIES
 # These are removed when generating the pre-generated crate using the tool at gen/.