Commit e5ecbceb authored by Dominik Ermel's avatar Dominik Ermel Committed by Fabio Utzig
Browse files

zephyr: Fix support for single application with serial recovery 



The commit fixes compilation error when attempting to build
support for single application slot with serial recovery enabled.

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

boot/boot_serial/src/boot_serial.c

+4 −4
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ 


BOOT_LOG_MODULE_DECLARE(mcuboot);



#ifndef BOOT_IMAGE_NUMBER

#define BOOT_IMAGE_NUMBER MCUBOOT_IMAGE_NUMBER

#endif



#define BOOT_SERIAL_INPUT_MAX   512

#define BOOT_SERIAL_OUT_MAX     (128 * MCUBOOT_IMAGE_NUMBER)
@@ -77,10 +81,6 @@ BOOT_LOG_MODULE_DECLARE(mcuboot); 
#define htons(x) sys_cpu_to_be16(x)

#endif



#ifndef BOOT_IMAGE_NUMBER

#define BOOT_IMAGE_NUMBER MCUBOOT_IMAGE_NUMBER

#endif



#if (BOOT_IMAGE_NUMBER > 1)

#define IMAGES_ITER(x) for ((x) = 0; (x) < BOOT_IMAGE_NUMBER; ++(x))

#else

boot/zephyr/include/mcuboot_config/mcuboot_config.h

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


#ifdef CONFIG_SINGLE_APPLICATION_SLOT

#define MCUBOOT_SINGLE_APPLICATION_SLOT 1

#define MCUBOOT_IMAGE_NUMBER    1

#else



#ifdef CONFIG_BOOT_SWAP_USING_MOVE

CRA Git | Maintained and supported by SUSTech CRA and CCSE