Use same format for scratch and slot trailer
Prior to this change, the scratch image trailer had a different format
from a slot image trailer. Specifically:
1. The scratch trailer only contained a single set of status entries
(three bytes); the slot trailer contained `BOOT_STATUS_MAX_ENTRIES`
sets of status entries.
2. The scratch trailer did not contain the `copy_done` field.
This inconsistency required some extra conditional logic in the trailer
handling code. It is simpler to just use the same trailer format
everywhere.
This commit removes this inconsistency. Now, the scratch trailer
structure is identical to that of the slot trailer.
Signed-off-by: Christopher Collins <ccollins@apache.org>
diff --git a/sim/mcuboot-sys/src/c.rs b/sim/mcuboot-sys/src/c.rs
index d53dc23..08b8813 100644
--- a/sim/mcuboot-sys/src/c.rs
+++ b/sim/mcuboot-sys/src/c.rs
@@ -41,7 +41,7 @@
}
pub fn boot_trailer_sz(align: u8) -> u32 {
- unsafe { raw::boot_slots_trailer_sz(align) }
+ unsafe { raw::boot_trailer_sz(align) }
}
pub fn boot_magic_sz() -> usize {
@@ -87,7 +87,7 @@
pub static mut c_asserts: u8;
pub static mut c_catch_asserts: u8;
- pub fn boot_slots_trailer_sz(min_write_sz: u8) -> u32;
+ pub fn boot_trailer_sz(min_write_sz: u8) -> u32;
pub static BOOT_MAGIC_SZ: u32;
pub static BOOT_MAX_ALIGN: u32;