Merge #18

18: Add feature jlink-quirks r=adamgreig a=nickray Would be nice to have a release with this too. Co-authored-by: Nicolas Stalder <n@stalder.io>
rust-embedded · Sep 1, 2019 · 9677b77 · 9677b77
2 parents 5c2acbd + e4fe382
commit 9677b77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Added feature `jlink-quirks` to work with JLink
+
 ## [v0.5.2] - 2019-04-28
 
 - Updated `cortex-m` version to not have the issue when linking multiple

diff --git a/Cargo.toml b/Cargo.toml
@@ -14,8 +14,9 @@ version = "0.5.2"
 
 [dependencies]
 cortex-m = ">= 0.5.6, < 0.7"
-cortex-m-semihosting= "0.3.1"
+cortex-m-semihosting = "0.3"
 
 [features]
 exit = []
 inline-asm = ["cortex-m-semihosting/inline-asm", "cortex-m/inline-asm"]
+jlink-quirks = ["cortex-m-semihosting/jlink-quirks"]