Skip to content

Commit dc571f0

Browse files
committed
boot: bootutil: Fix single loader trailer size
Fixes an issue introduced in commit: 3553663 Which wrongly set the trailer size of non-swapping modes to 0 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 parent cf92b6f commit dc571f0

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

boot/bootutil/src/bootutil_misc.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ fih_ret boot_fih_memequal(const void *s1, const void *s2, size_t n)
9999
static inline uint32_t
100100
boot_trailer_info_sz(void)
101101
{
102-
#if defined(MCUBOOT_SINGLE_APPLICATION_SLOT) || \
103-
defined(MCUBOOT_FIRMWARE_LOADER) || \
104-
defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)
105-
/* Single image MCUboot modes do not have a trailer */
106-
return 0;
107-
#else
108102
return (
109103
#ifdef MCUBOOT_ENC_IMAGES
110104
/* encryption keys */
@@ -118,7 +112,6 @@ boot_trailer_info_sz(void)
118112
BOOT_MAX_ALIGN * 4 +
119113
BOOT_MAGIC_ALIGN_SIZE
120114
);
121-
#endif
122115
}
123116

124117
/*

0 commit comments

Comments
 (0)