commit c757ece80e7e6ea163d3eb592c8c2c470f11ab4f
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Mon Mar 23 14:32:08 2020 +0100
committer David Brown <davidb@davidb.org> Thu Mar 26 15:44:38 2020 -0600
tree 94629f4616900cad8fbb01ed8c4e1eec30dcc95b
parent 274c5da955ecec2d56f1a8557b6a3283b657de44

bootutil: Replace BUILD_ASSERT_MSG() with BUILD_ASSERT()

Replay of reverted to early committed patch 6d417c9:

Replace BUILD_ASSERT_MSG() with BUILD_ASSERT()
after merging BUILD_ASSERT() and BUILD_ASSERT_MSG().

Signed-off-by: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/bootutil/include/bootutil/image.h

diff --git a/boot/bootutil/include/bootutil/image.h b/boot/bootutil/include/bootutil/image.h
index 4a9fedc..2eb519f 100644
--- a/boot/bootutil/include/bootutil/image.h
+++ b/boot/bootutil/include/bootutil/image.h
@@ -134,8 +134,8 @@
     ((fap)->fa_id == FLASH_AREA_IMAGE_SECONDARY(idx) && IS_ENCRYPTED(hdr))
 
 #ifdef __ZEPHYR__
-BUILD_ASSERT_MSG(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
-               "struct image_header not required size");
+BUILD_ASSERT(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
+	     "struct image_header not required size");
 #else
 _Static_assert(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
                "struct image_header not required size");