commit ebdc969738277a5cd2164bea65f4846f18276235
author Fabio Utzig <utzig@apache.org> Thu Nov 23 16:28:25 2017 -0200
committer David Brown <davidb@davidb.org> Thu Dec 21 13:36:34 2017 -0700
tree 64029b2abc91ef1ef2ab2ce6cc59d28f8bdc7301
parent 43685c211a261659319e6d05d69615fdf06b8398

Add MCUBOOT_VALIDATE_SLOT0 as feature

Signed-off-by: Fabio Utzig <utzig@apache.org>

sim/Cargo.toml

diff --git a/sim/Cargo.toml b/sim/Cargo.toml
index 3616935..05d17f8 100644
--- a/sim/Cargo.toml
+++ b/sim/Cargo.toml
@@ -9,6 +9,7 @@
 sig-rsa = ["mcuboot-sys/sig-rsa"]
 sig-ecdsa = ["mcuboot-sys/sig-ecdsa"]
 overwrite-only = ["mcuboot-sys/overwrite-only"]
+validate-slot0 = ["mcuboot-sys/validate-slot0"]
 
 [build-dependencies]
 gcc = "0.3.54"

sim/mcuboot-sys/Cargo.toml

diff --git a/sim/mcuboot-sys/Cargo.toml b/sim/mcuboot-sys/Cargo.toml
index 220972b..37c30d1 100644
--- a/sim/mcuboot-sys/Cargo.toml
+++ b/sim/mcuboot-sys/Cargo.toml
@@ -20,6 +20,9 @@
 # Overwrite only upgrade
 overwrite-only = []
 
+# Disable validation of slot0
+validate-slot0 = []
+
 [build-dependencies]
 gcc = "0.3.54"
 

sim/mcuboot-sys/build.rs

diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs
index c67b792..5f5eeac 100644
--- a/sim/mcuboot-sys/build.rs
+++ b/sim/mcuboot-sys/build.rs
@@ -12,11 +12,15 @@
     let sig_rsa = env::var("CARGO_FEATURE_SIG_RSA").is_ok();
     let sig_ecdsa = env::var("CARGO_FEATURE_SIG_ECDSA").is_ok();
     let overwrite_only = env::var("CARGO_FEATURE_OVERWRITE_ONLY").is_ok();
+    let validate_slot0 = env::var("CARGO_FEATURE_VALIDATE_SLOT0").is_ok();
 
     let mut conf = gcc::Build::new();
     conf.define("__BOOTSIM__", None);
     conf.define("MCUBOOT_USE_FLASH_AREA_GET_SECTORS", None);
-    conf.define("MCUBOOT_VALIDATE_SLOT0", None);
+
+    if validate_slot0 {
+        conf.define("MCUBOOT_VALIDATE_SLOT0", None);
+    }
 
     // Currently, mbed TLS cannot build with both RSA and ECDSA.
     if sig_rsa && sig_ecdsa {