OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "bootutil: Replace BUILD_ASSERT_MSG() with BUILD_ASSERT()" 

This reverts commit 6d417c9c84.

The patch was merged accidentally too early.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2020-03-23 10:51:06 +01:00
parent 8ecb89bb1c
commit fab12e0524
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/bootutil/include/bootutil/image.h
View File

@ -133,8 +133,8 @@ struct image_tlv {
((fap)->fa_id == FLASH_AREA_IMAGE_SECONDARY(idx) && IS_ENCRYPTED(hdr)) ((fap)->fa_id == FLASH_AREA_IMAGE_SECONDARY(idx) && IS_ENCRYPTED(hdr))
#ifdef __ZEPHYR__ #ifdef __ZEPHYR__
BUILD_ASSERT(sizeof(struct image_header) == IMAGE_HEADER_SIZE, BUILD_ASSERT_MSG(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
"struct image_header not required size"); "struct image_header not required size");
#else #else
_Static_assert(sizeof(struct image_header) == IMAGE_HEADER_SIZE, _Static_assert(sizeof(struct image_header) == IMAGE_HEADER_SIZE,
"struct image_header not required size"); "struct image_header not required size");