From b4bbc00a0060ae1edb6178d12c9d0b9cd5a7031a Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 10 Apr 2025 10:15:44 -0700 Subject: [PATCH 1/2] Convert tabs into spaces Indent everything with spaces instead of TABS. Based on PR by James Munns on the original "out-of-tree" copy of embassy-imxrt: https://github.com/OpenDevicePartnership/embassy-imxrt/pull/387 --- examples/mimxrt6/memory.x | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/mimxrt6/memory.x b/examples/mimxrt6/memory.x index 5ea82fd71..6c4410f57 100644 --- a/examples/mimxrt6/memory.x +++ b/examples/mimxrt6/memory.x @@ -1,34 +1,34 @@ MEMORY { - OTFAD : ORIGIN = 0x08000000, LENGTH = 256 - FCB : ORIGIN = 0x08000400, LENGTH = 512 - BIV : ORIGIN = 0x08000600, LENGTH = 4 - KEYSTORE : ORIGIN = 0x08000800, LENGTH = 2K - FLASH : ORIGIN = 0x08001000, LENGTH = 1M - RAM : ORIGIN = 0x20080000, LENGTH = 1536K + OTFAD : ORIGIN = 0x08000000, LENGTH = 256 + FCB : ORIGIN = 0x08000400, LENGTH = 512 + BIV : ORIGIN = 0x08000600, LENGTH = 4 + KEYSTORE : ORIGIN = 0x08000800, LENGTH = 2K + FLASH : ORIGIN = 0x08001000, LENGTH = 1M + RAM : ORIGIN = 0x20080000, LENGTH = 1536K } SECTIONS { - .otfad : { - . = ALIGN(4); - KEEP(* (.otfad)) - . = ALIGN(4); - } > OTFAD + .otfad : { + . = ALIGN(4); + KEEP(* (.otfad)) + . = ALIGN(4); + } > OTFAD - .fcb : { - . = ALIGN(4); - KEEP(* (.fcb)) - . = ALIGN(4); - } > FCB + .fcb : { + . = ALIGN(4); + KEEP(* (.fcb)) + . = ALIGN(4); + } > FCB - .biv : { - . = ALIGN(4); - KEEP(* (.biv)) - . = ALIGN(4); - } > BIV + .biv : { + . = ALIGN(4); + KEEP(* (.biv)) + . = ALIGN(4); + } > BIV - .keystore : { - . = ALIGN(4); - KEEP(* (.keystore)) - . = ALIGN(4); - } > KEYSTORE + .keystore : { + . = ALIGN(4); + KEEP(* (.keystore)) + . = ALIGN(4); + } > KEYSTORE } From 05606d03804b431d014fa7cde23c2058b1ad2648 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 10 Apr 2025 10:16:49 -0700 Subject: [PATCH 2/2] Update minimum FCB version to latest released Version 0.2+ allows for the user to provide custom FCB for their platform. By default, FCB should work on MIMXRT685s EVK, by NXP. Based on PR by James Munns on the original "out-of-tree" copy of embassy-imxrt: https://github.com/OpenDevicePartnership/embassy-imxrt/pull/387 --- examples/mimxrt6/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/mimxrt6/Cargo.toml b/examples/mimxrt6/Cargo.toml index 0e4a1ee36..8fc510c47 100644 --- a/examples/mimxrt6/Cargo.toml +++ b/examples/mimxrt6/Cargo.toml @@ -18,7 +18,7 @@ embassy-sync = { version = "0.6.2", path = "../../embassy-sync", features = ["de embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = "1.0.0" -mimxrt600-fcb = "0.1.0" +mimxrt600-fcb = "0.2.2" panic-probe = { version = "0.3", features = ["print-defmt"] } rand = { version = "0.8.5", default-features = false }