Merge upstream

Author: kalkyl

CHANGELOG.md

@@ -5,23 +5,22 @@
 ### New Features
 
 - Add support for the Watchdog Timer peripheral ([#175])
-- Renamed RTFM examples to RTIC examples ([#183])
-- Updated comment style ([#180])
 - Support VDD source for the ADC ([#181])
 
-[#175]: https://github.com/nrf-rs/nrf-hal/pull/175
-[#180]: https://github.com/nrf-rs/nrf-hal/pull/180
-[#181]: https://github.com/nrf-rs/nrf-hal/pull/181
-[#183]: https://github.com/nrf-rs/nrf-hal/pull/183
-
 ### Fixes
 
-None
+- Renamed RTFM examples to RTIC examples ([#183])
+- Updated comment style ([#180])
 
 ### Breaking Changes
 
 None
 
+[#175]: https://github.com/nrf-rs/nrf-hal/pull/175
+[#180]: https://github.com/nrf-rs/nrf-hal/pull/180
+[#181]: https://github.com/nrf-rs/nrf-hal/pull/181
+[#183]: https://github.com/nrf-rs/nrf-hal/pull/183
+
 ## [0.11.0]
 
 ### New Features
@@ -55,5 +54,6 @@ None
 [#168]: https://github.com/nrf-rs/nrf-hal/pull/168
 [#167]: https://github.com/nrf-rs/nrf-hal/pull/167
 [#172]: https://github.com/nrf-rs/nrf-hal/pull/172
+
 [0.11.0]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.11.0
 [0.11.1]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.11.1

nrf51-hal/build.rs

@@ -4,6 +4,14 @@ use std::io::Write;
 use std::path::PathBuf;
 
 fn main() {
+    let target = env::var("TARGET").unwrap();
+    if target.starts_with("thumbv7") || target.starts_with("thumbv8") {
+        panic!(
+            "nrf51-hal only supports thumbv6 targets (attempting to build for `{}`)",
+            target
+        );
+    }
+
     if let Some((flash, mem)) = memory_sizes() {
         let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
 

nrf52810-hal/build.rs

@@ -4,6 +4,11 @@ use std::io::Write;
 use std::path::PathBuf;
 
 fn main() {
+    let target = env::var("TARGET").unwrap();
+    if target.ends_with("eabihf") {
+        panic!("attempting to build nrf52810-hal for target `{}`, but the nRF52810 does not have an FPU", target);
+    }
+
     // Put the linker script somewhere the linker can find it
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
     File::create(out.join("memory.x"))

scripts/build.sh

@@ -21,7 +21,7 @@ cargo build --manifest-path nrf52840-hal/Cargo.toml
 # Build all the example projects.
 
 echo Building examples/ccm-demo...
-cargo build --manifest-path examples/ccm-demo/Cargo.toml --features=52810
+cargo build --manifest-path examples/ccm-demo/Cargo.toml --features=52810 --target thumbv7em-none-eabi
 cargo build --manifest-path examples/ccm-demo/Cargo.toml --features=52832
 cargo build --manifest-path examples/ccm-demo/Cargo.toml --features=52833
 cargo build --manifest-path examples/ccm-demo/Cargo.toml --features=52840
@@ -30,11 +30,11 @@ echo Building examples/comp-demo...
 cargo build --manifest-path examples/comp-demo/Cargo.toml
 
 echo Building examples/ecb-demo...
-cargo build --manifest-path examples/ecb-demo/Cargo.toml --features=52810
+cargo build --manifest-path examples/ecb-demo/Cargo.toml --features=52810 --target thumbv7em-none-eabi
 cargo build --manifest-path examples/ecb-demo/Cargo.toml --features=52832
 cargo build --manifest-path examples/ecb-demo/Cargo.toml --features=52833
 cargo build --manifest-path examples/ecb-demo/Cargo.toml --features=52840
-cargo build --manifest-path examples/ecb-demo/Cargo.toml --features=51
+cargo build --manifest-path examples/ecb-demo/Cargo.toml --features=51 --target thumbv6m-none-eabi
 
 echo Building examples/gpiote-demo...
 cargo build --manifest-path examples/gpiote-demo/Cargo.toml
@@ -50,8 +50,8 @@ echo Building examples/lpcomp-demo...
 cargo build --manifest-path examples/lpcomp-demo/Cargo.toml
 
 echo Building examples/ppi-demo...
-cargo build --manifest-path examples/ppi-demo/Cargo.toml --features=51
-cargo build --manifest-path examples/ppi-demo/Cargo.toml --features=52810
+cargo build --manifest-path examples/ppi-demo/Cargo.toml --features=51 --target thumbv6m-none-eabi
+cargo build --manifest-path examples/ppi-demo/Cargo.toml --features=52810 --target thumbv7em-none-eabi
 cargo build --manifest-path examples/ppi-demo/Cargo.toml --features=52832
 cargo build --manifest-path examples/ppi-demo/Cargo.toml --features=52833
 cargo build --manifest-path examples/ppi-demo/Cargo.toml --features=52840