Commit f7394e39 authored Apr 27, 2025 by Thomas Altenbach Committed by David Brown May 20, 2025

sim: Use largest image for all upgrade strategies



The simulator was testing the upgrade with the largest image possible
for all strategies, except for overwrite-only, swap-move and swap-offset
because some tests were failing when the maximum image size was used.

For overwrite-only, this was due to an incorrect trailer size
computation. This has been fixed by
88294be1.

For swap-move and swap-offset, this was due to the simulator not taking
into account the padding needed by those strategies in the primary or
secondary slot, but also to incorrect computation of the maximum image
size in some cases by the MCUboot library. Both issues have been fixed
by the previous commits.

Since all those issues have been fixed, the simulator can now be
configured to test upgrade with the largest possible image for all
strategies.

Note that logic needed to generate image of a given image is kept even
if not useful anymore at the moment, since that might be needed when
test will be added to ensure proper behavior when images of different
sizes are used.

Signed-off-by: Thomas Altenbach <thomas.altenbach@legrand.com>

parent 0677d0d9

sim/src/image.rs

+3 −9

Original line number	Diff line number	Diff line
		@@ -1747,6 +1747,7 @@ fn show_flash(flash: &dyn Flash) {
		#[derive(Debug)]
		enum ImageSize {
		/// Make the image the specified given size.
		#[allow(dead_code)]
		Given(usize),
		/// Make the image as large as it can be for the partition/device.
		Largest,
		@@ -2410,16 +2411,9 @@ trait AsRaw : Sized {

		/// Determine whether it makes sense to test this configuration with a maximally-sized image.
		/// Returns an ImageSize representing the best size to test, possibly just with the given size.
		fn maximal(size: usize) -> ImageSize {
		if Caps::OverwriteUpgrade.present() \|\|
		Caps::SwapUsingOffset.present() \|\|
		Caps::SwapUsingMove.present()
		{
		ImageSize::Given(size)
		} else {
		fn maximal(_size: usize) -> ImageSize {
		ImageSize::Largest
		}
		}

		pub fn show_sizes() {
		// This isn't panic safe.

Admin message