From 7e912610405262769f537b3c7e3301c65f13f149 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Sun, 13 Oct 2024 21:47:40 +0200 Subject: [PATCH] rp/multicore: enable fpu on second core only if building for -eabihf targets. --- embassy-rp/build.rs | 5 +++++ embassy-rp/src/multicore.rs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/embassy-rp/build.rs b/embassy-rp/build.rs index 3216a38267..18860ffb58 100644 --- a/embassy-rp/build.rs +++ b/embassy-rp/build.rs @@ -15,5 +15,10 @@ fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-changed=link-rp.x.in"); + + 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 7e2e776ea8..81de849071 100644 --- a/embassy-rp/src/multicore.rs +++ b/embassy-rp/src/multicore.rs @@ -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));