sim: Fix MCUBOOT_SWAP_USING_SCRATCH defined in direct-xip and ram-load

taltenbach · utzig · commit 60806bce8e78 · 2024-07-15T20:03:21.000-03:00
When 'direct-xip' or 'ram-load' features were enabled,
CONFIG_BOOT_SWAP_USING_SCRATCH and MCUBOOT_SWAP_USING_SCRATCH were
defined even though swap using scratch wasn't used. This commit fixes
the issue.

Signed-off-by: Thomas Altenbach &lt;thomas.altenbach@legrand.com&gt;
diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs
@@ -255,7 +255,7 @@ fn main() {
 
     if swap_move {
         conf.conf.define("MCUBOOT_SWAP_USING_MOVE", None);
-    } else if !overwrite_only {
+    } else if !overwrite_only && !direct_xip && !ram_load {
         conf.conf.define("CONFIG_BOOT_SWAP_USING_SCRATCH", None);
         conf.conf.define("MCUBOOT_SWAP_USING_SCRATCH", None);
     }

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ fn main() {`
`255`	`255`
`256`	`256`	`if swap_move {`
`257`	`257`	`conf.conf.define("MCUBOOT_SWAP_USING_MOVE", None);`
`258`		`- } else if !overwrite_only {`
	`258`	`+ } else if !overwrite_only && !direct_xip && !ram_load {`
`259`	`259`	`conf.conf.define("CONFIG_BOOT_SWAP_USING_SCRATCH", None);`
`260`	`260`	`conf.conf.define("MCUBOOT_SWAP_USING_SCRATCH", None);`
`261`	`261`	`}`