Merge pull request #3377 from Totto8492/enable-fpu

Enable FPU for RP235X Core1
This commit is contained in:
Dario Nieuwenhuis 2024-10-13 20:54:22 +00:00 committed by GitHub
commit 4eb820ab6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 1 deletions

View File

@ -1,7 +1,8 @@
use std::env; use std::env;
use std::ffi::OsStr;
use std::fs::File; use std::fs::File;
use std::io::Write; use std::io::Write;
use std::path::PathBuf; use std::path::{Path, PathBuf};
fn main() { fn main() {
if env::var("CARGO_FEATURE_RP2040").is_ok() { 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=build.rs");
println!("cargo:rerun-if-changed=link-rp.x.in"); 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");
}
} }

View File

@ -169,6 +169,13 @@ where
interrupt::SIO_IRQ_FIFO.enable() 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() entry()
} }