OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sim: Remove cfg on `verify_image` 

Remove the final conditional compilation in the simulator.  The
simulator is now always built the same way, and bases the tests it runs
on the capability queries made to the MCUboot code.  This simplifies the
simulator code a bit, and, importantly, removes the ability to have
mismatches between the configuration as compiled into the MCUboot code
and how the simulator is compiled.

Signed-off-by: David Brown <david.brown@linaro.org>
This commit is contained in:
David Brown 2019-01-11 14:29:14 -07:00 committed by David Brown
parent f38bc342f9
commit 61a540dd4e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sim/src/image.rs
View File

@ -850,19 +850,13 @@ fn verify_image(flashmap: &SimFlashMap, slots: &[SlotInfo], slot: usize,
} }
} }
#[cfg(feature = "overwrite-only")]
#[allow(unused_variables)]
// overwrite-only doesn't employ trailer management
fn verify_trailer(flashmap: &SimFlashMap, slots: &[SlotInfo], slot: usize, fn verify_trailer(flashmap: &SimFlashMap, slots: &[SlotInfo], slot: usize,
magic: Option<u8>, image_ok: Option<u8>, magic: Option<u8>, image_ok: Option<u8>,
copy_done: Option<u8>) -> bool { copy_done: Option<u8>) -> bool {
true if Caps::OverwriteUpgrade.present() {
} return true;
}
#[cfg(not(feature = "overwrite-only"))]
fn verify_trailer(flashmap: &SimFlashMap, slots: &[SlotInfo], slot: usize,
magic: Option<u8>, image_ok: Option<u8>,
copy_done: Option<u8>) -> bool {
let offset = slots[slot].trailer_off; let offset = slots[slot].trailer_off;
let dev_id = slots[slot].dev_id; let dev_id = slots[slot].dev_id;
let mut copy = vec![0u8; c::boot_magic_sz() + c::boot_max_align() * 2]; let mut copy = vec![0u8; c::boot_magic_sz() + c::boot_max_align() * 2];