Commit 3af607f4 authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

botutil: botutil_public.c shall not include bootutil_private.h 



Objective for existence botutil_public.c is to provide common code
for MCUboot itself and for an chain-loaded application. Therefor
it shouldn't depend on MCUboot exclusive functions or so.

This path moves missing part of bootutil_private.h to bootutil_private.c

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

boot/bootutil/include/bootutil/bootutil_public.h

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


#define BOOT_MAGIC_SZ (sizeof boot_img_magic)



#define BOOT_EFLASH      1

#define BOOT_EFILE       2

#define BOOT_EBADIMAGE   3

#define BOOT_EBADVECT    4

#define BOOT_EBADSTATUS  5

#define BOOT_ENOMEM      6

#define BOOT_EBADARGS    7

#define BOOT_EBADVERSION 8



/*

 * Extract the swap type and image number from image trailers's swap_info

 * filed.

 */

#define BOOT_GET_SWAP_TYPE(swap_info)    ((swap_info) & 0x0F)

#define BOOT_GET_IMAGE_NUM(swap_info)    ((swap_info) >> 4)



/* Construct the swap_info field from swap type and image number */

#define BOOT_SET_SWAP_INFO(swap_info, image, type)  {                          \

                                                    assert((image) < 0xF);     \

                                                    assert((type)  < 0xF);     \

                                                    (swap_info) = (image) << 4 \

                                                                | (type);      \

                                                    }

#ifdef MCUBOOT_HAVE_ASSERT_H

#include "mcuboot_config/mcuboot_assert.h"

#else

#include <assert.h>

#define ASSERT assert

#endif



struct boot_swap_state {

    uint8_t magic;      /* One of the BOOT_MAGIC_[...] values. */

    uint8_t swap_type;  /* One of the BOOT_SWAP_TYPE_[...] values. */

boot/bootutil/src/bootutil_priv.h

+0 −31
Original line number Diff line number Diff line
@@ -47,24 +47,8 @@ 
extern "C" {

#endif



#ifdef MCUBOOT_HAVE_ASSERT_H

#include "mcuboot_config/mcuboot_assert.h"

#else

#include <assert.h>

#define ASSERT assert

#endif



struct flash_area;



#define BOOT_EFLASH      1

#define BOOT_EFILE       2

#define BOOT_EBADIMAGE   3

#define BOOT_EBADVECT    4

#define BOOT_EBADSTATUS  5

#define BOOT_ENOMEM      6

#define BOOT_EBADARGS    7

#define BOOT_EBADVERSION 8



#define BOOT_TMPBUF_SZ  256



/** Number of image slots in flash; currently limited to two. */
@@ -169,21 +153,6 @@ _Static_assert(BOOT_IMAGE_NUMBER > 0, "Invalid value for BOOT_IMAGE_NUMBER"); 


#define BOOT_MAX_IMG_SECTORS       MCUBOOT_MAX_IMG_SECTORS



/*

 * Extract the swap type and image number from image trailers's swap_info

 * filed.

 */

#define BOOT_GET_SWAP_TYPE(swap_info)    ((swap_info) & 0x0F)

#define BOOT_GET_IMAGE_NUM(swap_info)    ((swap_info) >> 4)



/* Construct the swap_info field from swap type and image number */

#define BOOT_SET_SWAP_INFO(swap_info, image, type)  {                          \

                                                    assert((image) < 0xF);     \

                                                    assert((type)  < 0xF);     \

                                                    (swap_info) = (image) << 4 \

                                                                | (type);      \

                                                    }



#define BOOT_LOG_IMAGE_INFO(slot, hdr)                                    \

    BOOT_LOG_INF("%-9s slot: version=%u.%u.%u+%u",                        \

                 ((slot) == BOOT_PRIMARY_SLOT) ? "Primary" : "Secondary", \

boot/bootutil/src/bootutil_public.c

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 


#include "bootutil/image.h"

#include "bootutil/bootutil_public.h"

#include "bootutil_priv.h"

#include "bootutil/bootutil_log.h"

#ifdef MCUBOOT_ENC_IMAGES

#include "bootutil/enc_key.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE