Commit 8f6f4b4b authored by Jamie McCrae's avatar Jamie McCrae
Browse files

boot: bootutil: Fix single loader trailer size



Fixes an issue introduced in commit:
  35536633
Which wrongly set the trailer size of non-swapping modes to 0

Signed-off-by: default avatarJamie McCrae <jamie.mccrae@nordicsemi.no>
(cherry picked from commit dc571f0b)
parent 99cecb5a
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -99,12 +99,6 @@ out:
static inline uint32_t
boot_trailer_info_sz(void)
{
#if defined(MCUBOOT_SINGLE_APPLICATION_SLOT) ||      \
    defined(MCUBOOT_FIRMWARE_LOADER) ||              \
    defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)
    /* Single image MCUboot modes do not have a trailer */
    return 0;
#else
    return (
#ifdef MCUBOOT_ENC_IMAGES
           /* encryption keys */
@@ -118,7 +112,6 @@ boot_trailer_info_sz(void)
           BOOT_MAX_ALIGN * 4                     +
           BOOT_MAGIC_ALIGN_SIZE
           );
#endif
}

/*