From 6d89f2729ab7a6ee3dd78ccaef1b16677b5a9eee Mon Sep 17 00:00:00 2001
From: kingofpayne <43875454+kingofpayne@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:07:56 +0200
Subject: boot: flash-erase-zero (#3344)

Allow compatibility with devices whose flash erase set bytes to 0x00
instead of 0xFF, using a new flash-erase-zero feature.
See issue #3342.
---
 embassy-boot/Cargo.toml | 1 +
 embassy-boot/src/lib.rs | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'embassy-boot')

diff --git a/embassy-boot/Cargo.toml b/embassy-boot/Cargo.toml
index d27fe763e..79ba6456a 100644
--- a/embassy-boot/Cargo.toml
+++ b/embassy-boot/Cargo.toml
@@ -47,6 +47,7 @@ ed25519-dalek = { version = "2", default-features = false, features = ["std", "r
 [features]
 ed25519-dalek = ["dep:ed25519-dalek", "_verify"]
 ed25519-salty = ["dep:salty", "_verify"]
+flash-erase-zero = []
 
 #Internal features
 _verify = []
diff --git a/embassy-boot/src/lib.rs b/embassy-boot/src/lib.rs
index b4f03e01e..8849055e8 100644
--- a/embassy-boot/src/lib.rs
+++ b/embassy-boot/src/lib.rs
@@ -14,7 +14,11 @@ mod test_flash;
 
 // The expected value of the flash after an erase
 // TODO: Use the value provided by NorFlash when available
+#[cfg(not(feature = "flash-erase-zero"))]
 pub(crate) const STATE_ERASE_VALUE: u8 = 0xFF;
+#[cfg(feature = "flash-erase-zero")]
+pub(crate) const STATE_ERASE_VALUE: u8 = 0x00;
+
 pub use boot_loader::{BootError, BootLoader, BootLoaderConfig};
 pub use firmware_updater::{
     BlockingFirmwareState, BlockingFirmwareUpdater, FirmwareState, FirmwareUpdater, FirmwareUpdaterConfig,
-- 
cgit