OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2021-09-30 15:01:26 +00:00 committed by Fabio Utzig
parent eb6b7bf3eb
commit e5ecbcebfa
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot/boot_serial/src/boot_serial.c
View File

@ -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

1
boot/zephyr/include/mcuboot_config/mcuboot_config.h
View File

@ -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