commit f9bfddd685d0725e3e29abf5938eb1e7dd183be7
author Marti Bolivar <marti@opensourcefoundries.com> Tue Apr 24 14:28:33 2018 -0400
committer Fabio Utzig <utzig@utzig.org> Wed Apr 25 18:44:03 2018 -0300
tree 5d0e2c1d3130552472940b54be001d09a18356e6
parent 64dde5b8553d569e246c9f5db4ba4f0c60db1d32

Move max image sector config to mcuboot_config.h

Take the opportunity to clean up a bit of platform cruft that has
gotten into bootutil by moving it to mcuboot_config.h, and ensuring it
is documented in the template config file.

Signed-off-by: Marti Bolivar <marti@opensourcefoundries.com>

boot/bootutil/src/bootutil_priv.h

diff --git a/boot/bootutil/src/bootutil_priv.h b/boot/bootutil/src/bootutil_priv.h
index d7ab258..b0dab08 100644
--- a/boot/bootutil/src/bootutil_priv.h
+++ b/boot/bootutil/src/bootutil_priv.h
@@ -91,15 +91,7 @@
     uint8_t image_ok;
 };
 
-#if defined(__BOOTSIM__)
-#define BOOT_MAX_IMG_SECTORS       128
-#elif defined(__ZEPHYR__)
-#define BOOT_MAX_IMG_SECTORS       CONFIG_BOOT_MAX_IMG_SECTORS
-#elif defined(MCUBOOT_MYNEWT)
-#define BOOT_MAX_IMG_SECTORS       MYNEWT_VAL(BOOTUTIL_MAX_IMG_SECTORS)
-#else
-#error "Invalid target OS"
-#endif
+#define BOOT_MAX_IMG_SECTORS       MCUBOOT_MAX_IMG_SECTORS
 
 /*
  * The current flashmap API does not check the amount of space allocated when

boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h

diff --git a/boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h b/boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h
index 4e169ab..f0842a3 100644
--- a/boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h
+++ b/boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h
@@ -52,4 +52,6 @@
 #define MCUBOOT_OVERWRITE_ONLY_FAST 1
 #endif
 
+#define MCUBOOT_MAX_IMG_SECTORS       MYNEWT_VAL(BOOTUTIL_MAX_IMG_SECTORS)
+
 #endif /* __MCUBOOT_CONFIG_H__ */

boot/zephyr/include/mcuboot_config/mcuboot_config.h

diff --git a/boot/zephyr/include/mcuboot_config/mcuboot_config.h b/boot/zephyr/include/mcuboot_config/mcuboot_config.h
index 7daa58f..0b65cd0 100644
--- a/boot/zephyr/include/mcuboot_config/mcuboot_config.h
+++ b/boot/zephyr/include/mcuboot_config/mcuboot_config.h
@@ -48,6 +48,8 @@
  */
 #define MCUBOOT_USE_FLASH_AREA_GET_SECTORS
 
+#define MCUBOOT_MAX_IMG_SECTORS       CONFIG_BOOT_MAX_IMG_SECTORS
+
 #endif /* !__BOOTSIM__ */
 
 #endif /* __MCUBOOT_CONFIG_H__ */

samples/mcuboot_config/mcuboot_config.template.h

diff --git a/samples/mcuboot_config/mcuboot_config.template.h b/samples/mcuboot_config/mcuboot_config.template.h
index e5f208c..75ec500 100644
--- a/samples/mcuboot_config/mcuboot_config.template.h
+++ b/samples/mcuboot_config/mcuboot_config.template.h
@@ -78,4 +78,8 @@
  * See the flash APIs for more details. */
 /* #define MCUBOOT_USE_FLASH_AREA_GET_SECTORS */
 
+/* Default maximum number of flash sectors per image slot; change
+ * as desirable. */
+#define MCUBOOT_MAX_IMG_SECTORS 128
+
 #endif /* __MCUBOOT_CONFIG_H__ */

sim/mcuboot-sys/build.rs

diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs
index 599d501..516741b 100644
--- a/sim/mcuboot-sys/build.rs
+++ b/sim/mcuboot-sys/build.rs
@@ -17,6 +17,7 @@
     let mut conf = gcc::Build::new();
     conf.define("__BOOTSIM__", None);
     conf.define("MCUBOOT_USE_FLASH_AREA_GET_SECTORS", None);
+    conf.define("MCUBOOT_MAX_IMG_SECTORS", Some("128"));
 
     if validate_slot0 {
         conf.define("MCUBOOT_VALIDATE_SLOT0", None);