Commit 94dc19d4 authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

bootutil: move BOOT_IMAGE_NUMBER definition to bootutil.h 



Definition is used (and redefined) by boot_serial.c module as well.
Let's allow to use one definition for all.

Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parent 961a6107

boot/bootutil/include/bootutil/bootutil.h

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ 
extern "C" {

#endif



#ifdef MCUBOOT_IMAGE_NUMBER

#define BOOT_IMAGE_NUMBER          MCUBOOT_IMAGE_NUMBER

#else

#define BOOT_IMAGE_NUMBER          1

#endif



_Static_assert(BOOT_IMAGE_NUMBER > 0, "Invalid value for BOOT_IMAGE_NUMBER");



struct image_header;

/**

 * A response object provided by the boot loader code; indicates where to jump

boot/bootutil/src/bootutil_priv.h

+0 −8
Original line number Diff line number Diff line
@@ -130,14 +130,6 @@ struct boot_status { 


extern const uint32_t boot_img_magic[4];



#ifdef MCUBOOT_IMAGE_NUMBER

#define BOOT_IMAGE_NUMBER          MCUBOOT_IMAGE_NUMBER

#else

#define BOOT_IMAGE_NUMBER          1

#endif



_Static_assert(BOOT_IMAGE_NUMBER > 0, "Invalid value for BOOT_IMAGE_NUMBER");



#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_RAM_LOAD)

#define ARE_SLOTS_EQUIVALENT()    0

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE