NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid writing bootloader flash if not needed

Browse source
This commit is contained in:
Ulf Lilleengen 2022-03-31 15:23:06 +02:00
parent f028b0064b
commit b0a53610ba
1 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
embassy-boot/boot/src/lib.rs
View file

@ -318,6 +318,11 @@ impl FirmwareUpdater {
#[repr(align(4))] #[repr(align(4))]
struct Aligned([u8; 4]); struct Aligned([u8; 4]);
let mut magic = Aligned([0; 4]);
flash.read(self.state.from as u32, &mut magic.0).await?;
let magic = u32::from_le_bytes(magic.0);
if magic != SWAP_MAGIC {
flash flash
.write(self.state.from as u32, &Aligned([0; 4]).0) .write(self.state.from as u32, &Aligned([0; 4]).0)
.await?; .await?;
@ -333,6 +338,7 @@ impl FirmwareUpdater {
flash flash
.write(self.state.from as u32, &SWAP_MAGIC.to_le_bytes()) .write(self.state.from as u32, &SWAP_MAGIC.to_le_bytes())
.await?; .await?;
}
Ok(()) Ok(())
} }
@ -341,6 +347,11 @@ impl FirmwareUpdater {
#[repr(align(4))] #[repr(align(4))]
struct Aligned([u8; 4]); struct Aligned([u8; 4]);
let mut magic = Aligned([0; 4]);
flash.read(self.state.from as u32, &mut magic.0).await?;
let magic = u32::from_le_bytes(magic.0);
if magic != BOOT_MAGIC {
flash flash
.write(self.state.from as u32, &Aligned([0; 4]).0) .write(self.state.from as u32, &Aligned([0; 4]).0)
.await?; .await?;
@ -350,6 +361,7 @@ impl FirmwareUpdater {
flash flash
.write(self.state.from as u32, &BOOT_MAGIC.to_le_bytes()) .write(self.state.from as u32, &BOOT_MAGIC.to_le_bytes())
.await?; .await?;
}
Ok(()) Ok(())
} }