commit 60806bce8e7803d7cd5ddbc2110deacff227652a
author Thomas Altenbach <thomas.altenbach@legrand.com> Thu May 02 14:56:21 2024 +0200
committer Fabio Utzig <utzig@utzig.org> Mon Jul 15 20:03:21 2024 -0300
tree 39c0cbdeb3e62ec38f141568b9e4d29d25aeb237
parent 44a935ebcc2e7e82c4df7d5830d92abbf3d029c4

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

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 <thomas.altenbach@legrand.com>

sim/mcuboot-sys/build.rs

diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs
index 4221292..ea17d80 100644
--- a/sim/mcuboot-sys/build.rs
+++ b/sim/mcuboot-sys/build.rs
@@ -255,7 +255,7 @@
 
     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);
     }