From b3732747cf52a743d7c4dd4a07479cc533ad5416 Mon Sep 17 00:00:00 2001 From: Ian McIntyre Date: Sat, 20 Dec 2025 16:48:32 -0500 Subject: Consolidate flash algorithm init --- imxrt1170evk/examples/smoke.rs | 4 ++-- imxrt1170evk/src/lib.rs | 4 +--- imxrt1170evk/src/main.rs | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'imxrt1170evk') diff --git a/imxrt1170evk/examples/smoke.rs b/imxrt1170evk/examples/smoke.rs index 63428ac..7a4f1c1 100644 --- a/imxrt1170evk/examples/smoke.rs +++ b/imxrt1170evk/examples/smoke.rs @@ -5,14 +5,14 @@ use defmt_rtt as _; use imxrt1170evk::{self, Algorithm}; use panic_probe as _; -const LAST_SECTOR: usize = Algorithm::flash_size_bytes() - Algorithm::sector_size_bytes(); +const LAST_SECTOR: usize = (128 * 1024 * 1024 / 8) - 4096; #[imxrt_rt::entry] fn main() -> ! { for _ in 0..5 { let mut is25wp = Algorithm::initialize(); - let mut sector = [0_u8; Algorithm::sector_size_bytes()]; + let mut sector = [0_u8; 4096]; is25wp.flash_read(0x400, &mut sector[..4]); if 0x42464346 != u32::from_le_bytes(sector[..4].try_into().unwrap()) { defmt::warn!("No FCB found."); diff --git a/imxrt1170evk/src/lib.rs b/imxrt1170evk/src/lib.rs index 12da464..4f56b6d 100644 --- a/imxrt1170evk/src/lib.rs +++ b/imxrt1170evk/src/lib.rs @@ -1,6 +1,4 @@ #![no_std] use cortex_m as _; - -pub use imxrt1170_flash_algos::flash::issi::Is25xP128 as Flash; -pub type Algorithm = imxrt1170_flash_algos::Algorithm; +pub type Algorithm = imxrt1170_flash_algos::Algorithm<{ 128 / 8 * 1024 * 1024 }>; diff --git a/imxrt1170evk/src/main.rs b/imxrt1170evk/src/main.rs index 05e3a68..9d1ddce 100644 --- a/imxrt1170evk/src/main.rs +++ b/imxrt1170evk/src/main.rs @@ -13,12 +13,12 @@ flash_algorithm::algorithm!(Algorithm, { // We support page crossings. Suggest a larger page // size so that probe-rs places larger buffers into // RAM per programming operation, reducing overhead. - page_size: 4096, + page_size: Algorithm::sector_size_bytes() as _, empty_value: 0xFF, program_time_out: 1000, erase_time_out: 2000, sectors: [{ - size: Algorithm::sector_size_bytes() as u32, + size: Algorithm::sector_size_bytes() as _, address: 0x0, }] }); -- cgit v1.2.3