commit 2d736ad4c5ffb3c9d8f094b7ac3eab5d4ab8eee5
author David Vincze <david.vincze@arm.com> Mon Feb 18 11:50:22 2019 +0100
committer David Brown <davidb@davidb.org> Wed Mar 13 15:40:21 2019 -0600
tree c6a82c83324513a2f8d39d565f5fa874c43b1222
parent 59bcb3787e8e7f159c94a4982a80e2e4134b0091

Replace flash partitioning terminology

This change replaces the slot 0/1 terminology with primary/secondary
slot and replaces FLASH_AREA_IMAGE_0/1 with
FLASH_AREA_IMAGE_PRIMARY/SECONDARY. This naming convention may be more
understandable, fits better to MCUs with multiple images and it is an
architecture agnostic alternative as well.

Change-Id: I655a585f6ae023852c671ee6635399efe25209c9
Signed-off-by: David Vincze <david.vincze@arm.com>
Signed-off-by: David Brown <david.brown@linaro.org>

sim/mcuboot-sys/build.rs

diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs
index 9e9ef36..088b470 100644
--- a/sim/mcuboot-sys/build.rs
+++ b/sim/mcuboot-sys/build.rs
@@ -12,7 +12,8 @@
     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 validate_primary_slot =
+                  env::var("CARGO_FEATURE_VALIDATE_PRIMARY_SLOT").is_ok();
     let enc_rsa = env::var("CARGO_FEATURE_ENC_RSA").is_ok();
     let enc_kw = env::var("CARGO_FEATURE_ENC_KW").is_ok();
     let bootstrap = env::var("CARGO_FEATURE_BOOTSTRAP").is_ok();
@@ -28,8 +29,8 @@
         conf.define("MCUBOOT_BOOTSTRAP", None);
     }
 
-    if validate_slot0 {
-        conf.define("MCUBOOT_VALIDATE_SLOT0", None);
+    if validate_primary_slot {
+        conf.define("MCUBOOT_VALIDATE_PRIMARY_SLOT", None);
     }
 
     // Currently, mbed TLS cannot build with both RSA and ECDSA.