Merge pull request #3377 from Totto8492/enable-fpu

Enable FPU for RP235X Core1

2 files changed, 28 insertions, 1 deletions

diff --git a/embassy-rp/build.rs b/embassy-rp/build.rs
index 3216a3826..a8d387611 100644
--- a/embassy-rp/build.rs
+++ b/embassy-rp/build.rs
@@ -1,7 +1,8 @@
 use std::env;
+use std::ffi::OsStr;
 use std::fs::File;
 use std::io::Write;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 fn main() {
     if env::var("CARGO_FEATURE_RP2040").is_ok() {
@@ -16,4 +17,23 @@ fn main() {
         println!("cargo:rerun-if-changed=build.rs");
         println!("cargo:rerun-if-changed=link-rp.x.in");
     }
+
+    // code below taken from https://github.com/rust-embedded/cortex-m/blob/master/cortex-m-rt/build.rs
+
+    let mut target = env::var("TARGET").unwrap();
+
+    // When using a custom target JSON, `$TARGET` contains the path to that JSON file. By
+    // convention, these files are named after the actual target triple, eg.
+    // `thumbv7m-customos-elf.json`, so we extract the file stem here to allow custom target specs.
+    let path = Path::new(&target);
+    if path.extension() == Some(OsStr::new("json")) {
+        target = path
+            .file_stem()
+            .map_or(target.clone(), |stem| stem.to_str().unwrap().to_string());
+    }
+
+    println!("cargo::rustc-check-cfg=cfg(has_fpu)");
+    if target.ends_with("-eabihf") {
+        println!("cargo:rustc-cfg=has_fpu");
+    }
 }
diff --git a/embassy-rp/src/multicore.rs b/embassy-rp/src/multicore.rs
index 9f7d77bf5..81de84907 100644
--- a/embassy-rp/src/multicore.rs
+++ b/embassy-rp/src/multicore.rs
@@ -169,6 +169,13 @@ where
             interrupt::SIO_IRQ_FIFO.enable()
         };
 
+        // Enable FPU
+        #[cfg(all(feature = "_rp235x", has_fpu))]
+        unsafe {
+            let p = cortex_m::Peripherals::steal();
+            p.SCB.cpacr.modify(|cpacr| cpacr | (3 << 20) | (3 << 22));
+        }
+
         entry()
     }