Fix cortex-m/cortex-m-rt version selection issues (atsamd-rs#505)

CI started failing recently, not being able to select the right version of cortex-m/cortex-m-rt. Update some of our dependencies to fix this. Unfortunately updating this everywhere resulted in too many errors. I think the embedded ecosystem needs some time to upgrade.
adoble · Oct 9, 2021 · a8e1f72 · a8e1f72
1 parent 896651e
commit a8e1f72
Show file tree

Hide file tree

Showing 37 changed files with 161 additions and 38 deletions.
diff --git a/boards/feather_m0/CHANGELOG.md b/boards/feather_m0/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
 # 10.0.1
 
 * Bump dependencies `rtic-monotonic` to `0.1.0-rc.1` and `cortex-m-rtic` to `0.6.0-rc.2`.
@@ -6,4 +10,4 @@
 
 ---
 
-Changelog tracking started at v0.10.0 
+Changelog tracking started at v0.10.0
diff --git a/boards/feather_m0/Cargo.toml b/boards/feather_m0/Cargo.toml
@@ -11,12 +11,12 @@ edition = "2018"
 resolver = "2"
 
 [dependencies]
-cortex-m = "0.6"
+cortex-m = "0.7"
 embedded-hal = "0.2.3"
 nb = "0.1"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [dependencies.atsamd-hal]

diff --git a/boards/samd11_bare/CHANGELOG.md b/boards/samd11_bare/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.6.0
diff --git a/boards/samd11_bare/Cargo.toml b/boards/samd11_bare/Cargo.toml
@@ -10,12 +10,12 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-cortex-m = "0.6.4"
+cortex-m = "0.7"
 embedded-hal = "0.2.3"
 nb = "0.1"
 
 [dependencies.cortex-m-rt]
-version = "0.6.13"
+version = "0.7"
 optional = true
 
 [dependencies.atsamd-hal]

diff --git a/hal/Cargo.toml b/hal/Cargo.toml
@@ -21,7 +21,7 @@ features = ["samd21g", "samd21g-rt", "unproven", "usb"]
 [dependencies]
 bitfield = "0.13"
 bitflags = "1.2.1"
-cortex-m = "0.6"
+cortex-m = "0.7"
 embedded-hal = "0.2"
 modular-bitfield = "0.11"
 nb = "0.1"

diff --git a/pac/atsamd11c/CHANGELOG.md b/pac/atsamd11c/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd11c/Cargo.toml b/pac/atsamd11c/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsamd11d/CHANGELOG.md b/pac/atsamd11d/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd11d/Cargo.toml b/pac/atsamd11d/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsamd21e/CHANGELOG.md b/pac/atsamd21e/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd21e/Cargo.toml b/pac/atsamd21e/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsamd21g/CHANGELOG.md b/pac/atsamd21g/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd21g/Cargo.toml b/pac/atsamd21g/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsamd21j/CHANGELOG.md b/pac/atsamd21j/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd21j/Cargo.toml b/pac/atsamd21j/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsamd51g/CHANGELOG.md b/pac/atsamd51g/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd51g/Cargo.toml b/pac/atsamd51g/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsamd51j/CHANGELOG.md b/pac/atsamd51j/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd51j/Cargo.toml b/pac/atsamd51j/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsamd51n/CHANGELOG.md b/pac/atsamd51n/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd51n/Cargo.toml b/pac/atsamd51n/Cargo.toml
@@ -14,11 +14,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsamd51p/CHANGELOG.md b/pac/atsamd51p/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsamd51p/Cargo.toml b/pac/atsamd51p/Cargo.toml
@@ -11,11 +11,11 @@ edition = "2018"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsame51g/CHANGELOG.md b/pac/atsame51g/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsame51g/Cargo.toml b/pac/atsame51g/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsame51j/CHANGELOG.md b/pac/atsame51j/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsame51j/Cargo.toml b/pac/atsame51j/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsame51n/CHANGELOG.md b/pac/atsame51n/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsame51n/Cargo.toml b/pac/atsame51n/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsame53j/CHANGELOG.md b/pac/atsame53j/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsame53j/Cargo.toml b/pac/atsame53j/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsame53n/CHANGELOG.md b/pac/atsame53n/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsame53n/Cargo.toml b/pac/atsame53n/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsame54n/CHANGELOG.md b/pac/atsame54n/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0
diff --git a/pac/atsame54n/Cargo.toml b/pac/atsame54n/Cargo.toml
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [dependencies]
 bare-metal = "0.2"
-cortex-m = "0.6"
+cortex-m = "0.7.3"
 vcell = "0.1.2"
 
 [dependencies.cortex-m-rt]
-version = "0.6.12"
+version = "0.7"
 optional = true
 
 [features]

diff --git a/pac/atsame54p/CHANGELOG.md b/pac/atsame54p/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Unreleased
+
+* Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue
+
+---
+
+Changelog tracking started at v0.10.0