Merge #187v0.6.2

187: 0.6.2 r=therealprof a=jonas-schievink

Closes #185 

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>

3 files changed, 10 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4a4a2d..92b5893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.6.2] - 2020-01-12
+
+### Added
+
+- Allow writing to the `CONTROL` register via `register::control::write`
+- Add `DWT::unlock()` for a safe way to unlock the DWT
+
 ### Deprecation
 
 - Deprecated incorrectly included registers (`BASPRI`, `BASEPRI_MAX`, `FAULTMASK`) on `thumbv8.base`
@@ -566,6 +573,7 @@ fn main() {
 - Wrappers over miscellaneous instructions like `bkpt`
 
 [Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.6.1...HEAD
+[v0.6.2]: https://github.com/rust-embedded/cortex-m/compare/v0.6.1...v0.6.2
 [v0.6.1]: https://github.com/rust-embedded/cortex-m/compare/v0.6.0...v0.6.1
 [v0.6.0]: https://github.com/rust-embedded/cortex-m/compare/v0.5.8...v0.6.0
 [v0.5.8]: https://github.com/rust-embedded/cortex-m/compare/v0.5.7...v0.5.8
diff --git a/Cargo.toml b/Cargo.toml
index 8454e82..540b67c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 name = "cortex-m"
 readme = "README.md"
 repository = "https://github.com/japaric/cortex-m"
-version = "0.6.1"
+version = "0.6.2"
 edition = "2018"
 links = "cortex-m"  # prevent multiple versions of this crate to be linked together
 
diff --git a/build.rs b/build.rs
index cf820cb..eb0cd11 100644
--- a/build.rs
+++ b/build.rs
@@ -25,7 +25,7 @@ fn main() {
     } else if target.starts_with("thumbv7em-") {
         println!("cargo:rustc-cfg=cortex_m");
         println!("cargo:rustc-cfg=armv7m");
-        //println!("cargo:rustc-cfg=armv7em");
+        println!("cargo:rustc-cfg=armv7em");  // (not currently used)
     } else if target.starts_with("thumbv8m.base") {
         println!("cargo:rustc-cfg=cortex_m");
         println!("cargo:rustc-cfg=armv8m");