commit 2b8a695be1c1ea84e7a5565be69fdc4505202b2b
author David Brown <david.brown@linaro.org> Tue Oct 01 16:14:53 2019 -0600
committer David Brown <davidb@davidb.org> Wed Oct 02 10:17:22 2019 -0700
tree 82ac3bf44e03a7ba857c7d24393079d4295444ef
parent e0bb1f956f75c84500278ab4cc482f833acc413f

Convert BOOT_MAGIC_SZ to #define

Convert this `extern const uint32_t` to a simple define.  Provide an
accessor function so that the simulator is able to access the value as
well.  This has a minor improvement on the generated code within MCUboot
itself.

Signed-off-by: David Brown <david.brown@linaro.org>

boot/bootutil/src/bootutil_misc.c

diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index ee89444..414306b 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -52,8 +52,6 @@
 #define BOOT_MAGIC_ARR_SZ \
     (sizeof boot_img_magic / sizeof boot_img_magic[0])
 
-const uint32_t BOOT_MAGIC_SZ = sizeof boot_img_magic;
-
 struct boot_swap_table {
     uint8_t magic_primary_slot;
     uint8_t magic_secondary_slot;

boot/bootutil/src/bootutil_priv.h

diff --git a/boot/bootutil/src/bootutil_priv.h b/boot/bootutil/src/bootutil_priv.h
index eb839a6..968bee4 100644
--- a/boot/bootutil/src/bootutil_priv.h
+++ b/boot/bootutil/src/bootutil_priv.h
@@ -185,7 +185,7 @@
 #define BOOT_STATUS_SOURCE_SCRATCH      1
 #define BOOT_STATUS_SOURCE_PRIMARY_SLOT 2
 
-extern const uint32_t BOOT_MAGIC_SZ;
+#define BOOT_MAGIC_SZ (sizeof boot_img_magic)
 
 /**
  * Compatibility shim for flash sector type.

sim/mcuboot-sys/csupport/run.c

diff --git a/sim/mcuboot-sys/csupport/run.c b/sim/mcuboot-sys/csupport/run.c
index dd63d55..5697948 100644
--- a/sim/mcuboot-sys/csupport/run.c
+++ b/sim/mcuboot-sys/csupport/run.c
@@ -454,3 +454,8 @@
 {
     return BOOT_MAX_ALIGN;
 }
+
+uint32_t boot_magic_sz(void)
+{
+    return BOOT_MAGIC_SZ;
+}

sim/mcuboot-sys/src/c.rs

diff --git a/sim/mcuboot-sys/src/c.rs b/sim/mcuboot-sys/src/c.rs
index 3d2f3ea..f3de302 100644
--- a/sim/mcuboot-sys/src/c.rs
+++ b/sim/mcuboot-sys/src/c.rs
@@ -41,7 +41,7 @@
 }
 
 pub fn boot_magic_sz() -> usize {
-    unsafe { raw::BOOT_MAGIC_SZ as usize }
+    unsafe { raw::boot_magic_sz() as usize }
 }
 
 pub fn boot_max_align() -> usize {
@@ -83,7 +83,7 @@
 
         pub fn boot_trailer_sz(min_write_sz: u8) -> u32;
 
-        pub static BOOT_MAGIC_SZ: u32;
+        pub fn boot_magic_sz() -> u32;
         pub fn boot_max_align() -> u32;
 
         pub fn rsa_oaep_encrypt_(pubkey: *const u8, pubkey_len: libc::c_uint,