From f3517603e94fdc385e8663aa6046a04798541685 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 1 Jan 2025 22:47:19 +0800 Subject: [PATCH] cleanup some feature flag bitrot --- loader/src/main.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/loader/src/main.rs b/loader/src/main.rs index 1e5af0d9f..e211a1e4d 100644 --- a/loader/src/main.rs +++ b/loader/src/main.rs @@ -141,7 +141,8 @@ fn boot_sequence(args: KernelArguments, _signature: u32, fs_prehash: [u8; 64], _ println!("No suspend marker found, doing a cold boot!"); #[cfg(feature = "simulation-only")] println!("Configured for simulation. Skipping RAM clear!"); - #[cfg(not(feature = "cramium-soc"))] // cramium-soc target clears RAM with assembly routine on boot + #[cfg(not(any(feature = "cramium-soc", feature = "cramium-fpga")))] + // cramium target clears RAM with assembly routine on boot clear_ram(&mut cfg); phase_1(&mut cfg); phase_2(&mut cfg, &fs_prehash); @@ -287,7 +288,7 @@ fn boot_sequence(args: KernelArguments, _signature: u32, fs_prehash: [u8; 64], _ #[cfg(not(feature = "atsama5d27"))] { - #[cfg(not(feature = "cramium-soc"))] + #[cfg(not(any(feature = "cramium-soc", feature = "cramium-fpga")))] { // uart mux only exists on the FPGA variant use utralib::generated::*;