Commit 8101c0cd authored by Dominik Ermel's avatar Dominik Ermel Committed by David Brown
Browse files

boot/zephyr: Allow single image applications 



The change enables usage of single image applications. This can be used
when user does not need multiple boot images and wants to use more flash
are for main application or other purposes.

Signed-off-by: default avatarDominik Ermel <dominik.ermel@nordicsemi.no>
parent 24d93738

boot/zephyr/CMakeLists.txt

+17 −6
Original line number Diff line number Diff line
@@ -93,19 +93,30 @@ endif() 
# Generic bootutil sources and includes.

zephyr_library_include_directories(${BOOT_DIR}/bootutil/include)

zephyr_library_sources(

  ${BOOT_DIR}/bootutil/src/loader.c

  ${BOOT_DIR}/bootutil/src/swap_misc.c

  ${BOOT_DIR}/bootutil/src/swap_scratch.c

  ${BOOT_DIR}/bootutil/src/swap_move.c

  ${BOOT_DIR}/bootutil/src/bootutil_misc.c

  ${BOOT_DIR}/bootutil/src/image_validate.c

  ${BOOT_DIR}/bootutil/src/tlv.c

  ${BOOT_DIR}/bootutil/src/encrypted.c

  ${BOOT_DIR}/bootutil/src/image_rsa.c

  ${BOOT_DIR}/bootutil/src/image_ec256.c

  ${BOOT_DIR}/bootutil/src/image_ed25519.c

  )



if(CONFIG_SINGLE_IMAGE_DFU)

zephyr_library_sources(

  ${BOOT_DIR}/zephyr/single_loader.c

  )

zephyr_library_include_directories(${BOOT_DIR}/bootutil/src)

else()

zephyr_library_sources(

  ${BOOT_DIR}/bootutil/src/loader.c

  ${BOOT_DIR}/bootutil/src/swap_misc.c

  ${BOOT_DIR}/bootutil/src/swap_scratch.c

  ${BOOT_DIR}/bootutil/src/swap_move.c

  ${BOOT_DIR}/bootutil/src/bootutil_misc.c

  ${BOOT_DIR}/bootutil/src/caps.c

  ${BOOT_DIR}/bootutil/src/tlv.c

  )

endif()





if(CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256 OR CONFIG_BOOT_ENCRYPT_EC256)

  zephyr_library_include_directories(

boot/zephyr/flash_map_extended.c

+4 −0
Original line number Diff line number Diff line
@@ -57,9 +57,11 @@ int flash_area_id_from_multi_image_slot(int image_index, int slot) 
{

    switch (slot) {

    case 0: return FLASH_AREA_IMAGE_PRIMARY(image_index);

#if !defined(CONFIG_SINGLE_IMAGE_DFU)

    case 1: return FLASH_AREA_IMAGE_SECONDARY(image_index);

#if !defined(CONFIG_BOOT_SWAP_USING_MOVE)

    case 2: return FLASH_AREA_IMAGE_SCRATCH;

#endif

#endif

    }
@@ -76,9 +78,11 @@ int flash_area_id_to_multi_image_slot(int image_index, int area_id) 
    if (area_id == FLASH_AREA_IMAGE_PRIMARY(image_index)) {

        return 0;

    }

#if !defined(CONFIG_SINGLE_IMAGE_DFU)

    if (area_id == FLASH_AREA_IMAGE_SECONDARY(image_index)) {

        return 1;

    }

#endif



    BOOT_LOG_ERR("invalid flash area ID");

    return -1;

boot/zephyr/include/mcuboot_config/mcuboot_config.h

+14 −8
Original line number Diff line number Diff line
@@ -58,18 +58,30 @@ 
#define MCUBOOT_OVERWRITE_ONLY_FAST

#endif



#ifdef CONFIG_SINGLE_IMAGE_DFU

#define MCUBOOT_SINGLE_IMAGE_DFU 1

#else



#ifdef CONFIG_BOOT_SWAP_USING_MOVE

#define MCUBOOT_SWAP_USING_MOVE 1

#endif



#ifdef CONFIG_LOG

#define MCUBOOT_HAVE_LOGGING 1

#ifdef CONFIG_UPDATEABLE_IMAGE_NUMBER

#define MCUBOOT_IMAGE_NUMBER    CONFIG_UPDATEABLE_IMAGE_NUMBER

#else

#define MCUBOOT_IMAGE_NUMBER    1

#endif



#ifdef CONFIG_BOOT_SWAP_SAVE_ENCTLV

#define MCUBOOT_SWAP_SAVE_ENCTLV 1

#endif



#endif /* CONFIG_SINGLE_IMAGE_DFU */



#ifdef CONFIG_LOG

#define MCUBOOT_HAVE_LOGGING 1

#endif



#ifdef CONFIG_BOOT_ENCRYPT_RSA

#define MCUBOOT_ENC_IMAGES

#define MCUBOOT_ENCRYPT_RSA
@@ -93,12 +105,6 @@ 
#define MCUBOOT_USE_BENCH 1

#endif



#ifdef CONFIG_UPDATEABLE_IMAGE_NUMBER

#define MCUBOOT_IMAGE_NUMBER    CONFIG_UPDATEABLE_IMAGE_NUMBER

#else

#define MCUBOOT_IMAGE_NUMBER    1

#endif



#ifdef CONFIG_MCUBOOT_DOWNGRADE_PREVENTION

#define MCUBOOT_DOWNGRADE_PREVENTION 1

#endif

boot/zephyr/include/sysflash/sysflash.h

+14 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#include <devicetree.h>

#include <mcuboot_config/mcuboot_config.h>



#ifndef CONFIG_SINGLE_IMAGE_DFU



#if (MCUBOOT_IMAGE_NUMBER == 1)

/*

 * NOTE: the definition below returns the same values for true/false on
@@ -41,4 +43,16 @@ 
#define FLASH_AREA_IMAGE_SCRATCH    FLASH_AREA_ID(image_scratch)

#endif



#else /* CONFIG_SINGLE_IMAGE_DFU */



#define FLASH_AREA_IMAGE_PRIMARY(x)	FLASH_AREA_ID(image_0)

#define FLASH_AREA_IMAGE_SECONDARY(x)	FLASH_AREA_ID(image_0)

/* NOTE: Scratch parition is not used by single image DFU but some of

 * functions in common files reference it, so the definitions has been

 * provided to allow compilation of common units.

 */

#define FLASH_AREA_IMAGE_SCRATCH	0



#endif /* CONFIG_SINGLE_IMAGE_DFU */



#endif /* __SYSFLASH_H__ */

boot/zephyr/include/target.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
    (defined(CONFIG_XTENSA) && !defined(JEDEC_SPI_NOR_0_LABEL)) || \

    !defined(FLASH_ALIGN) ||                  \

    !(FLASH_AREA_LABEL_EXISTS(image_0)) || \

    !(FLASH_AREA_LABEL_EXISTS(image_1)) || \

    (!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !(FLASH_AREA_LABEL_EXISTS(image_scratch)))

    !(FLASH_AREA_LABEL_EXISTS(image_1) || CONFIG_SINGLE_IMAGE_DFU) || \

    (!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !FLASH_AREA_LABEL_EXISTS(image_scratch) && !defined(CONFIG_SINGLE_IMAGE_DFU))

#error "Target support is incomplete; cannot build mcuboot."

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE