Skip to content

Commit

Permalink
rp/multicore: enable fpu on second core only if building for -eabihf …
Browse files Browse the repository at this point in the history
…targets.
  • Loading branch information
Dirbaio committed Oct 13, 2024
1 parent cdcd9de commit a4636d8
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
22 changes: 21 additions & 1 deletion embassy-rp/build.rs
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -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");
}
}
2 changes: 1 addition & 1 deletion embassy-rp/src/multicore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ where
};

// Enable FPU
#[cfg(feature = "_rp235x")]
#[cfg(all(feature = "_rp235x", has_fpu))]
unsafe {
let p = cortex_m::Peripherals::steal();
p.SCB.cpacr.modify(|cpacr| cpacr | (3 << 20) | (3 << 22));
Expand Down

0 comments on commit a4636d8

Please sign in to comment.